From: Leonardo Bras <leonardo@linux.ibm.com>
To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
kvm-ppc@vger.kernel.org, linux-arch@vger.kernel.org,
linux-mm@kvack.org
Cc: "Song Liu" <songliubraving@fb.com>,
"Michal Hocko" <mhocko@suse.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
"Dmitry V. Levin" <ldv@altlinux.org>,
"Keith Busch" <keith.busch@intel.com>,
"Paul Mackerras" <paulus@samba.org>,
"Christoph Lameter" <cl@linux.com>,
"Ira Weiny" <ira.weiny@intel.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Elena Reshetova" <elena.reshetova@intel.com>,
"Andrea Arcangeli" <aarcange@redhat.com>,
"Santosh Sivaraj" <santosh@fossix.org>,
"Davidlohr Bueso" <dave@stgolabs.net>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>,
"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
"Mike Rapoport" <rppt@linux.ibm.com>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Allison Randal" <allison@lohutok.net>,
"Mahesh Salgaonkar" <mahesh@linux.vnet.ibm.com>,
"Leonardo Bras" <leonardo@linux.ibm.com>,
"Alexey Dobriyan" <adobriyan@gmail.com>,
"Ingo Molnar" <mingo@kernel.org>,
"Ralph Campbell" <rcampbell@nvidia.com>,
"Arnd Bergmann" <arnd@arndb.de>, "Jann Horn" <jannh@google.com>,
"John Hubbard" <jhubbard@nvidia.com>,
"Jesper Dangaard Brouer" <brouer@redhat.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Jérôme Glisse" <jglisse@redhat.com>,
"Mathieu Desnoyers" <mathieu.desnoyers@efficios.com>,
"Al Viro" <viro@zeniv.linux.org.uk>,
"Andrey Ryabinin" <aryabinin@virtuozzo.com>,
"Dan Williams" <dan.j.williams@intel.com>,
"Reza Arbab" <arbab@linux.ibm.com>,
"Vlastimil Babka" <vbabka@suse.cz>,
"Christian Brauner" <christian.brauner@ubuntu.com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Souptick Joarder" <jrdr.linux@gmail.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Logan Gunthorpe" <logang@deltatee.com>,
"Roman Gushchin" <guro@fb.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v5 07/11] powerpc/kvm/e500: Applies counting method to monitor lockless pgtbl walks
Date: Wed, 2 Oct 2019 22:33:21 -0300 [thread overview]
Message-ID: <20191003013325.2614-8-leonardo@linux.ibm.com> (raw)
In-Reply-To: <20191003013325.2614-1-leonardo@linux.ibm.com>
Applies the counting-based method for monitoring lockless pgtable walks on
kvmppc_e500_shadow_map().
Fixes the place where local_irq_restore() is called: previously, if ptep
was NULL, local_irq_restore() would never be called.
local_irq_{save,restore} is already inside {begin,end}_lockless_pgtbl_walk,
so there is no need to repeat it here.
Variable that saves the irq mask was renamed from flags to irq_mask so it
doesn't lose meaning now it's not directly passed to local_irq_* functions.
Signed-off-by: Leonardo Bras <leonardo@linux.ibm.com>
---
arch/powerpc/kvm/e500_mmu_host.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c
index 321db0fdb9db..36f07c6a5f10 100644
--- a/arch/powerpc/kvm/e500_mmu_host.c
+++ b/arch/powerpc/kvm/e500_mmu_host.c
@@ -336,7 +336,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
pte_t *ptep;
unsigned int wimg = 0;
pgd_t *pgdir;
- unsigned long flags;
+ unsigned long irq_mask;
/* used to check for invalidations in progress */
mmu_seq = kvm->mmu_notifier_seq;
@@ -473,7 +473,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
* We are holding kvm->mmu_lock so a notifier invalidate
* can't run hence pfn won't change.
*/
- local_irq_save(flags);
+ irq_mask = begin_lockless_pgtbl_walk(kvm->mm);
ptep = find_linux_pte(pgdir, hva, NULL, NULL);
if (ptep) {
pte_t pte = READ_ONCE(*ptep);
@@ -481,15 +481,16 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
if (pte_present(pte)) {
wimg = (pte_val(pte) >> PTE_WIMGE_SHIFT) &
MAS2_WIMGE_MASK;
- local_irq_restore(flags);
} else {
- local_irq_restore(flags);
+ end_lockless_pgtbl_walk(kvm->mm, irq_mask);
pr_err_ratelimited("%s: pte not present: gfn %lx,pfn %lx\n",
__func__, (long)gfn, pfn);
ret = -EINVAL;
goto out;
}
}
+ end_lockless_pgtbl_walk(kvm->mm, irq_mask);
+
kvmppc_e500_ref_setup(ref, gtlbe, pfn, wimg);
kvmppc_e500_setup_stlbe(&vcpu_e500->vcpu, gtlbe, tsize,
--
2.20.1
next prev parent reply other threads:[~2019-10-03 1:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 1:33 [PATCH v5 00/11] Introduces new count-based method for tracking lockless pagetable walks Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 01/11] asm-generic/pgtable: Adds generic functions to monitor lockless pgtable walks Leonardo Bras
2019-10-03 7:11 ` Peter Zijlstra
2019-10-03 11:51 ` Peter Zijlstra
2019-10-03 20:40 ` John Hubbard
2019-10-04 11:24 ` Peter Zijlstra
2019-10-03 21:24 ` Leonardo Bras
2019-10-04 11:28 ` Peter Zijlstra
2019-10-09 18:09 ` Leonardo Bras
2019-10-05 8:35 ` Aneesh Kumar K.V
2019-10-08 14:47 ` Kirill A. Shutemov
2019-10-03 1:33 ` [PATCH v5 02/11] powerpc/mm: Adds counting method " Leonardo Bras
2019-10-08 15:11 ` Christopher Lameter
2019-10-08 17:13 ` Leonardo Bras
2019-10-08 17:43 ` Christopher Lameter
2019-10-08 18:02 ` Leonardo Bras
2019-10-08 18:27 ` Christopher Lameter
2019-10-03 1:33 ` [PATCH v5 03/11] mm/gup: Applies counting method to monitor gup_pgd_range Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 04/11] powerpc/mce_power: Applies counting method to monitor lockless pgtbl walks Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 05/11] powerpc/perf: " Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 06/11] powerpc/mm/book3s64/hash: " Leonardo Bras
2019-10-03 1:33 ` Leonardo Bras [this message]
2019-10-03 1:33 ` [PATCH v5 08/11] powerpc/kvm/book3s_hv: " Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 09/11] powerpc/kvm/book3s_64: " Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 10/11] mm/Kconfig: Adds config option to track lockless pagetable walks Leonardo Bras
2019-10-03 2:08 ` Qian Cai
2019-10-03 19:04 ` Leonardo Bras
2019-10-03 19:08 ` Leonardo Bras
2019-10-03 7:44 ` Peter Zijlstra
2019-10-03 20:40 ` Leonardo Bras
2019-10-03 1:33 ` [PATCH v5 11/11] powerpc/mm/book3s64/pgtable: Uses counting method to skip serializing Leonardo Bras
2019-10-03 7:29 ` [PATCH v5 00/11] Introduces new count-based method for tracking lockless pagetable walks Peter Zijlstra
2019-10-03 20:36 ` Leonardo Bras
2019-10-03 20:49 ` John Hubbard
2019-10-03 21:38 ` Leonardo Bras
2019-10-04 11:42 ` Peter Zijlstra
2019-10-04 12:57 ` Peter Zijlstra
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=20191003013325.2614-8-leonardo@linux.ibm.com \
--to=leonardo@linux.ibm.com \
--cc=aarcange@redhat.com \
--cc=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=allison@lohutok.net \
--cc=aneesh.kumar@linux.ibm.com \
--cc=arbab@linux.ibm.com \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=b.zolnierkie@samsung.com \
--cc=brouer@redhat.com \
--cc=christian.brauner@ubuntu.com \
--cc=cl@linux.com \
--cc=dan.j.williams@intel.com \
--cc=dave@stgolabs.net \
--cc=elena.reshetova@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=guro@fb.com \
--cc=ira.weiny@intel.com \
--cc=jannh@google.com \
--cc=jgg@ziepe.ca \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=jrdr.linux@gmail.com \
--cc=keith.busch@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=ldv@altlinux.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=logang@deltatee.com \
--cc=mahesh@linux.vnet.ibm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhocko@suse.com \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=rcampbell@nvidia.com \
--cc=rppt@linux.ibm.com \
--cc=santosh@fossix.org \
--cc=songliubraving@fb.com \
--cc=tglx@linutronix.de \
--cc=vbabka@suse.cz \
--cc=viro@zeniv.linux.org.uk \
/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).