mm/thp: Rename pmd_mknotpresent() as pmd_mkinvalid()
Subsystems (10)
v2 cover mm/thp: Rename pmd_mknotpresent() as pmd_mkinvalid()
This series renames pmd_mknotpresent() as pmd_mkinvalid(). Before that it drops an existing pmd_mknotpresent() definition from powerpc platform which was never required as it defines it's pmdp_invalidate() through subscribing __HAVE_ARCH_PMDP_INVALIDATE. This does not create any functional change.
This rename was suggested by Catalin during a previous discussion while we were trying to change the THP helpers on arm64 platform for migration.
https://patchwork.kernel.org/patch/11019637/
This series is based on v5.7-rc2.
Boot tested on arm64 and x86 platforms.
Built tested on many other platforms including the ones changed here.
Changes in V2:
- Changed pmd_mknotvalid() as pmd_mkinvalid() per Will
Changes in V1: (https://patchwork.kernel.org/project/linux-mm/list/?series=259139)
Anshuman Khandual (2):
powerpc/mm: Drop platform defined pmd_mknotpresent() mm/thp: Rename pmd_mknotpresent() as pmd_mkinvalid()
arch/arc/include/asm/hugepage.h | 2 +- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm64/include/asm/pgtable.h | 2 +- arch/mips/include/asm/pgtable.h | 2 +- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ---- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/kmmio.c | 2 +- mm/pgtable-generic.c | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/2 powerpc/mm: Drop platform defined pmd_mknotpresent()
Platform needs to define pmd_mknotpresent() for generic pmdp_invalidate() only when __HAVE_ARCH_PMDP_INVALIDATE is not subscribed. Otherwise platform specific pmd_mknotpresent() is not required. Hence just drop it.
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 4 ---- 1 file changed, 4 deletions(-)
arch/powerpc/include/asm/book3s/64/pgtable.h +0 -4
@@ -1168,10 +1168,6 @@ static inline int pmd_large(pmd_t pmd)return !!(pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE)); } -static inline pmd_t pmd_mknotpresent (pmd_t pmd) -{ -return __pmd (pmd_val (pmd) & ~_PAGE_PRESENT); -}/* * For radix we should always find H_PAGE_HASHPTE zero. Hence * the below will work for radix too
Signature · 1 line
2.20.1
PATCH v2 2/2 mm/thp: Rename pmd_mknotpresent() as pmd_mkinvalid()
In reply to Anshuman Khandualpmd_present() is expected to test positive after pmdp_mknotpresent() as the PMD entry still points to a valid huge page in memory. pmdp_mknotpresent() implies that given PMD entry is just invalidated from MMU perspective while still holding on to pmd_page() referred valid huge page thus also clearing pmd_present() test. This creates the following situation which is counter intuitive.
[pmd_present(pmd_mknotpresent(pmd)) = true]
This renames pmd_mknotpresent() as pmd_mkinvalid() reflecting the helper's functionality more accurately while changing the above mentioned situation as follows. This does not create any functional change.
[pmd_present(pmd_mkinvalid(pmd)) = true]
This is not applicable for platforms that define own pmdp_invalidate() via __HAVE_ARCH_PMDP_INVALIDATE. Suggestion for renaming came during a previous discussion here.
https://patchwork.kernel.org/patch/11019637/
--- arch/arc/include/asm/hugepage.h | 2 +- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm64/include/asm/pgtable.h | 2 +- arch/mips/include/asm/pgtable.h | 2 +- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/kmmio.c | 2 +- mm/pgtable-generic.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arc/include/asm/hugepage.h +1 -1
@@ -26,7 +26,7 @@ static inline pmd_t pte_pmd(pte_t pte)#define pmd_mkold (pmd) pte_pmd(pte_mkold(pmd_pte(pmd)))#define pmd_mkyoung (pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd)))#define pmd_mkhuge (pmd) pte_pmd(pte_mkhuge(pmd_pte(pmd))) -#define pmd_mknotpresent (pmd) pte_pmd(pte_mknotpresent(pmd_pte(pmd))) +#define pmd_mkinvalid (pmd) pte_pmd(pte_mknotpresent(pmd_pte(pmd)))#define pmd_mkclean (pmd) pte_pmd(pte_mkclean(pmd_pte(pmd)))#define pmd_write (pmd) pte_write(pmd_pte(pmd))
arch/arm/include/asm/pgtable-3level.h +1 -1
@@ -221,7 +221,7 @@ PMD_BIT_FUNC(mkyoung, |= PMD_SECT_AF);#define pmdp_establish generic_pmdp_establish/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */ -static inline pmd_t pmd_mknotpresent (pmd_t pmd) +static inline pmd_t pmd_mkinvalid (pmd_t pmd) {return __pmd (pmd_val (pmd) & ~L_PMD_SECT_VALID ); }
arch/arm64/include/asm/pgtable.h +1 -1
@@ -366,7 +366,7 @@ static inline int pmd_protnone(pmd_t pmd)#define pmd_mkclean (pmd) pte_pmd(pte_mkclean(pmd_pte(pmd)))#define pmd_mkdirty (pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd)))#define pmd_mkyoung (pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) -#define pmd_mknotpresent (pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID)) +#define pmd_mkinvalid (pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID))#define pmd_thp_or_huge (pmd) (pmd_huge(pmd) || pmd_trans_huge(pmd))
arch/mips/include/asm/pgtable.h +1 -1
@@ -631,7 +631,7 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)return pmd; } -static inline pmd_t pmd_mknotpresent (pmd_t pmd) +static inline pmd_t pmd_mkinvalid (pmd_t pmd) {pmd_val (pmd) &= ~(_PAGE_PRESENT | _PAGE_VALID | _PAGE_DIRTY);
arch/x86/include/asm/pgtable.h +1 -1
@@ -624,7 +624,7 @@ static inline pud_t pfn_pud(unsigned long page_nr, pgprot_t pgprot)return __pud (pfn |check_pgprot (pgprot)); } -static inline pmd_t pmd_mknotpresent (pmd_t pmd) +static inline pmd_t pmd_mkinvalid (pmd_t pmd) {return pfn_pmd (pmd_pfn (pmd),__pgprot (pmd_flags (pmd) & ~(_PAGE_PRESENT|_PAGE_PROTNONE)));
arch/x86/mm/kmmio.c +1 -1
@@ -130,7 +130,7 @@ static void clear_pmd_presence(pmd_t *pmd, bool clear, pmdval_t *old)pmdval_t v =pmd_val (*pmd);if (clear) { *old = v; - new_pmd =pmd_mknotpresent (*pmd); + new_pmd =pmd_mkinvalid (*pmd); }else {/* Presume this has been called with clear==true previously */ new_pmd =__pmd (*old);
mm/pgtable-generic.c +1 -1
@@ -194,7 +194,7 @@ pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)pmd_t pmdp_invalidate (struct vm_area_struct *vma,unsigned long address,pmd_t *pmdp) { -pmd_t old =pmdp_establish (vma, address, pmdp,pmd_mknotpresent (*pmdp)); +pmd_t old =pmdp_establish (vma, address, pmdp,pmd_mkinvalid (*pmdp));flush_pmd_tlb_range (vma, address, address +HPAGE_PMD_SIZE );return old; }
Signature · 1 line
2.20.1