From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Leonardo Bras Subject: [PATCH v6 04/11] powerpc/mce_power: Use functions to track lockless pgtbl walks Date: Thu, 6 Feb 2020 00:08:53 -0300 Message-ID: <20200206030900.147032-5-leonardo@linux.ibm.com> In-Reply-To: <20200206030900.147032-1-leonardo@linux.ibm.com> References: <20200206030900.147032-1-leonardo@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Arnd Bergmann , Andrew Morton , "Aneesh Kumar K.V" , Nicholas Piggin , Christophe Leroy , Steven Price , Robin Murphy , Leonardo Bras , Mahesh Salgaonkar , Balbir Singh , Reza Arbab , Thomas Gleixner , Allison Randal , Greg Kroah-Hartman , Mike Rapoport , Michal Suchanek Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org List-ID: Message-ID: <20200206030853.ykrmRJB6S_taZ4_cNPwZPr8cQcKsc9Dek-TUAWp8lSM@z> Applies the new functions used for tracking lockless pgtable walks on addr_to_pfn(). local_irq_{save,restore} is already inside {begin,end}_lockless_pgtbl_walk, so there is no need to repeat it here. Signed-off-by: Leonardo Bras --- arch/powerpc/kernel/mce_power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/mce_power.c b/arch/powerpc/kernel/mce_power.c index 1cbf7f1a4e3d..a9e38ef4e437 100644 --- a/arch/powerpc/kernel/mce_power.c +++ b/arch/powerpc/kernel/mce_power.c @@ -29,7 +29,7 @@ unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr) { pte_t *ptep; unsigned int shift; - unsigned long pfn, flags; + unsigned long pfn, irq_mask; struct mm_struct *mm; if (user_mode(regs)) @@ -37,7 +37,7 @@ unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr) else mm = &init_mm; - local_irq_save(flags); + irq_mask = begin_lockless_pgtbl_walk(); ptep = __find_linux_pte(mm->pgd, addr, NULL, &shift); if (!ptep || pte_special(*ptep)) { @@ -53,7 +53,7 @@ unsigned long addr_to_pfn(struct pt_regs *regs, unsigned long addr) } out: - local_irq_restore(flags); + end_lockless_pgtbl_walk(irq_mask); return pfn; } -- 2.24.1