From: Andrew Morton <akpm@linux-foundation.org>
To: Michel Lespinasse <walken@google.com>
Cc: linux-mm <linux-mm@kvack.org>,
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>,
Daniel Jordan <daniel.m.jordan@oracle.com>,
John Hubbard <jhubbard@nvidia.com>
Subject: Re: [PATCH v6 05/12] mmap locking API: convert mmap_sem call sites missed by coccinelle
Date: Wed, 20 May 2020 20:23:17 -0700 [thread overview]
Message-ID: <20200520202317.1f7515649dd711b388e40d3f@linux-foundation.org> (raw)
In-Reply-To: <20200520052908.204642-6-walken@google.com>
On Tue, 19 May 2020 22:29:01 -0700 Michel Lespinasse <walken@google.com> wrote:
> Convert the last few remaining mmap_sem rwsem calls to use the new
> mmap locking API. These were missed by coccinelle for some reason
> (I think coccinelle does not support some of the preprocessor
> constructs in these files ?)
From: Andrew Morton <akpm@linux-foundation.org>
Subject: mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix
convert linux-next leftovers
Cc: Michel Lespinasse <walken@google.com>
Cc: Daniel Jordan <daniel.m.jordan@oracle.com>
Cc: Laurent Dufour <ldufour@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Liam Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/arm64/kvm/mmu.c | 14 +++++++-------
lib/test_hmm.c | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
--- a/lib/test_hmm.c~mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix
+++ a/lib/test_hmm.c
@@ -243,9 +243,9 @@ static int dmirror_range_fault(struct dm
}
range->notifier_seq = mmu_interval_read_begin(range->notifier);
- down_read(&mm->mmap_sem);
+ mmap_read_lock(mm);
ret = hmm_range_fault(range);
- up_read(&mm->mmap_sem);
+ mmap_read_unlock(mm);
if (ret) {
if (ret == -EBUSY)
continue;
@@ -684,7 +684,7 @@ static int dmirror_migrate(struct dmirro
if (!mmget_not_zero(mm))
return -EINVAL;
- down_read(&mm->mmap_sem);
+ mmap_read_lock(mm);
for (addr = start; addr < end; addr = next) {
vma = find_vma(mm, addr);
if (!vma || addr < vma->vm_start ||
@@ -711,7 +711,7 @@ static int dmirror_migrate(struct dmirro
dmirror_migrate_finalize_and_map(&args, dmirror);
migrate_vma_finalize(&args);
}
- up_read(&mm->mmap_sem);
+ mmap_read_unlock(mm);
mmput(mm);
/* Return the migrated data for verification. */
@@ -731,7 +731,7 @@ static int dmirror_migrate(struct dmirro
return ret;
out:
- up_read(&mm->mmap_sem);
+ mmap_read_unlock(mm);
mmput(mm);
return ret;
}
@@ -823,9 +823,9 @@ static int dmirror_range_snapshot(struct
range->notifier_seq = mmu_interval_read_begin(range->notifier);
- down_read(&mm->mmap_sem);
+ mmap_read_lock(mm);
ret = hmm_range_fault(range);
- up_read(&mm->mmap_sem);
+ mmap_read_unlock(mm);
if (ret) {
if (ret == -EBUSY)
continue;
--- a/arch/arm64/kvm/mmu.c~mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle-fix
+++ a/arch/arm64/kvm/mmu.c
@@ -1084,7 +1084,7 @@ void stage2_unmap_vm(struct kvm *kvm)
int idx;
idx = srcu_read_lock(&kvm->srcu);
- down_read(¤t->mm->mmap_sem);
+ mmap_read_lock(current->mm);
spin_lock(&kvm->mmu_lock);
slots = kvm_memslots(kvm);
@@ -1092,7 +1092,7 @@ void stage2_unmap_vm(struct kvm *kvm)
stage2_unmap_memslot(kvm, memslot);
spin_unlock(&kvm->mmu_lock);
- up_read(¤t->mm->mmap_sem);
+ mmap_read_unlock(current->mm);
srcu_read_unlock(&kvm->srcu, idx);
}
@@ -1848,11 +1848,11 @@ static int user_mem_abort(struct kvm_vcp
}
/* Let's check if we will get back a huge page backed by hugetlbfs */
- down_read(¤t->mm->mmap_sem);
+ mmap_read_lock(current->mm);
vma = find_vma_intersection(current->mm, hva, hva + 1);
if (unlikely(!vma)) {
kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
- up_read(¤t->mm->mmap_sem);
+ mmap_read_unlock(current->mm);
return -EFAULT;
}
@@ -1879,7 +1879,7 @@ static int user_mem_abort(struct kvm_vcp
if (vma_pagesize == PMD_SIZE ||
(vma_pagesize == PUD_SIZE && kvm_stage2_has_pmd(kvm)))
gfn = (fault_ipa & huge_page_mask(hstate_vma(vma))) >> PAGE_SHIFT;
- up_read(¤t->mm->mmap_sem);
+ mmap_read_unlock(current->mm);
/* We need minimum second+third level pages */
ret = mmu_topup_memory_cache(memcache, kvm_mmu_cache_min_pages(kvm),
@@ -2456,7 +2456,7 @@ int kvm_arch_prepare_memory_region(struc
(kvm_phys_size(kvm) >> PAGE_SHIFT))
return -EFAULT;
- down_read(¤t->mm->mmap_sem);
+ mmap_read_lock(current->mm);
/*
* A memory region could potentially cover multiple VMAs, and any holes
* between them, so iterate over all of them to find out if we can map
@@ -2515,7 +2515,7 @@ int kvm_arch_prepare_memory_region(struc
stage2_flush_memslot(kvm, memslot);
spin_unlock(&kvm->mmu_lock);
out:
- up_read(¤t->mm->mmap_sem);
+ mmap_read_unlock(current->mm);
return ret;
}
_
next prev parent reply other threads:[~2020-05-21 3:23 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 5:28 [PATCH v6 00/12] Add a new mmap locking API wrapping mmap_sem calls Michel Lespinasse
2020-05-20 5:28 ` Michel Lespinasse
2020-05-20 5:28 ` [PATCH v6 01/12] mmap locking API: initial implementation as rwsem wrappers Michel Lespinasse
2020-05-20 5:28 ` Michel Lespinasse
2020-05-20 5:28 ` [PATCH v6 02/12] MMU notifier: use the new mmap locking API Michel Lespinasse
2020-05-20 5:28 ` Michel Lespinasse
2020-05-20 5:28 ` [PATCH v6 03/12] DMA reservations: " Michel Lespinasse
2020-05-20 5:28 ` Michel Lespinasse
2020-05-20 5:29 ` [PATCH v6 04/12] mmap locking API: use coccinelle to convert mmap_sem rwsem call sites Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-20 5:29 ` [PATCH v6 05/12] mmap locking API: convert mmap_sem call sites missed by coccinelle Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-21 3:23 ` Andrew Morton [this message]
2020-05-21 4:49 ` Michel Lespinasse
2020-05-21 4:49 ` Michel Lespinasse
2020-05-20 5:29 ` [PATCH v6 06/12] mmap locking API: convert nested write lock sites Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-20 5:29 ` [PATCH v6 07/12] mmap locking API: add mmap_read_trylock_non_owner() Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-22 14:15 ` Davidlohr Bueso
2020-05-20 5:29 ` [PATCH v6 08/12] mmap locking API: add MMAP_LOCK_INITIALIZER Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-29 20:17 ` Daniel Jordan
2020-05-20 5:29 ` [PATCH v6 09/12] mmap locking API: add mmap_assert_locked() and mmap_assert_write_locked() Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-21 7:35 ` Vlastimil Babka
2020-05-29 20:36 ` Daniel Jordan
2020-05-20 5:29 ` [PATCH v6 10/12] mmap locking API: rename mmap_sem to mmap_lock Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-22 14:16 ` Davidlohr Bueso
2020-05-29 20:42 ` Daniel Jordan
2020-05-20 5:29 ` [PATCH v6 11/12] mmap locking API: convert mmap_sem API comments Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-21 7:38 ` Vlastimil Babka
2020-05-22 14:13 ` Davidlohr Bueso
2020-05-29 20:50 ` Daniel Jordan
2020-05-20 5:29 ` [PATCH v6 12/12] mmap locking API: convert mmap_sem comments Michel Lespinasse
2020-05-20 5:29 ` Michel Lespinasse
2020-05-21 3:22 ` Andrew Morton
2020-05-21 4:51 ` Michel Lespinasse
2020-05-21 4:51 ` Michel Lespinasse
2020-05-21 7:41 ` Vlastimil Babka
2020-05-21 7:50 ` Michel Lespinasse
2020-05-21 7:50 ` Michel Lespinasse
2020-05-21 17:25 ` Andrew Morton
2020-05-22 14:21 ` Vlastimil Babka
2020-05-29 21:16 ` Daniel Jordan
2020-06-09 12:03 ` [PATCH v6 00/12] Add a new mmap locking API wrapping mmap_sem calls Michal Hocko
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=20200520202317.1f7515649dd711b388e40d3f@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=Liam.Howlett@oracle.com \
--cc=daniel.m.jordan@oracle.com \
--cc=dave@stgolabs.net \
--cc=hughd@google.com \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.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=walken@google.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.