mm: use mmget_not_zero() helper

We already have the helper, we can convert the rest of the kernel
mechanically using:

  git grep -l 'atomic_inc_not_zero.*mm_users' | xargs sed -i 's/atomic_inc_not_zero(&\(.*\)->mm_users)/mmget_not_zero\(\1\)/'

This is needed for a later patch that hooks into the helper, but might
be a worthwhile cleanup on its own.

Link: http://lkml.kernel.org/r/20161218123229.22952-3-vegard.nossum@oracle.com
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 65802d93fdc13cfb3351dc4d577f0dbd0e4c9a4f..0115989e324a20c58ef4827719abd43239e78646 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -507,7 +507,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
                        flags |= FOLL_WRITE;
 
                ret = -EFAULT;
-               if (atomic_inc_not_zero(&mm->mm_users)) {
+               if (mmget_not_zero(mm)) {
                        down_read(&mm->mmap_sem);
                        while (pinned < npages) {
                                ret = get_user_pages_remote

diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c
index cb72e0011310d1fbd04cb1560a861c8e5ec2fd55..51f2b228723f2c00d09512f8c73dc94343a6f58d 100644 (file)
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@ -579,7 +579,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)
                if (!svm->mm)
                        goto bad_req;
                /* If the mm is already defunct, don't handle faults. */
-               if (!atomic_inc_not_zero(&svm->mm->mm_users))
+               if (!mmget_not_zero(svm->mm))
                        goto bad_req;
                down_read(&svm->mm->mmap_sem);
                vma = find_extend_vma(svm->mm, address);

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 5d51a188871b1e3807dfd93c0717609321881f8e..1e1e182d571b4afa5033977a64b7710abb90ab61 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -813,7 +813,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
                return -ENOMEM;
 
        copied = 0;
-       if (!atomic_inc_not_zero(&mm->mm_users))
+       if (!mmget_not_zero(mm))
                goto free;
 
        /* Maybe we should limit FOLL_FORCE to actual ptrace users? */
@@ -921,7 +921,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
                return -ENOMEM;
 
        ret = 0;
-       if (!atomic_inc_not_zero(&mm->mm_users))
+       if (!mmget_not_zero(mm))
                goto free;
 
        down_read(&mm->mmap_sem);

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 8f96a49178d0d48ae220a029aa9c6f25c6bedab6..ee3efb229ef6a61839ad04f70122d7be286ca730 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -167,7 +167,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
                return ERR_PTR(-ESRCH);
 
        mm = priv->mm;
-       if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+       if (!mm || !mmget_not_zero(mm))
                return NULL;
 
        down_read(&mm->mmap_sem);
@@ -1352,7 +1352,7 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
        unsigned long end_vaddr;
        int ret = 0, copied = 0;
 
-       if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+       if (!mm || !mmget_not_zero(mm))
                goto out;
 
        ret = -EINVAL;

diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 37175621e8906881adf4e034ce06224664120031..1ef97cfcf4228737dcf02a74efea47bb8b75c574 100644 (file)
--- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c
@@ -219,7 +219,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
                return ERR_PTR(-ESRCH);
 
        mm = priv->mm;
-       if (!mm || !atomic_inc_not_zero(&mm->mm_users))
+       if (!mm || !mmget_not_zero(mm))
                return NULL;
 
        down_read(&mm->mmap_sem);

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index 18c6b23edd3ca0eedbb4a9eb5543306d67f3cbd8..d630f8ac4d2f2163292a38112b1272b5afc5358b 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -747,7 +747,7 @@ build_map_info(struct address_space *mapping, loff_t offset, bool is_register)
                        continue;
                }
 
-               if (!atomic_inc_not_zero(&vma->vm_mm->mm_users))
+               if (!mmget_not_zero(vma->vm_mm))
                        continue;
 
                info = prev;

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 7a0713b76668205fc3122cc9cfcd76f1e449c5a1..fadc6a1c0da0b28e45b786ae5466ef60c3ec88f1 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1763,7 +1763,7 @@ int try_to_unuse(unsigned int type, bool frontswap,
                        while (swap_count(*swap_map) && !retval &&
                                        (p = p->next) != &start_mm->mmlist) {
                                mm = list_entry(p, struct mm_struct, mmlist);
-                               if (!atomic_inc_not_zero(&mm->mm_users))
+                               if (!mmget_not_zero(mm))
                                        continue;
                                spin_unlock(&mmlist_lock);
                                mmput(prev_mm);