From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61A56C433E3 for ; Sun, 26 Jul 2020 08:03:09 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2D8E720738 for ; Sun, 26 Jul 2020 08:03:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D8E720738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.page Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B969A6B0003; Sun, 26 Jul 2020 04:03:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B473E6B0005; Sun, 26 Jul 2020 04:03:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A85D16B0006; Sun, 26 Jul 2020 04:03:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0066.hostedemail.com [216.40.44.66]) by kanga.kvack.org (Postfix) with ESMTP id 8BD8A6B0003 for ; Sun, 26 Jul 2020 04:03:08 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 520103627 for ; Sun, 26 Jul 2020 08:03:08 +0000 (UTC) X-FDA: 77079486456.25.suit71_59168d026f57 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 297761804E3A9 for ; Sun, 26 Jul 2020 08:03:08 +0000 (UTC) X-HE-Tag: suit71_59168d026f57 X-Filterd-Recvd-Size: 3464 Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Sun, 26 Jul 2020 08:03:07 +0000 (UTC) Received: from localhost.localdomain (unknown [180.110.142.179]) (Authenticated sender: fly@kernel.page) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 107BC100007; Sun, 26 Jul 2020 08:02:59 +0000 (UTC) From: Pengfei Li To: akpm@linux-foundation.org Cc: bmt@zurich.ibm.com, dledford@redhat.com, willy@infradead.org, vbabka@suse.cz, kirill.shutemov@linux.intel.com, jgg@ziepe.ca, alex.williamson@redhat.com, cohuck@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Pengfei Li Subject: [PATCH 2/2] mm, util: account_locked_vm() does not hold mmap_lock Date: Sun, 26 Jul 2020 16:02:24 +0800 Message-Id: <20200726080224.205470-2-fly@kernel.page> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200726080224.205470-1-fly@kernel.page> References: <20200726080224.205470-1-fly@kernel.page> MIME-Version: 1.0 X-Rspamd-Queue-Id: 297761804E3A9 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Since mm->locked_vm is already an atomic counter, account_locked_vm() does not need to hold mmap_lock. Signed-off-by: Pengfei Li --- drivers/vfio/vfio_iommu_type1.c | 8 ++------ mm/util.c | 15 +++------------ 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_ty= pe1.c index 78013be07fe7..53818fce78a6 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -376,12 +376,8 @@ static int vfio_lock_acct(struct vfio_dma *dma, long= npage, bool async) if (!mm) return -ESRCH; /* process exited */ =20 - ret =3D mmap_write_lock_killable(mm); - if (!ret) { - ret =3D __account_locked_vm(mm, abs(npage), npage > 0, dma->task, - dma->lock_cap); - mmap_write_unlock(mm); - } + ret =3D __account_locked_vm(mm, abs(npage), npage > 0, + dma->task, dma->lock_cap); =20 if (async) mmput(mm); diff --git a/mm/util.c b/mm/util.c index 473add0dc275..320fdd537aea 100644 --- a/mm/util.c +++ b/mm/util.c @@ -424,8 +424,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm, stru= ct rlimit *rlim_stack) * @task: task used to check RLIMIT_MEMLOCK * @bypass_rlim: %true if checking RLIMIT_MEMLOCK should be skipped * - * Assumes @task and @mm are valid (i.e. at least one reference on each)= , and - * that mmap_lock is held as writer. + * Assumes @task and @mm are valid (i.e. at least one reference on each)= . * * Return: * * 0 on success @@ -437,8 +436,6 @@ int __account_locked_vm(struct mm_struct *mm, unsigne= d long pages, bool inc, unsigned long locked_vm, limit; int ret =3D 0; =20 - mmap_assert_write_locked(mm); - locked_vm =3D atomic64_read(&mm->locked_vm); if (inc) { if (!bypass_rlim) { @@ -476,17 +473,11 @@ EXPORT_SYMBOL_GPL(__account_locked_vm); */ int account_locked_vm(struct mm_struct *mm, unsigned long pages, bool in= c) { - int ret; - if (pages =3D=3D 0 || !mm) return 0; =20 - mmap_write_lock(mm); - ret =3D __account_locked_vm(mm, pages, inc, current, - capable(CAP_IPC_LOCK)); - mmap_write_unlock(mm); - - return ret; + return __account_locked_vm(mm, pages, inc, + current, capable(CAP_IPC_LOCK)); } EXPORT_SYMBOL_GPL(account_locked_vm); =20 --=20 2.26.2