From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760262AbcLPJ2C (ORCPT ); Fri, 16 Dec 2016 04:28:02 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:33560 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754990AbcLPJ1r (ORCPT ); Fri, 16 Dec 2016 04:27:47 -0500 Date: Fri, 16 Dec 2016 10:27:45 +0100 From: Michal Hocko To: Vegard Nossum Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Rik van Riel , Matthew Wilcox , Peter Zijlstra , Andrew Morton , Al Viro , Ingo Molnar , Linus Torvalds Subject: Re: [PATCH 3/4] mm: use mmget_not_zero() helper Message-ID: <20161216092745.GD13940@dhcp22.suse.cz> References: <20161216082202.21044-1-vegard.nossum@oracle.com> <20161216082202.21044-3-vegard.nossum@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161216082202.21044-3-vegard.nossum@oracle.com> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri 16-12-16 09:22:01, Vegard Nossum wrote: > 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. > > Cc: Andrew Morton > Cc: Michal Hocko > Signed-off-by: Vegard Nossum Acked-by: Michal Hocko > --- > drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- > drivers/iommu/intel-svm.c | 2 +- > fs/proc/base.c | 4 ++-- > fs/proc/task_mmu.c | 4 ++-- > fs/proc/task_nommu.c | 2 +- > kernel/events/uprobes.c | 2 +- > mm/swapfile.c | 2 +- > 7 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c > index f21ca404af79..e97f9ade99fc 100644 > --- a/drivers/gpu/drm/i915/i915_gem_userptr.c > +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c > @@ -514,7 +514,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 cb72e0011310..51f2b228723f 100644 > --- 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 0b8ccacae8b3..87fd5bf07578 100644 > --- a/fs/proc/base.c > +++ b/fs/proc/base.c > @@ -842,7 +842,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? */ > @@ -950,7 +950,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 35b92d81692f..c71975293dc8 100644 > --- 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 37175621e890..1ef97cfcf422 100644 > --- 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 f9ec9add2164..bcf0f9d77d4d 100644 > --- a/kernel/events/uprobes.c > +++ b/kernel/events/uprobes.c > @@ -741,7 +741,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 cf73169ce153..8c92829326cb 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1494,7 +1494,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); > -- > 2.11.0.1.gaa10c3f > -- Michal Hocko SUSE Labs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wj0-f200.google.com (mail-wj0-f200.google.com [209.85.210.200]) by kanga.kvack.org (Postfix) with ESMTP id E40A86B0260 for ; Fri, 16 Dec 2016 04:27:47 -0500 (EST) Received: by mail-wj0-f200.google.com with SMTP id hb5so32976778wjc.2 for ; Fri, 16 Dec 2016 01:27:47 -0800 (PST) Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com. [209.85.210.194]) by mx.google.com with ESMTPS id i2si2498288wma.140.2016.12.16.01.27.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Dec 2016 01:27:46 -0800 (PST) Received: by mail-wj0-f194.google.com with SMTP id xy5so13491114wjc.1 for ; Fri, 16 Dec 2016 01:27:46 -0800 (PST) Date: Fri, 16 Dec 2016 10:27:45 +0100 From: Michal Hocko Subject: Re: [PATCH 3/4] mm: use mmget_not_zero() helper Message-ID: <20161216092745.GD13940@dhcp22.suse.cz> References: <20161216082202.21044-1-vegard.nossum@oracle.com> <20161216082202.21044-3-vegard.nossum@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161216082202.21044-3-vegard.nossum@oracle.com> Sender: owner-linux-mm@kvack.org List-ID: To: Vegard Nossum Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Rik van Riel , Matthew Wilcox , Peter Zijlstra , Andrew Morton , Al Viro , Ingo Molnar , Linus Torvalds On Fri 16-12-16 09:22:01, Vegard Nossum wrote: > 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. > > Cc: Andrew Morton > Cc: Michal Hocko > Signed-off-by: Vegard Nossum Acked-by: Michal Hocko > --- > drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- > drivers/iommu/intel-svm.c | 2 +- > fs/proc/base.c | 4 ++-- > fs/proc/task_mmu.c | 4 ++-- > fs/proc/task_nommu.c | 2 +- > kernel/events/uprobes.c | 2 +- > mm/swapfile.c | 2 +- > 7 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c > index f21ca404af79..e97f9ade99fc 100644 > --- a/drivers/gpu/drm/i915/i915_gem_userptr.c > +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c > @@ -514,7 +514,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 cb72e0011310..51f2b228723f 100644 > --- 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 0b8ccacae8b3..87fd5bf07578 100644 > --- a/fs/proc/base.c > +++ b/fs/proc/base.c > @@ -842,7 +842,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? */ > @@ -950,7 +950,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 35b92d81692f..c71975293dc8 100644 > --- 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 37175621e890..1ef97cfcf422 100644 > --- 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 f9ec9add2164..bcf0f9d77d4d 100644 > --- a/kernel/events/uprobes.c > +++ b/kernel/events/uprobes.c > @@ -741,7 +741,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 cf73169ce153..8c92829326cb 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -1494,7 +1494,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); > -- > 2.11.0.1.gaa10c3f > -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org