Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm/thp: rename pmd_mknotpresent() as pmd_mkinvalid()

pmd_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/

[anshuman.khandual@arm.com: change pmd_mknotvalid() to pmd_mkinvalid() per Will]
Link: http://lkml.kernel.org/r/1587520326-10099-3-git-send-email-anshuman.khandual@arm.com
Suggested-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Will Deacon <will@kernel.org>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Link: http://lkml.kernel.org/r/1584680057-13753-3-git-send-email-anshuman.khandual@arm.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Anshuman Khandual and committed by
Linus Torvalds
86ec2da0 124cb3a6

+7 -7
+1 -1
arch/arc/include/asm/hugepage.h
··· 26 26 #define pmd_mkold(pmd) pte_pmd(pte_mkold(pmd_pte(pmd))) 27 27 #define pmd_mkyoung(pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) 28 28 #define pmd_mkhuge(pmd) pte_pmd(pte_mkhuge(pmd_pte(pmd))) 29 - #define pmd_mknotpresent(pmd) pte_pmd(pte_mknotpresent(pmd_pte(pmd))) 29 + #define pmd_mkinvalid(pmd) pte_pmd(pte_mknotpresent(pmd_pte(pmd))) 30 30 #define pmd_mkclean(pmd) pte_pmd(pte_mkclean(pmd_pte(pmd))) 31 31 32 32 #define pmd_write(pmd) pte_write(pmd_pte(pmd))
+1 -1
arch/arm/include/asm/pgtable-3level.h
··· 221 221 #define pmdp_establish generic_pmdp_establish 222 222 223 223 /* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */ 224 - static inline pmd_t pmd_mknotpresent(pmd_t pmd) 224 + static inline pmd_t pmd_mkinvalid(pmd_t pmd) 225 225 { 226 226 return __pmd(pmd_val(pmd) & ~L_PMD_SECT_VALID); 227 227 }
+1 -1
arch/arm64/include/asm/pgtable.h
··· 366 366 #define pmd_mkclean(pmd) pte_pmd(pte_mkclean(pmd_pte(pmd))) 367 367 #define pmd_mkdirty(pmd) pte_pmd(pte_mkdirty(pmd_pte(pmd))) 368 368 #define pmd_mkyoung(pmd) pte_pmd(pte_mkyoung(pmd_pte(pmd))) 369 - #define pmd_mknotpresent(pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID)) 369 + #define pmd_mkinvalid(pmd) (__pmd(pmd_val(pmd) & ~PMD_SECT_VALID)) 370 370 371 371 #define pmd_thp_or_huge(pmd) (pmd_huge(pmd) || pmd_trans_huge(pmd)) 372 372
+1 -1
arch/mips/include/asm/pgtable.h
··· 631 631 return pmd; 632 632 } 633 633 634 - static inline pmd_t pmd_mknotpresent(pmd_t pmd) 634 + static inline pmd_t pmd_mkinvalid(pmd_t pmd) 635 635 { 636 636 pmd_val(pmd) &= ~(_PAGE_PRESENT | _PAGE_VALID | _PAGE_DIRTY); 637 637
+1 -1
arch/x86/include/asm/pgtable.h
··· 624 624 return __pud(pfn | check_pgprot(pgprot)); 625 625 } 626 626 627 - static inline pmd_t pmd_mknotpresent(pmd_t pmd) 627 + static inline pmd_t pmd_mkinvalid(pmd_t pmd) 628 628 { 629 629 return pfn_pmd(pmd_pfn(pmd), 630 630 __pgprot(pmd_flags(pmd) & ~(_PAGE_PRESENT|_PAGE_PROTNONE)));
+1 -1
arch/x86/mm/kmmio.c
··· 130 130 pmdval_t v = pmd_val(*pmd); 131 131 if (clear) { 132 132 *old = v; 133 - new_pmd = pmd_mknotpresent(*pmd); 133 + new_pmd = pmd_mkinvalid(*pmd); 134 134 } else { 135 135 /* Presume this has been called with clear==true previously */ 136 136 new_pmd = __pmd(*old);
+1 -1
mm/pgtable-generic.c
··· 194 194 pmd_t pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, 195 195 pmd_t *pmdp) 196 196 { 197 - pmd_t old = pmdp_establish(vma, address, pmdp, pmd_mknotpresent(*pmdp)); 197 + pmd_t old = pmdp_establish(vma, address, pmdp, pmd_mkinvalid(*pmdp)); 198 198 flush_pmd_tlb_range(vma, address, address + HPAGE_PMD_SIZE); 199 199 return old; 200 200 }