powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit
Subsystems (2)
PATCH v2 1/6 powerpc/mm/book3s: Update pmd_present to look at _PAGE_PRESENT bit
With this patch we use 0x8000000000000000UL (_PAGE_PRESENT) to indicate a valid pgd/pud/pmd entry. We also switch the p**_present() to look at this bit.
With pmd_present, we have a special case. We need to make sure we consider a pmd marked invalid during THP split as present. Right now we clear the _PAGE_PRESENT bit during a pmdp_invalidate. Inorder to consider this special case we add a new pte bit _PAGE_INVALID (mapped to _RPAGE_SW0). This bit is only used with _PAGE_PRESENT cleared. Hence we are not really losing a pte bit for this special case. pmd_present is also updated to look at _PAGE_INVALID.
--- arch/powerpc/include/asm/book3s/64/hash.h | 5 +++++ arch/powerpc/include/asm/book3s/64/pgtable.h | 23 +++++++++++++++++--- arch/powerpc/mm/hash_utils_64.c | 6 ++--- arch/powerpc/mm/pgtable-book3s64.c | 2 +- 4 files changed, 29 insertions(+), 7 deletions(-)
arch/powerpc/include/asm/book3s/64/hash.h +5 -0
@@ -16,6 +16,11 @@#include <asm/book3s/64/hash-4k.h> #endif +/* Bits to set in a PMD/PUD/PGD entry valid bit*/ +#define HASH_PMD_VAL_BITS (0x8000000000000000UL) +#define HASH_PUD_VAL_BITS (0x8000000000000000UL) +#define HASH_PGD_VAL_BITS (0x8000000000000000UL) +/* * Size of EA range mapped by our pagetables. */
arch/powerpc/include/asm/book3s/64/pgtable.h +20 -3
@@ -44,6 +44,15 @@#define _PAGE_PTE 0x4000000000000000UL/* distinguishes PTEs from pointers */ #define _PAGE_PRESENT 0x8000000000000000UL/* pte contains a translation */ +/* +* We need to mark a pmd pte invalid while splitting. We can do that by clearing the +* _PAGE_PRESENT bit. But then that will be taken as a swap pte. Inorder to differentiate +* between two use a SW field when invalidating. We don't add a special bit to indicate +* swap pte because that is also used for migration ptes, and we do back and forth between +* a valid pte entry and migration ptes. So any information in the software bits will be +* lost if we overload those bits. +*/ +#define _PAGE_INVALID _RPAGE_SW0/* * Top and bottom bits of RPN which can be used by hash
@@ -859,8 +868,16 @@ static inline int pmd_none(pmd_t pmd)static inline int pmd_present (pmd_t pmd) { +/* +* A pmd is considerent present if _PAGE_PRESENT is set. +* We also need to consider the pmd present which is marked +* invalid during a split. Hence we look for _PAGE_INVALID +* if we find _PAGE_PRESENT cleared. +*/ +if (pmd_raw (pmd) &cpu_to_be64 (_PAGE_PRESENT | _PAGE_INVALID)) +return true; -return !pmd_none (pmd); +return false; }static inline int pmd_bad (pmd_t pmd)
@@ -887,7 +904,7 @@ static inline int pud_none(pud_t pud)static inline int pud_present (pud_t pud) { -return !pud_none (pud); +return (pud_raw (pud) &cpu_to_be64 (_PAGE_PRESENT)); }extern struct page *pud_page (pud_t pud);
@@ -934,7 +951,7 @@ static inline int pgd_none(pgd_t pgd)static inline int pgd_present (pgd_t pgd) { -return !pgd_none (pgd); +return (pgd_raw (pgd) &cpu_to_be64 (_PAGE_PRESENT)); }static inline pte_t pgd_pte (pgd_t pgd)
arch/powerpc/mm/hash_utils_64.c +3 -3
@@ -1002,9 +1002,9 @@ void __init hash__early_init_mmu(void)* 4k use hugepd format, so for hash set then to * zero */ - __pmd_val_bits =0 ; - __pud_val_bits =0 ; - __pgd_val_bits =0 ; + __pmd_val_bits =HASH_PMD_VAL_BITS ; + __pud_val_bits =HASH_PUD_VAL_BITS ; + __pgd_val_bits =HASH_PGD_VAL_BITS ; __kernel_virt_start =H_KERN_VIRT_START ; __kernel_virt_size =H_KERN_VIRT_SIZE ;
arch/powerpc/mm/pgtable-book3s64.c +1 -1
@@ -106,7 +106,7 @@ pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, {unsigned long old_pmd; - old_pmd =pmd_hugepage_update (vma->vm_mm, address, pmdp, _PAGE_PRESENT,0 ); + old_pmd =pmd_hugepage_update (vma->vm_mm, address, pmdp, _PAGE_PRESENT, _PAGE_INVALID);flush_pmd_tlb_range (vma, address, address +HPAGE_PMD_SIZE );/* * This ensures that generic code that rely on IRQ disabling
Signature · 1 line
2.17.1
PATCH v2 2/6 powerpc/mm/hugetlb/book3s: add _PAGE_PRESENT to hugepd pointer.
This make hugetlb directory pointer similar to other page able entries. A hugepd entry is identified by lack of _PAGE_PTE bit set and directory size stored in HUGEPD_SHIFT_MASK. We update that to also look at _PAGE_PRESENT
--- arch/powerpc/include/asm/book3s/64/hash-4k.h | 2 +- arch/powerpc/include/asm/book3s/64/hugetlb.h | 3 +++ arch/powerpc/mm/hugetlbpage.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/book3s/64/hash-4k.h +1 -1
@@ -66,7 +66,7 @@ static inline int hash__hugepd_ok(hugepd_t hpd)* if it is not a pte and have hugepd shift mask * set, then it is a hugepd directory pointer */ -if (!(hpdval & _PAGE_PTE) && +if (!(hpdval & _PAGE_PTE) && (hpdval & _PAGE_PRESENT) && ((hpdval &HUGEPD_SHIFT_MASK ) !=0 ))return true;return false;
arch/powerpc/include/asm/book3s/64/hugetlb.h +3 -0
@@ -39,4 +39,7 @@ static inline bool gigantic_page_supported(void) }#endif +/* hugepd entry valid bit */ +#define HUGEPD_VAL_BITS (0x8000000000000000UL) +#endif
arch/powerpc/mm/hugetlbpage.c +1 -1
@@ -95,7 +95,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,break ; else {#ifdef CONFIG_PPC_BOOK3S_64 - *hpdp =__hugepd (__pa (new) | + *hpdp =__hugepd (__pa (new) |HUGEPD_VAL_BITS | (shift_to_mmu_psize (pshift) <<2 ));#elif defined(CONFIG_PPC_8xx) *hpdp = __hugepd(__pa(new) | _PMD_USER |
Signature · 1 line
2.17.1
PATCH v2 3/6 powerpc/mm/book3s: Check for pmd_large instead of pmd_trans_huge
In reply to Aneesh Kumar K.VUpdate few code paths to check for pmd_large.
set_pmd_at:
We want to use this to store swap pte at pmd level. For swap ptes we don't want to set H_PAGE_THP_HUGE. Hence check for pmd_large in set_pmd_at. This remove the false WARN_ON when using this with swap pmd entry.
pmd_page:
We don't really use them on pmd migration entries. But they can also work with migration entries and we don't differentiate at the pte level. Hence update pmd_page to work with pmd migration entries too
__find_linux_pte:
lockless page table walk need to handle pmd migration entries. pmd_trans_huge check will return false on them. We don't set thp = 1 for such entries, but update hpage_shift correctly. Without this we will walk pmd migration entries as a pte page pointer which is wrong.
--- arch/powerpc/mm/hugetlbpage.c | 8 ++++++-- arch/powerpc/mm/pgtable-book3s64.c | 2 +- arch/powerpc/mm/pgtable_64.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-)
arch/powerpc/mm/hugetlbpage.c +6 -2
@@ -846,8 +846,12 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, ret_pte = (pte_t *) pmdp; goto out; } - -if (pmd_huge (pmd)) { +/* +* pmd_large check below will handle the swap pmd pte +* we need to do both the check because they are config +* dependent. +*/ +if (pmd_huge (pmd) ||pmd_large (pmd)) { ret_pte = (pte_t *) pmdp; goto out; }else if (is_hugepd (__hugepd (pmd_val (pmd))))
arch/powerpc/mm/pgtable-book3s64.c +1 -1
@@ -71,7 +71,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,#ifdef CONFIG_DEBUG_VM WARN_ON (pte_present (pmd_pte (*pmdp)) && !pte_protnone (pmd_pte (*pmdp)));assert_spin_locked (pmd_lockptr (mm, pmdp)); -WARN_ON (!(pmd_trans_huge (pmd) ||pmd_devmap (pmd))); +WARN_ON (!(pmd_large (pmd) ||pmd_devmap (pmd)));#endif trace_hugepage_set_pmd (addr,pmd_val (pmd));return set_pte_at (mm, addr,pmdp_ptep (pmdp),pmd_pte (pmd));
arch/powerpc/mm/pgtable_64.c +1 -1
@@ -306,7 +306,7 @@ struct page *pud_page(pud_t pud)*/ struct page *pmd_page (pmd_t pmd) { -if (pmd_trans_huge (pmd) ||pmd_huge (pmd) ||pmd_devmap (pmd)) +if (pmd_large (pmd) ||pmd_huge (pmd) ||pmd_devmap (pmd))return pte_page (pmd_pte (pmd));return virt_to_page (pmd_page_vaddr (pmd)); }
Signature · 1 line
2.17.1
PATCH v2 4/6 arch/powerpc/mm/hash: validate the pte entries before handling the hash fault
In reply to Aneesh Kumar K.VMake sure we are operating on THP and hugetlb entries in the respective hash fault handling routines.
No functional change in this patch. If we walked the table wrongly before, we will retry the access.
--- arch/powerpc/mm/hugepage-hash64.c | 6 ++++++ arch/powerpc/mm/hugetlbpage-hash64.c | 4 ++++ 2 files changed, 10 insertions(+)
arch/powerpc/mm/hugepage-hash64.c +6 -0
@@ -51,6 +51,12 @@ int __hash_page_thp(unsigned long ea, unsigned long access, unsigned long vsid, new_pmd |= _PAGE_DIRTY; }while (!pmd_xchg (pmdp,__pmd (old_pmd),__pmd (new_pmd))); +/* +* Make sure this is thp or devmap entry +*/ +if (!(old_pmd & (H_PAGE_THP_HUGE | _PAGE_DEVMAP))) +return 0 ; + rflags =htab_convert_pte_flags (new_pmd);#if 0
arch/powerpc/mm/hugetlbpage-hash64.c +4 -0
@@ -62,6 +62,10 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid, new_pte |= _PAGE_DIRTY; }while (!pte_xchg (ptep,__pte (old_pte),__pte (new_pte))); +/* Make sure this is a hugetlb entry */ +if (old_pte & (H_PAGE_THP_HUGE | _PAGE_DEVMAP)) +return 0 ; + rflags =htab_convert_pte_flags (new_pte);if (unlikely (mmu_psize ==MMU_PAGE_16G )) offset =PTRS_PER_PUD ;
Signature · 1 line
2.17.1
PATCH v2 5/6 powerpc/mm/thp: update pmd_trans_huge to check for pmd_present
In reply to Aneesh Kumar K.VWe need to make sure pmd_trans_huge returns false for a pmd migration entry. We mark the migration entry by clearing the _PAGE_PRESENT bit. We keep the _PAGE_PTE bit set to indicate a leaf page table entry. Hence we need to make sure we check for pmd_present() so that pmd_trans_huge won't return true on pmd migration entry.
--- .../include/asm/book3s/64/pgtable-64k.h | 3 +++ arch/powerpc/include/asm/book3s/64/pgtable.h | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable-64k.h +3 -0
@@ -10,6 +10,9 @@* * Defined in such a way that we can optimize away code block at build time * if CONFIG_HUGETLB_PAGE=n. +* +* returns true for pmd migration entries, THP, devmap, hugetlb +* But compile time dependent on CONFIG_HUGETLB_PAGE */ static inline int pmd_huge (pmd_t pmd) {
arch/powerpc/include/asm/book3s/64/pgtable.h +18 -0
@@ -1129,6 +1129,10 @@ pmd_hugepage_update(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp,return hash__pmd_hugepage_update (mm, addr, pmdp, clr, set); } +/* +* returns true for pmd migration entries, THP, devmap, hugetlb +* But compile time dependent on THP config +*/ static inline int pmd_large (pmd_t pmd) {return !!(pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE));
@@ -1163,8 +1167,22 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, unsigned long addr,pmd_hugepage_update (mm, addr, pmdp,0 , _PAGE_PRIVILEGED); } +/* +* Only returns true for a THP. False for pmd migration entry. +* We also need to return true when we come across a pte that +* in between a thp split. While splitting THP, we mark the pmd +* invalid (pmdp_invalidate()) before we set it with pte page +* address. A pmd_trans_huge() check against a pmd entry during that time +* should return true. +* We should not call this on a hugetlb entry. We should check for HugeTLB +* entry using vma->vm_flags +* The page table walk rule is explained in Documentation/vm/transhuge.rst +*/ static inline int pmd_trans_huge (pmd_t pmd) { +if (!pmd_present (pmd)) +return false; +if (radix_enabled ())return radix__pmd_trans_huge (pmd);return hash__pmd_trans_huge (pmd);
Signature · 1 line
2.17.1
PATCH v2 6/6 powerpc/mm:book3s: Enable THP migration support
In reply to Aneesh Kumar K.V--- arch/powerpc/include/asm/book3s/64/pgtable.h | 8 ++++++++ arch/powerpc/platforms/Kconfig.cputype | 1 + 2 files changed, 9 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +8 -0
@@ -734,6 +734,8 @@ static inline bool pte_user(pte_t pte)*/ #define __pte_to_swp_entry (pte) ((swp_entry_t) { pte_val((pte)) & ~_PAGE_PTE })#define __swp_entry_to_pte (x) __pte((x).val | _PAGE_PTE) +#define __pmd_to_swp_entry (pmd) (__pte_to_swp_entry(pmd_pte(pmd))) +#define __swp_entry_to_pmd (x) (pte_pmd(__swp_entry_to_pte(x)))#ifdef CONFIG_MEM_SOFT_DIRTY #define _PAGE_SWP_SOFT_DIRTY (1UL << (SWP_TYPE_BITS + _PAGE_BIT_SWAP_TYPE))
@@ -1084,6 +1086,12 @@ static inline pte_t *pmdp_ptep(pmd_t *pmd)#define pmd_soft_dirty (pmd) pte_soft_dirty(pmd_pte(pmd))#define pmd_mksoft_dirty (pmd) pte_pmd(pte_mksoft_dirty(pmd_pte(pmd)))#define pmd_clear_soft_dirty (pmd) pte_pmd(pte_clear_soft_dirty(pmd_pte(pmd))) + +#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION +#define pmd_swp_mksoft_dirty (pmd) pte_pmd(pte_swp_mksoft_dirty(pmd_pte(pmd))) +#define pmd_swp_soft_dirty (pmd) pte_swp_soft_dirty(pmd_pte(pmd)) +#define pmd_swp_clear_soft_dirty (pmd) pte_pmd(pte_swp_clear_soft_dirty(pmd_pte(pmd))) +#endif #endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */ #ifdef CONFIG_NUMA_BALANCING
arch/powerpc/platforms/Kconfig.cputype +1 -0
@@ -72,6 +72,7 @@ config PPC_BOOK3S_64 select PPC_HAVE_PMU_SUPPORT select SYS_SUPPORTS_HUGETLBFS select HAVE_ARCH_TRANSPARENT_HUGEPAGE + select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_SUPPORTS_NUMA_BALANCING select IRQ_WORK
Signature · 1 line
2.17.1