[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <faa34598-7207-45b4-be6a-e37a1fe1d5a3@ghiti.fr>
Date: Thu, 4 Apr 2024 09:48:18 +0200
From: Alexandre Ghiti <alex@...ti.fr>
To: Samuel Holland <samuel.holland@...ive.com>,
Palmer Dabbelt <palmer@...belt.com>, linux-riscv@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org, linux-mm@...ck.org,
Alexandre Ghiti <alexghiti@...osinc.com>, Jisheng Zhang
<jszhang@...nel.org>, Yunhui Cui <cuiyunhui@...edance.com>
Subject: Re: [PATCH v6 02/13] riscv: Factor out page table TLB synchronization
On 27/03/2024 05:49, Samuel Holland wrote:
> The logic is the same for all page table levels. See commit 69be3fb111e7
> ("riscv: enable MMU_GATHER_RCU_TABLE_FREE for SMP && MMU").
>
> Signed-off-by: Samuel Holland <samuel.holland@...ive.com>
> ---
>
> Changes in v6:
> - Move riscv_tlb_remove_ptdesc() definition to fix 32-bit build
>
> Changes in v5:
> - New patch for v5
>
> arch/riscv/include/asm/pgalloc.h | 31 +++++++++++++------------------
> 1 file changed, 13 insertions(+), 18 deletions(-)
>
> diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h
> index deaf971253a2..b34587da8882 100644
> --- a/arch/riscv/include/asm/pgalloc.h
> +++ b/arch/riscv/include/asm/pgalloc.h
> @@ -15,6 +15,14 @@
> #define __HAVE_ARCH_PUD_FREE
> #include <asm-generic/pgalloc.h>
>
> +static inline void riscv_tlb_remove_ptdesc(struct mmu_gather *tlb, void *pt)
> +{
> + if (riscv_use_ipi_for_rfence())
> + tlb_remove_page_ptdesc(tlb, pt);
> + else
> + tlb_remove_ptdesc(tlb, pt);
> +}
> +
> static inline void pmd_populate_kernel(struct mm_struct *mm,
> pmd_t *pmd, pte_t *pte)
> {
> @@ -102,10 +110,7 @@ static inline void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,
> struct ptdesc *ptdesc = virt_to_ptdesc(pud);
>
> pagetable_pud_dtor(ptdesc);
> - if (riscv_use_ipi_for_rfence())
> - tlb_remove_page_ptdesc(tlb, ptdesc);
> - else
> - tlb_remove_ptdesc(tlb, ptdesc);
> + riscv_tlb_remove_ptdesc(tlb, ptdesc);
> }
> }
>
> @@ -139,12 +144,8 @@ static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d)
> static inline void __p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,
> unsigned long addr)
> {
> - if (pgtable_l5_enabled) {
> - if (riscv_use_ipi_for_rfence())
> - tlb_remove_page_ptdesc(tlb, virt_to_ptdesc(p4d));
> - else
> - tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d));
> - }
> + if (pgtable_l5_enabled)
> + riscv_tlb_remove_ptdesc(tlb, virt_to_ptdesc(p4d));
> }
> #endif /* __PAGETABLE_PMD_FOLDED */
>
> @@ -176,10 +177,7 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
> struct ptdesc *ptdesc = virt_to_ptdesc(pmd);
>
> pagetable_pmd_dtor(ptdesc);
> - if (riscv_use_ipi_for_rfence())
> - tlb_remove_page_ptdesc(tlb, ptdesc);
> - else
> - tlb_remove_ptdesc(tlb, ptdesc);
> + riscv_tlb_remove_ptdesc(tlb, ptdesc);
> }
>
> #endif /* __PAGETABLE_PMD_FOLDED */
> @@ -190,10 +188,7 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
> struct ptdesc *ptdesc = page_ptdesc(pte);
>
> pagetable_pte_dtor(ptdesc);
> - if (riscv_use_ipi_for_rfence())
> - tlb_remove_page_ptdesc(tlb, ptdesc);
> - else
> - tlb_remove_ptdesc(tlb, ptdesc);
> + riscv_tlb_remove_ptdesc(tlb, ptdesc);
> }
> #endif /* CONFIG_MMU */
>
Reviewed-by: Alexandre Ghiti <alexghiti@...osinc.com>
Powered by blists - more mailing lists