From: Michel Lespinasse <walken@google.com>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm <linux-mm@kvack.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Laurent Dufour <ldufour@linux.ibm.com>,
Vlastimil Babka <vbabka@suse.cz>,
Matthew Wilcox <willy@infradead.org>,
Liam Howlett <Liam.Howlett@oracle.com>,
Jerome Glisse <jglisse@redhat.com>,
Davidlohr Bueso <dave@stgolabs.net>,
David Rientjes <rientjes@google.com>,
Hugh Dickins <hughd@google.com>, Ying Han <yinghan@google.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
Markus Elfring <Markus.Elfring@web.de>,
Michel Lespinasse <walken@google.com>
Subject: [PATCH v2 09/10] mmap locking API: use lockdep_assert_held
Date: Thu, 26 Mar 2020 19:10:57 -0700 [thread overview]
Message-ID: <20200327021058.221911-10-walken@google.com> (raw)
In-Reply-To: <20200327021058.221911-1-walken@google.com>
Use lockdep_assert_held when asserting that mmap_sem is held.
Using this instead of rwsem_is_locked makes the assertions more
tolerant of future changes to the lock type.
Signed-off-by: Michel Lespinasse <walken@google.com>
---
fs/userfaultfd.c | 6 +++---
mm/gup.c | 2 +-
mm/memory.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 5914eabd8185..ad1ce223ee6a 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -234,7 +234,7 @@ static inline bool userfaultfd_huge_must_wait(struct userfaultfd_ctx *ctx,
pte_t *ptep, pte;
bool ret = true;
- VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem));
+ lockdep_assert_held(&mm->mmap_sem);
ptep = huge_pte_offset(mm, address, vma_mmu_pagesize(vma));
@@ -286,7 +286,7 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx,
pte_t *pte;
bool ret = true;
- VM_BUG_ON(!rwsem_is_locked(&mm->mmap_sem));
+ lockdep_assert_held(&mm->mmap_sem);
pgd = pgd_offset(mm, address);
if (!pgd_present(*pgd))
@@ -376,7 +376,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
* Coredumping runs without mmap_sem so we can only check that
* the mmap_sem is held, if PF_DUMPCORE was not set.
*/
- WARN_ON_ONCE(!rwsem_is_locked(&mm->mmap_sem));
+ lockdep_assert_held(&mm->mmap_sem);
ctx = vmf->vma->vm_userfaultfd_ctx.ctx;
if (!ctx)
diff --git a/mm/gup.c b/mm/gup.c
index d78965738e7e..1e225eba4787 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1154,7 +1154,7 @@ long populate_vma_page_range(struct vm_area_struct *vma,
VM_BUG_ON(end & ~PAGE_MASK);
VM_BUG_ON_VMA(start < vma->vm_start, vma);
VM_BUG_ON_VMA(end > vma->vm_end, vma);
- VM_BUG_ON_MM(!rwsem_is_locked(&mm->mmap_sem), mm);
+ lockdep_assert_held(&mm->mmap_sem);
gup_flags = FOLL_TOUCH | FOLL_POPULATE | FOLL_MLOCK;
if (vma->vm_flags & VM_LOCKONFAULT)
diff --git a/mm/memory.c b/mm/memory.c
index 03fce44eee16..4c125f0a1df9 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1202,7 +1202,7 @@ static inline unsigned long zap_pud_range(struct mmu_gather *tlb,
next = pud_addr_end(addr, end);
if (pud_trans_huge(*pud) || pud_devmap(*pud)) {
if (next - addr != HPAGE_PUD_SIZE) {
- VM_BUG_ON_VMA(!rwsem_is_locked(&tlb->mm->mmap_sem), vma);
+ lockdep_assert_held(&tlb->mm->mmap_sem);
split_huge_pud(vma, pud, addr);
} else if (zap_huge_pud(tlb, vma, pud, addr))
goto next;
--
2.26.0.rc2.310.g2932bb562d-goog
next prev parent reply other threads:[~2020-03-27 2:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 2:10 [PATCH v2 00/10] Add a new mmap locking API wrapping mmap_sem calls Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 01/10] mmap locking API: initial implementation as rwsem wrappers Michel Lespinasse
2020-03-27 12:16 ` Jason Gunthorpe
2020-03-27 21:52 ` Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 02/10] MMU notifier: use the new mmap locking API Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 03/10] DMA reservations: " Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 04/10] mmap locking API: use coccinelle to convert mmap_sem rwsem call sites Michel Lespinasse
2020-03-27 7:22 ` Markus Elfring
2020-03-27 7:44 ` Michel Lespinasse
2020-03-27 8:00 ` [v2 " Markus Elfring
2020-03-27 8:08 ` Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 05/10] mmap locking API: convert mmap_sem call sites missed by coccinelle Michel Lespinasse
2020-03-27 8:21 ` Markus Elfring
2020-03-27 2:10 ` [PATCH v2 06/10] mmap locking API: convert nested write lock sites Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 07/10] mmap locking API: add mmap_read_release() and mmap_read_unlock_non_owner() Michel Lespinasse
2020-03-27 4:46 ` Davidlohr Bueso
2020-03-27 5:09 ` Michel Lespinasse
2020-03-27 2:10 ` [PATCH v2 08/10] mmap locking API: add MMAP_LOCK_INITIALIZER Michel Lespinasse
2020-03-27 2:10 ` Michel Lespinasse [this message]
2020-03-27 4:48 ` [PATCH v2 09/10] mmap locking API: use lockdep_assert_held Davidlohr Bueso
2020-03-27 2:10 ` [PATCH v2 10/10] mmap locking API: rename mmap_sem to mmap_lock Michel Lespinasse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200327021058.221911-10-walken@google.com \
--to=walken@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=Markus.Elfring@web.de \
--cc=akpm@linux-foundation.org \
--cc=dave@stgolabs.net \
--cc=hughd@google.com \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=ldufour@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
--cc=yinghan@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).