powerpc-book3s64-mm-enable-transparent-pud-hugepage.patch removed from -mm tree
The quilt patch titled
Subject: powerpc/book3s64/mm: enable transparent pud hugepage
has been removed from the -mm tree. Its filename was
powerpc-book3s64-mm-enable-transparent-pud-hugepage.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Aneesh Kumar K.V" <[email protected]>
Subject: powerpc/book3s64/mm: enable transparent pud hugepage
Date: Tue, 25 Jul 2023 00:37:55 +0530
This is enabled only with radix translation and 1G hugepage size. This will be used with devdax device memory with a namespace alignment of 1G.
Anon transparent hugepage is not supported even though we do have helpers checking pud_trans_huge(). We should never find that return true. The only expected pte bit combination is _PAGE_PTE | _PAGE_DEVMAP.
Some of the helpers are never expected to get called on hash translation and hence is marked to call BUG() in such a case.
---
arch/powerpc/include/asm/book3s/64/hash.h | 9 arch/powerpc/include/asm/book3s/64/pgtable.h | 155 +++++++++- arch/powerpc/include/asm/book3s/64/radix.h | 36 ++ arch/powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 arch/powerpc/include/asm/book3s/64/tlbflush.h | 8 arch/powerpc/mm/book3s64/pgtable.c | 78 +++++ arch/powerpc/mm/book3s64/radix_pgtable.c | 28 + arch/powerpc/mm/book3s64/radix_tlb.c | 7 arch/powerpc/platforms/Kconfig.cputype | 1 include/trace/events/thp.h | 10 10 files changed, 323 insertions(+), 11 deletions(-)
arch/powerpc/include/asm/book3s/64/hash.h renamed from arch/powerpc/include/asm/book3s/64/hash.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +9 -0
@@ -138,7 +138,16 @@ static inline int hash__pmd_same(pmd_t p }#define hash__pmd_bad (pmd) (pmd_val(pmd) & H_PMD_BAD_BITS) + +/* +* pud comparison that will work with both pte and page table pointer. +*/ +static inline int hash__pud_same (pud_t pud_a,pud_t pud_b) +{ +return (((pud_raw (pud_a) ^pud_raw (pud_b)) & ~cpu_to_be64 (_PAGE_HPTEFLAGS)) ==0 ); +}#define hash__pud_bad (pud) (pud_val(pud) & H_PUD_BAD_BITS) +static inline int hash__p4d_bad (p4d_t p4d) {return (p4d_val (p4d) ==0 );
arch/powerpc/include/asm/book3s/64/pgtable.h renamed from arch/powerpc/include/asm/book3s/64/pgtable.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +144 -11
270 lines not on this page · raw message
arch/powerpc/include/asm/book3s/64/radix.h renamed from arch/powerpc/include/asm/book3s/64/radix.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +36 -0
@@ -250,6 +250,10 @@ static inline int radix__pud_bad(pud_t preturn !!(pud_val (pud) &RADIX_PUD_BAD_BITS ); } +static inline int radix__pud_same (pud_t pud_a,pud_t pud_b) +{ +return ((pud_raw (pud_a) ^pud_raw (pud_b)) ==0 ); +}static inline int radix__p4d_bad (p4d_t p4d) {
@@ -268,9 +272,22 @@ static inline pmd_t radix__pmd_mkhuge(pmreturn __pmd (pmd_val (pmd) | _PAGE_PTE); } +static inline int radix__pud_trans_huge (pud_t pud) +{ +return (pud_val (pud) & (_PAGE_PTE | _PAGE_DEVMAP)) == _PAGE_PTE; +} + +static inline pud_t radix__pud_mkhuge (pud_t pud) +{ +return __pud (pud_val (pud) | _PAGE_PTE); +} +extern unsigned long radix__pmd_hugepage_update (struct mm_struct *mm,unsigned long addr,pmd_t *pmdp,unsigned long clr,unsigned long set); +extern unsigned long radix__pud_hugepage_update (struct mm_struct *mm,unsigned long addr, +pud_t *pudp,unsigned long clr, +unsigned long set);extern pmd_t radix__pmdp_collapse_flush (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp); extern void radix__pgtable_trans_huge_deposit(struct mm_struct *mm, pmd_t *pmdp,
@@ -278,6 +295,9 @@ extern void radix__pgtable_trans_huge_deextern pgtable_t radix__pgtable_trans_huge_withdraw (struct mm_struct *mm,pmd_t *pmdp);extern pmd_t radix__pmdp_huge_get_and_clear (struct mm_struct *mm,unsigned long addr,pmd_t *pmdp); +pud_t radix__pudp_huge_get_and_clear (struct mm_struct *mm, +unsigned long addr,pud_t *pudp); +static inline int radix__has_transparent_hugepage (void ) {/* For radix 2M at PMD level means thp */
@@ -285,6 +305,14 @@ static inline int radix__has_transparentreturn 1 ; return 0; } + +static inline int radix__has_transparent_pud_hugepage (void ) +{ +/* For radix 1G at PUD level means pud hugepage support */ +if (mmu_psize_defs[MMU_PAGE_1G ].shift ==PUD_SHIFT ) +return 1 ; +return 0 ; +}#endif static inline pmd_t radix__pmd_mkdevmap (pmd_t pmd)
@@ -292,9 +320,17 @@ static inline pmd_t radix__pmd_mkdevmap(return __pmd (pmd_val (pmd) | (_PAGE_PTE | _PAGE_DEVMAP)); } +static inline pud_t radix__pud_mkdevmap (pud_t pud) +{ +return __pud (pud_val (pud) | (_PAGE_PTE | _PAGE_DEVMAP)); +} + +struct vmem_altmap ;extern int __meminit radix__vmemmap_create_mapping (unsigned long start,unsigned long page_size,unsigned long phys); +int __meminit radix__vmemmap_populate (unsigned long start,unsigned long end, +int node,struct vmem_altmap *altmap);extern void radix__vmemmap_remove_mapping (unsigned long start,unsigned long page_size);
arch/powerpc/include/asm/book3s/64/tlbflush.h renamed from arch/powerpc/include/asm/book3s/64/tlbflush.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +8 -0
@@ -51,6 +51,14 @@ static inline void flush_pmd_tlb_range(sradix__flush_pmd_tlb_range (vma, start, end); } +#define __HAVE_ARCH_FLUSH_PUD_TLB_RANGE +static inline void flush_pud_tlb_range (struct vm_area_struct *vma, +unsigned long start,unsigned long end) +{ +if (radix_enabled ()) +radix__flush_pud_tlb_range (vma, start, end); +} +#define __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE static inline void flush_hugetlb_tlb_range(struct vm_area_struct *vma, unsigned long start,
arch/powerpc/include/asm/book3s/64/tlbflush-radix.h renamed from arch/powerpc/include/asm/book3s/64/tlbflush-radix.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +2 -0
@@ -68,6 +68,8 @@ void radix__flush_tlb_pwc_range_psize(st unsigned long end, int psize);extern void radix__flush_pmd_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end); +extern void radix__flush_pud_tlb_range (struct vm_area_struct *vma, +unsigned long start,unsigned long end);extern void radix__flush_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end);extern void radix__flush_tlb_kernel_range (unsigned long start,unsigned long end);
arch/powerpc/mm/book3s64/pgtable.c renamed from arch/powerpc/mm/book3s64/pgtable.c~powerpc-book3s64-mm-enable-transparent-pud-hugepage +78 -0
112 lines not on this page · raw message
arch/powerpc/mm/book3s64/radix_pgtable.c renamed from arch/powerpc/mm/book3s64/radix_pgtable.c~powerpc-book3s64-mm-enable-transparent-pud-hugepage +28 -0
@@ -967,6 +967,23 @@ unsigned long radix__pmd_hugepage_updatereturn old; } +unsigned long radix__pud_hugepage_update (struct mm_struct *mm,unsigned long addr, +pud_t *pudp,unsigned long clr, +unsigned long set) +{ +unsigned long old; + +#ifdef CONFIG_DEBUG_VM +WARN_ON (!pud_devmap (*pudp)); +assert_spin_locked (pud_lockptr (mm, pudp)); +#endif + + old =radix__pte_update (mm, addr,pudp_ptep (pudp), clr, set,1 ); +trace_hugepage_update_pud (addr, old, clr, set); + +return old; +} +pmd_t radix__pmdp_collapse_flush (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp)
@@ -1043,6 +1060,17 @@ pmd_t radix__pmdp_huge_get_and_clear(strreturn old_pmd; } +pud_t radix__pudp_huge_get_and_clear (struct mm_struct *mm, +unsigned long addr,pud_t *pudp) +{ +pud_t old_pud; +unsigned long old; + + old =radix__pud_hugepage_update (mm, addr, pudp, ~0UL ,0 ); + old_pud =__pud (old); +return old_pud; +} +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ void radix__ptep_set_access_flags(struct vm_area_struct *vma, pte_t *ptep,
arch/powerpc/mm/book3s64/radix_tlb.c renamed from arch/powerpc/mm/book3s64/radix_tlb.c~powerpc-book3s64-mm-enable-transparent-pud-hugepage +7 -0
@@ -1465,6 +1465,13 @@ void radix__flush_pmd_tlb_range(struct v }EXPORT_SYMBOL (radix__flush_pmd_tlb_range); +void radix__flush_pud_tlb_range (struct vm_area_struct *vma, +unsigned long start,unsigned long end) +{ +radix__flush_tlb_range_psize (vma->vm_mm, start, end,MMU_PAGE_1G ); +} +EXPORT_SYMBOL (radix__flush_pud_tlb_range); +void radix__flush_tlb_all (void ) {unsigned long rb,prs,r,rs;
arch/powerpc/platforms/Kconfig.cputype renamed from arch/powerpc/platforms/Kconfig.cputype~powerpc-book3s64-mm-enable-transparent-pud-hugepage +1 -0
@@ -94,6 +94,7 @@ config PPC_BOOK3S_64 select PPC_FPU select PPC_HAVE_PMU_SUPPORT select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION select ARCH_ENABLE_SPLIT_PMD_PTLOCK select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
include/trace/events/thp.h renamed from include/trace/events/thp.h~powerpc-book3s64-mm-enable-transparent-pud-hugepage +10 -0
@@ -30,6 +30,11 @@ DEFINE_EVENT(hugepage_set, hugepage_set_TP_ARGS (addr, pmd) ); +DEFINE_EVENT (hugepage_set, hugepage_set_pud, + TP_PROTO(unsigned long addr, unsigned long pud), +TP_ARGS (addr, pud) +); + DECLARE_EVENT_CLASS(hugepage_update, TP_PROTO(unsigned long addr, unsigned long pte, unsigned long clr, unsigned long set),
@@ -57,6 +62,11 @@ DEFINE_EVENT(hugepage_update, hugepage_uTP_ARGS (addr, pmd, clr, set) ); +DEFINE_EVENT (hugepage_update, hugepage_update_pud, + TP_PROTO(unsigned long addr, unsigned long pud, unsigned long clr, unsigned long set), +TP_ARGS (addr, pud, clr, set) +); + DECLARE_EVENT_CLASS(migration_pmd, TP_PROTO(unsigned long addr, unsigned long pmd),
_
Patches currently in -mm which might be from [email protected] are
mm-memory_hotplug-simplify-arch_mhp_memmap_on_memory_enable-kconfig.patch mm-memory_hotplug-allow-memmap-on-memory-hotplug-request-to-fallback.patch mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch mm-memory_hotplug-support-memmap_on_memory-when-memmap-is-not-aligned-to-pageblocks.patch powerpc-book3s64-memhotplug-enable-memmap-on-memory-for-radix.patch mm-memory_hotplug-embed-vmem_altmap-details-in-memory-block.patch