[PATCH 01/12] mm, arm64: Rename ARM64_CONTPTE to THP_CONTPTE
Barry Song
21cnbao at gmail.com
Tue May 14 02:30:36 PDT 2024
On Tue, May 14, 2024 at 1:09 AM Alexandre Ghiti <alexghiti at rivosinc.com> wrote:
>
> Hi Barry,
>
> On Thu, May 9, 2024 at 2:46 AM Barry Song <21cnbao at gmail.com> wrote:
> >
> > On Thu, May 9, 2024 at 7:20 AM Alexandre Ghiti <alexghiti at rivosinc.com> wrote:
> > >
> > > The ARM64_CONTPTE config represents the capability to transparently use
> > > contpte mappings for THP userspace mappings, which will be implemented
> > > in the next commits for riscv, so make this config more generic and move
> > > it to mm.
> > >
> > > Signed-off-by: Alexandre Ghiti <alexghiti at rivosinc.com>
> > > ---
> > > arch/arm64/Kconfig | 9 ---------
> > > arch/arm64/include/asm/pgtable.h | 6 +++---
> > > arch/arm64/mm/Makefile | 2 +-
> > > mm/Kconfig | 9 +++++++++
> > > 4 files changed, 13 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> > > index ac2f6d906cc3..9d823015b4e5 100644
> > > --- a/arch/arm64/Kconfig
> > > +++ b/arch/arm64/Kconfig
> > > @@ -2227,15 +2227,6 @@ config UNWIND_PATCH_PAC_INTO_SCS
> > > select UNWIND_TABLES
> > > select DYNAMIC_SCS
> > >
> > > -config ARM64_CONTPTE
> > > - bool "Contiguous PTE mappings for user memory" if EXPERT
> > > - depends on TRANSPARENT_HUGEPAGE
> > > - default y
> > > - help
> > > - When enabled, user mappings are configured using the PTE contiguous
> > > - bit, for any mappings that meet the size and alignment requirements.
> > > - This reduces TLB pressure and improves performance.
> > > -
> > > endmenu # "Kernel Features"
> > >
> > > menu "Boot options"
> > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> > > index 7c2938cb70b9..1758ce71fae9 100644
> > > --- a/arch/arm64/include/asm/pgtable.h
> > > +++ b/arch/arm64/include/asm/pgtable.h
> > > @@ -1369,7 +1369,7 @@ extern void ptep_modify_prot_commit(struct vm_area_struct *vma,
> > > unsigned long addr, pte_t *ptep,
> > > pte_t old_pte, pte_t new_pte);
> > >
> > > -#ifdef CONFIG_ARM64_CONTPTE
> > > +#ifdef CONFIG_THP_CONTPTE
> >
> > Is it necessarily THP? can't be hugetlb or others? I feel THP_CONTPTE
> > isn't a good name.
>
> This does not target hugetlbfs (see my other patchset for that here
> https://lore.kernel.org/linux-riscv/7504a525-8211-48b3-becb-a6e838c1b42e@arm.com/T/#m57d273d680fc531b3aa1074e6f8558a52ba5badc).
>
> What could be "others" here?
I acknowledge that the current focus is on Transparent Huge Pages. However,
many aspects of CONT-PTE appear to be applicable to the mm-core in general.
For example,
/*
* The below functions constitute the public API that arm64 presents to the
* core-mm to manipulate PTE entries within their page tables (or at least this
* is the subset of the API that arm64 needs to implement). These public
* versions will automatically and transparently apply the contiguous bit where
* it makes sense to do so. Therefore any users that are contig-aware (e.g.
* hugetlb, kernel mapper) should NOT use these APIs, but instead use the
* private versions, which are prefixed with double underscore. All of these
* APIs except for ptep_get_lockless() are expected to be called with the PTL
* held. Although the contiguous bit is considered private to the
* implementation, it is deliberately allowed to leak through the getters (e.g.
* ptep_get()), back to core code. This is required so that pte_leaf_size() can
* provide an accurate size for perf_get_pgtable_size(). But this leakage means
* its possible a pte will be passed to a setter with the contiguous bit set, so
* we explicitly clear the contiguous bit in those cases to prevent accidentally
* setting it in the pgtable.
*/
#define ptep_get ptep_get
static inline pte_t ptep_get(pte_t *ptep)
{
pte_t pte = __ptep_get(ptep);
if (likely(!pte_valid_cont(pte)))
return pte;
return contpte_ptep_get(ptep, pte);
}
Could it possibly be given a more generic name such as "PGTABLE_CONTPTE"?
>
> Thanks for your comment,
>
> Alex
>
> >
> > >
> > > /*
> > > * The contpte APIs are used to transparently manage the contiguous bit in ptes
> > > @@ -1622,7 +1622,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma,
> > > return contpte_ptep_set_access_flags(vma, addr, ptep, entry, dirty);
> > > }
> > >
> > > -#else /* CONFIG_ARM64_CONTPTE */
> > > +#else /* CONFIG_THP_CONTPTE */
> > >
> > > #define ptep_get __ptep_get
> > > #define set_pte __set_pte
> > > @@ -1642,7 +1642,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma,
> > > #define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
> > > #define ptep_set_access_flags __ptep_set_access_flags
> > >
> > > -#endif /* CONFIG_ARM64_CONTPTE */
> > > +#endif /* CONFIG_THP_CONTPTE */
> > >
> > > int find_num_contig(struct mm_struct *mm, unsigned long addr,
> > > pte_t *ptep, size_t *pgsize);
> > > diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile
> > > index 60454256945b..52a1b2082627 100644
> > > --- a/arch/arm64/mm/Makefile
> > > +++ b/arch/arm64/mm/Makefile
> > > @@ -3,7 +3,7 @@ obj-y := dma-mapping.o extable.o fault.o init.o \
> > > cache.o copypage.o flush.o \
> > > ioremap.o mmap.o pgd.o mmu.o \
> > > context.o proc.o pageattr.o fixmap.o
> > > -obj-$(CONFIG_ARM64_CONTPTE) += contpte.o
> > > +obj-$(CONFIG_THP_CONTPTE) += contpte.o
> > > obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
> > > obj-$(CONFIG_PTDUMP_CORE) += ptdump.o
> > > obj-$(CONFIG_PTDUMP_DEBUGFS) += ptdump_debugfs.o
> > > diff --git a/mm/Kconfig b/mm/Kconfig
> > > index c325003d6552..fd4de221a1c6 100644
> > > --- a/mm/Kconfig
> > > +++ b/mm/Kconfig
> > > @@ -984,6 +984,15 @@ config ARCH_HAS_CACHE_LINE_SIZE
> > > config ARCH_HAS_CONTPTE
> > > bool
> > >
> > > +config THP_CONTPTE
> > > + bool "Contiguous PTE mappings for user memory" if EXPERT
> > > + depends on ARCH_HAS_CONTPTE && TRANSPARENT_HUGEPAGE
> > > + default y
> > > + help
> > > + When enabled, user mappings are configured using the PTE contiguous
> > > + bit, for any mappings that meet the size and alignment requirements.
> > > + This reduces TLB pressure and improves performance.
> > > +
> > > config ARCH_HAS_CURRENT_STACK_POINTER
> > > bool
> > > help
> > > --
> > > 2.39.2
> >
Thanks
Barry
More information about the kvm-riscv
mailing list