From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rT4WV34JpzDq66 for ; Tue, 14 Jun 2016 06:44:06 +1000 (AEST) Date: Mon, 13 Jun 2016 14:43:59 -0600 From: Alex Williamson To: Topi Miettinen Cc: linux-kernel@vger.kernel.org, Tony Luck , Fenghua Yu , Alexander Graf , Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Doug Ledford , Sean Hefty , Hal Rosenstock , Mike Marciniszyn , Dennis Dalessandro , Christian Benvenuti , Dave Goodell , Sudeep Dutt , Ashutosh Dixit , Ingo Molnar , Peter Zijlstra , Alexei Starovoitov , Arnaldo Carvalho de Melo , Alexander Shishkin , Andrew Morton , Konstantin Khlebnikov , Jiri Slaby , Cyrill Gorcunov , Thomas Gleixner , Dave Hansen , Greg Kroah-Hartman , Dan Carpenter , Nikhil Rao , Vlastimil Babka , "Kirill A. Shutemov" , Michal Hocko , Eric B Munson , Alexey Klimov , Andrea Arcangeli , Alexander Kuleshov , Oleg Nesterov , Chen Gang , Andrey Ryabinin , David Rientjes , Hugh Dickins , Laurent Dufour , linux-ia64@vger.kernel.org (open list:IA64 (Itanium) PLATFORM), kvm-ppc@vger.kernel.org (open list:KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC), kvm@vger.kernel.org (open list:KERNEL VIRTUAL MACHINE (KVM)), linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), linux-rdma@vger.kernel.org (open list:INFINIBAND SUBSYSTEM), netdev@vger.kernel.org (open list:BPF (Safe dynamic programs and tools)), linux-mm@kvack.org (open list:MEMORY MANAGEMENT) Subject: Re: [RFC 12/18] limits: track RLIMIT_MEMLOCK actual max Message-ID: <20160613144359.677edee4@ul30vt.home> In-Reply-To: <1465847065-3577-13-git-send-email-toiwoton@gmail.com> References: <1465847065-3577-1-git-send-email-toiwoton@gmail.com> <1465847065-3577-13-git-send-email-toiwoton@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, 13 Jun 2016 22:44:19 +0300 Topi Miettinen wrote: > Track maximum size of locked memory, presented in /proc/self/limits. > > Signed-off-by: Topi Miettinen > --- > arch/ia64/kernel/perfmon.c | 1 + > arch/powerpc/kvm/book3s_64_vio.c | 1 + > arch/powerpc/mm/mmu_context_iommu.c | 1 + > drivers/infiniband/core/umem.c | 1 + > drivers/infiniband/hw/hfi1/user_pages.c | 1 + > drivers/infiniband/hw/qib/qib_user_pages.c | 1 + > drivers/infiniband/hw/usnic/usnic_uiom.c | 2 ++ > drivers/misc/mic/scif/scif_rma.c | 1 + > drivers/vfio/vfio_iommu_spapr_tce.c | 2 ++ > drivers/vfio/vfio_iommu_type1.c | 2 ++ > include/linux/sched.h | 10 ++++++++-- > kernel/bpf/syscall.c | 6 ++++++ > kernel/events/core.c | 1 + > mm/mlock.c | 7 +++++++ > mm/mmap.c | 3 +++ > mm/mremap.c | 3 +++ > 16 files changed, 41 insertions(+), 2 deletions(-) ... > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 2ba1942..4c6e7a3 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -312,6 +312,8 @@ static long vfio_pin_pages(unsigned long vaddr, long npage, > } > } > > + bump_rlimit(RLIMIT_MEMLOCK, (current->mm->locked_vm + i) << PAGE_SHIFT); > + > if (!rsvd) > vfio_lock_acct(i); > Not all cases passing through here bump rlimit (see: rsvd), there's an entire case above the other end of this closing bracket that does bump rlimit but returns before here, and I wonder why we wouldn't just do this in our vfio_lock_acct() accounting function anyway. Thanks, Alex