Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

4 files changed, 63 insertions, 26 deletions

diff --git a/ipc/compat.c b/ipc/compat.c
index 9dc2c7d3c9e6..845a28738d3a 100644
--- a/ipc/compat.c
+++ b/ipc/compat.c
@@ -241,6 +241,8 @@ long compat_sys_semctl(int first, int second, int third, void __user *uptr)
         struct semid64_ds __user *up64;
         int version = compat_ipc_parse_version(&third);
 
+        memset(&s64, 0, sizeof(s64));
+
         if (!uptr)
                 return -EINVAL;
         if (get_user(pad, (u32 __user *) uptr))
@@ -421,6 +423,8 @@ long compat_sys_msgctl(int first, int second, void __user *uptr)
         int version = compat_ipc_parse_version(&second);
         void __user *p;
 
+        memset(&m64, 0, sizeof(m64));
+
         switch (second & (~IPC_64)) {
         case IPC_INFO:
         case IPC_RMID:
@@ -594,6 +598,8 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)
         int err, err2;
         int version = compat_ipc_parse_version(&second);
 
+        memset(&s64, 0, sizeof(s64));
+
         switch (second & (~IPC_64)) {
         case IPC_RMID:
         case SHM_LOCK:
diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c
index d8d1e9ff4e88..380ea4fe08e7 100644
--- a/ipc/compat_mq.c
+++ b/ipc/compat_mq.c
@@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const char __user *u_name,
         void __user *p = NULL;
         if (u_attr && oflag & O_CREAT) {
                 struct mq_attr attr;
+
+                memset(&attr, 0, sizeof(attr));
+
                 p = compat_alloc_user_space(sizeof(attr));
                 if (get_compat_mq_attr(&attr, u_attr) ||
                     copy_to_user(p, &attr, sizeof(attr)))
@@ -127,6 +130,8 @@ asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes,
         struct mq_attr __user *p = compat_alloc_user_space(2 * sizeof(*p));
         long ret;
 
+        memset(&mqstat, 0, sizeof(mqstat));
+
         if (u_mqstat) {
                 if (get_compat_mq_attr(&mqstat, u_mqstat) ||
                     copy_to_user(p, &mqstat, sizeof(mqstat)))
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c60e519e2917..035f4399edbc 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -116,6 +116,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
 
         inode = new_inode(sb);
         if (inode) {
+                inode->i_ino = get_next_ino();
                 inode->i_mode = mode;
                 inode->i_uid = current_fsuid();
                 inode->i_gid = current_fsgid();
@@ -210,13 +211,13 @@ out:
         return error;
 }
 
-static int mqueue_get_sb(struct file_system_type *fs_type,
+static struct dentry *mqueue_mount(struct file_system_type *fs_type,
                          int flags, const char *dev_name,
-                         void *data, struct vfsmount *mnt)
+                         void *data)
 {
         if (!(flags & MS_KERNMOUNT))
                 data = current->nsproxy->ipc_ns;
-        return get_sb_ns(fs_type, flags, data, mqueue_fill_super, mnt);
+        return mount_ns(fs_type, flags, data, mqueue_fill_super);
 }
 
 static void init_once(void *foo)
@@ -769,7 +770,7 @@ SYSCALL_DEFINE1(mq_unlink, const char __user *, u_name)
 
         inode = dentry->d_inode;
         if (inode)
-                atomic_inc(&inode->i_count);
+                ihold(inode);
         err = mnt_want_write(ipc_ns->mq_mnt);
         if (err)
                 goto out_err;
@@ -1219,6 +1220,7 @@ static const struct file_operations mqueue_file_operations = {
         .flush = mqueue_flush_file,
         .poll = mqueue_poll_file,
         .read = mqueue_read_file,
+        .llseek = default_llseek,
 };
 
 static const struct super_operations mqueue_super_ops = {
@@ -1230,7 +1232,7 @@ static const struct super_operations mqueue_super_ops = {
 
 static struct file_system_type mqueue_fs_type = {
         .name = "mqueue",
-        .get_sb = mqueue_get_sb,
+        .mount = mqueue_mount,
         .kill_sb = kill_litter_super,
 };
 
diff --git a/ipc/shm.c b/ipc/shm.c
index 52ed77eb9713..7d3bb22a9302 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -108,7 +108,11 @@ void __init shm_init (void)
 {
         shm_init_ns(&init_ipc_ns);
         ipc_init_proc_interface("sysvipc/shm",
-                                "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime\n",
+#if BITS_PER_LONG <= 32
+                                "       key      shmid perms       size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime        rss       swap\n",
+#else
+                                "       key      shmid perms                  size  cpid  lpid nattch   uid   gid  cuid  cgid      atime      dtime      ctime                   rss                  swap\n",
+#endif
                                 IPC_SHM_IDS, sysvipc_shm_proc_show);
 }
 
@@ -298,6 +302,7 @@ static const struct file_operations shm_file_operations = {
 #ifndef CONFIG_MMU
         .get_unmapped_area      = shm_get_unmapped_area,
 #endif
+        .llseek         = noop_llseek,
 };
 
 static const struct file_operations shm_file_operations_huge = {
@@ -305,6 +310,7 @@ static const struct file_operations shm_file_operations_huge = {
         .fsync          = shm_fsync,
         .release        = shm_release,
         .get_unmapped_area      = shm_get_unmapped_area,
+        .llseek         = noop_llseek,
 };
 
 int is_file_shm_hugepages(struct file *file)
@@ -473,6 +479,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_
             {
                 struct shmid_ds out;
 
+                memset(&out, 0, sizeof(out));
                 ipc64_perm_to_ipc_perm(&in->shm_perm, &out.shm_perm);
                 out.shm_segsz   = in->shm_segsz;
                 out.shm_atime   = in->shm_atime;
@@ -542,6 +549,34 @@ static inline unsigned long copy_shminfo_to_user(void __user *buf, struct shminf
 }
 
 /*
+ * Calculate and add used RSS and swap pages of a shm.
+ * Called with shm_ids.rw_mutex held as a reader
+ */
+static void shm_add_rss_swap(struct shmid_kernel *shp,
+        unsigned long *rss_add, unsigned long *swp_add)
+{
+        struct inode *inode;
+
+        inode = shp->shm_file->f_path.dentry->d_inode;
+
+        if (is_file_hugepages(shp->shm_file)) {
+                struct address_space *mapping = inode->i_mapping;
+                struct hstate *h = hstate_file(shp->shm_file);
+                *rss_add += pages_per_huge_page(h) * mapping->nrpages;
+        } else {
+#ifdef CONFIG_SHMEM
+                struct shmem_inode_info *info = SHMEM_I(inode);
+                spin_lock(&info->lock);
+                *rss_add += inode->i_mapping->nrpages;
+                *swp_add += info->swapped;
+                spin_unlock(&info->lock);
+#else
+                *rss_add += inode->i_mapping->nrpages;
+#endif
+        }
+}
+
+/*
  * Called with shm_ids.rw_mutex held as a reader
  */
 static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
@@ -558,30 +593,13 @@ static void shm_get_stat(struct ipc_namespace *ns, unsigned long *rss,
         for (total = 0, next_id = 0; total < in_use; next_id++) {
                 struct kern_ipc_perm *ipc;
                 struct shmid_kernel *shp;
-                struct inode *inode;
 
                 ipc = idr_find(&shm_ids(ns).ipcs_idr, next_id);
                 if (ipc == NULL)
                         continue;
                 shp = container_of(ipc, struct shmid_kernel, shm_perm);
 
-                inode = shp->shm_file->f_path.dentry->d_inode;
-
-                if (is_file_hugepages(shp->shm_file)) {
-                        struct address_space *mapping = inode->i_mapping;
-                        struct hstate *h = hstate_file(shp->shm_file);
-                        *rss += pages_per_huge_page(h) * mapping->nrpages;
-                } else {
-#ifdef CONFIG_SHMEM
-                        struct shmem_inode_info *info = SHMEM_I(inode);
-                        spin_lock(&info->lock);
-                        *rss += inode->i_mapping->nrpages;
-                        *swp += info->swapped;
-                        spin_unlock(&info->lock);
-#else
-                        *rss += inode->i_mapping->nrpages;
-#endif
-                }
+                shm_add_rss_swap(shp, rss, swp);
 
                 total++;
         }
@@ -1070,6 +1088,9 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr)
 static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 {
         struct shmid_kernel *shp = it;
+        unsigned long rss = 0, swp = 0;
+
+        shm_add_rss_swap(shp, &rss, &swp);
 
 #if BITS_PER_LONG <= 32
 #define SIZE_SPEC "%10lu"
@@ -1079,7 +1100,8 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
 
         return seq_printf(s,
                           "%10d %10d  %4o " SIZE_SPEC " %5u %5u  "
-                          "%5lu %5u %5u %5u %5u %10lu %10lu %10lu\n",
+                          "%5lu %5u %5u %5u %5u %10lu %10lu %10lu "
+                          SIZE_SPEC " " SIZE_SPEC "\n",
                           shp->shm_perm.key,
                           shp->shm_perm.id,
                           shp->shm_perm.mode,
@@ -1093,6 +1115,8 @@ static int sysvipc_shm_proc_show(struct seq_file *s, void *it)
                           shp->shm_perm.cgid,
                           shp->shm_atim,
                           shp->shm_dtim,
-                          shp->shm_ctim);
+                          shp->shm_ctim,
+                          rss * PAGE_SIZE,
+                          swp * PAGE_SIZE);
 }
 #endif