From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E93934540; Wed, 20 Dec 2023 13:09:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="geH8Po+2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19026C433C7; Wed, 20 Dec 2023 13:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703077797; bh=kNBcPwaMlCBZq05QdM/ZhosCOAELdn7NQH61Zm2JFdI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=geH8Po+2xTzfgztalOer3avEmmYlxn/45tUCRRhRPkul1OdegcfPNbzZr3tlUU9gL Gr9cAMJrqZuYg4ZXywlT8vSMjii9EQa5EbRzNrvsitbUMRrwbGZ+Vs5h7oma4+HXCX Y6lx9NhOjzB4pblu7fVu8HdFsBrqgIGPmNWbmGUcFzrh5wBtM9iKG3YDgpGMKzvzlh 8vB2ywPk0x3h2DIr7Fq1JC41iWIBZuH9vX9FxlyK05Uq+uzcK1I4v29L51UH7MToRn KnLrmtlosx1RWynwXEXaab9s09kXI2/VKwn3Z8VcssHKf3wD1CPcmCmEDqkbqzUfsQ heTJfZCiYSM3Q== Date: Wed, 20 Dec 2023 20:57:20 +0800 From: Jisheng Zhang To: yunhui cui Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Will Deacon , "Aneesh Kumar K . V" , Andrew Morton , Nick Piggin , Peter Zijlstra , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org Subject: Re: [External] [PATCH 2/4] riscv: tlb: convert __p*d_free_tlb() to inline functions Message-ID: References: <20231219175046.2496-1-jszhang@kernel.org> <20231219175046.2496-3-jszhang@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Wed, Dec 20, 2023 at 10:59:22AM +0800, yunhui cui wrote: > Hi Jisheng, Hi, > > On Wed, Dec 20, 2023 at 2:04 AM Jisheng Zhang wrote: > > > > This is to prepare for enabling MMU_GATHER_RCU_TABLE_FREE. > > No functionality changes. > > > > Signed-off-by: Jisheng Zhang > > --- > > arch/riscv/include/asm/pgalloc.h | 54 +++++++++++++++++++------------- > > 1 file changed, 32 insertions(+), 22 deletions(-) > > > > diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h > > index a12fb83fa1f5..3c5e3bd15f46 100644 > > --- a/arch/riscv/include/asm/pgalloc.h > > +++ b/arch/riscv/include/asm/pgalloc.h > > @@ -95,13 +95,16 @@ static inline void pud_free(struct mm_struct *mm, pud_t *pud) > > __pud_free(mm, pud); > > } > > > > -#define __pud_free_tlb(tlb, pud, addr) \ > > -do { \ > > - if (pgtable_l4_enabled) { \ > > - pagetable_pud_dtor(virt_to_ptdesc(pud)); \ > > - tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pud)); \ > > - } \ > > -} while (0) > > +static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud, > > + unsigned long addr) > > +{ > > + if (pgtable_l4_enabled) { > > + struct ptdesc *ptdesc = virt_to_ptdesc(pud); > > + > > + pagetable_pud_dtor(ptdesc); > > + tlb_remove_page_ptdesc(tlb, ptdesc); > > + } > > +} > > > > #define p4d_alloc_one p4d_alloc_one > > static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) > > @@ -130,11 +133,12 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) > > __p4d_free(mm, p4d); > > } > > > > -#define __p4d_free_tlb(tlb, p4d, addr) \ > > -do { \ > > - if (pgtable_l5_enabled) \ > > - tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(p4d)); \ > > -} while (0) > > +static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d, > > + unsigned long addr) > > +{ > > + if (pgtable_l5_enabled) > > + tlb_remove_page_ptdesc(tlb, virt_to_ptdesc(p4d)); > > +} > > #endif /* __PAGETABLE_PMD_FOLDED */ > > > > static inline void sync_kernel_mappings(pgd_t *pgd) > > @@ -159,19 +163,25 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) > > > > #ifndef __PAGETABLE_PMD_FOLDED > > > > -#define __pmd_free_tlb(tlb, pmd, addr) \ > > -do { \ > > - pagetable_pmd_dtor(virt_to_ptdesc(pmd)); \ > > - tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pmd)); \ > > -} while (0) > > +static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd, > > + unsigned long addr) > > +{ > > + struct ptdesc *ptdesc = virt_to_ptdesc(pmd); > > + > > + pagetable_pmd_dtor(ptdesc); > > + tlb_remove_page_ptdesc(tlb, ptdesc); > > +} > > > > #endif /* __PAGETABLE_PMD_FOLDED */ > > > > -#define __pte_free_tlb(tlb, pte, buf) \ > > -do { \ > > - pagetable_pte_dtor(page_ptdesc(pte)); \ > > - tlb_remove_page_ptdesc((tlb), page_ptdesc(pte));\ > > -} while (0) > > +static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, > > + unsigned long addr) > > +{ > > + struct ptdesc *ptdesc = page_ptdesc(pte); > > + > > + pagetable_pte_dtor(ptdesc); > > + tlb_remove_page_ptdesc(tlb, ptdesc); > > +} > > #endif /* CONFIG_MMU */ > > > > #endif /* _ASM_RISCV_PGALLOC_H */ > > -- > > 2.40.0 > > > > Why is it necessary to convert to inline functions? Hmm, it's not necessary but a plus, the inline version's readability and maintainability is better than macros Regards