mm/special: Create generic fallbacks for pte_special() and pte_mkspecial()
Subsystems (17)
PATCH v3 1/1 mm/special: Create generic fallbacks for pte_special() and pte_mkspecial()
Currently there are many platforms that dont enable ARCH_HAS_PTE_SPECIAL but required to define quite similar fallback stubs for special page table entry helpers such as pte_special() and pte_mkspecial(), as they get build in generic MM without a config check. This creates two generic fallback stub definitions for these helpers, eliminating much code duplication.
mips platform has a special case where pte_special() and pte_mkspecial() visibility is wider than what ARCH_HAS_PTE_SPECIAL enablement requires. This restricts those symbol visibility in order to avoid redefinitions which is now exposed through this new generic stubs and subsequent build failure. arm platform set_pte_at() definition needs to be moved into a C file just to prevent a build failure.
---
Build tested on multiple platforms but boot tested only for arm64.
Changes in V3:
- Used defined(CONFIG_ARCH_HAS_PTE_SPECIAL) in mips per Thomas
Changes in V2: (https://patchwork.kernel.org/patch/11428285/)
- s/HAVE_ARCH_PTE_SPECIAL/ARCH_HAS_PTE_SPECIAL per Geert
Changes in V1: (https://patchwork.kernel.org/patch/11414613/)
arch/alpha/include/asm/pgtable.h | 2 -- arch/arm/include/asm/pgtable-2level.h | 2 -- arch/arm/include/asm/pgtable.h | 15 ++------ arch/arm/mm/mmu.c | 14 ++++++++ arch/csky/include/asm/pgtable.h | 3 -- arch/hexagon/include/asm/pgtable.h | 2 -- arch/ia64/include/asm/pgtable.h | 2 -- arch/m68k/include/asm/mcf_pgtable.h | 10 ------ arch/m68k/include/asm/motorola_pgtable.h | 2 -- arch/m68k/include/asm/sun3_pgtable.h | 2 -- arch/microblaze/include/asm/pgtable.h | 4 --- arch/mips/include/asm/pgtable.h | 44 ++++++++++++++++-------- arch/nds32/include/asm/pgtable.h | 9 ----- arch/nios2/include/asm/pgtable.h | 3 -- arch/openrisc/include/asm/pgtable.h | 2 -- arch/parisc/include/asm/pgtable.h | 2 -- arch/sparc/include/asm/pgtable_32.h | 7 ---- arch/um/include/asm/pgtable.h | 10 ------ arch/unicore32/include/asm/pgtable.h | 3 -- arch/xtensa/include/asm/pgtable.h | 3 -- include/linux/mm.h | 12 +++++++ 21 files changed, 58 insertions(+), 95 deletions(-)
arch/alpha/include/asm/pgtable.h +0 -2
@@ -268,7 +268,6 @@ extern inline void pud_clear(pud_t * pudp) { pud_val(*pudp) = 0; }extern inline int pte_write (pte_t pte) {return !(pte_val (pte) & _PAGE_FOW); }extern inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }extern inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; } -extern inline int pte_special (pte_t pte) {return 0 ; }extern inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) |= _PAGE_FOW;return pte; }extern inline pte_t pte_mkclean (pte_t pte) {pte_val (pte) &= ~(__DIRTY_BITS);return pte; }
@@ -276,7 +275,6 @@ extern inline pte_t pte_mkold(pte_t pte) { pte_val(pte) &= ~(__ACCESS_BITS); retextern inline pte_t pte_mkwrite (pte_t pte) {pte_val (pte) &= ~_PAGE_FOW;return pte; }extern inline pte_t pte_mkdirty (pte_t pte) {pte_val (pte) |= __DIRTY_BITS;return pte; }extern inline pte_t pte_mkyoung (pte_t pte) {pte_val (pte) |= __ACCESS_BITS;return pte; } -extern inline pte_t pte_mkspecial (pte_t pte) {return pte; }#define PAGE_DIR_OFFSET (tsk,address) pgd_offset((tsk),(address))
arch/arm/include/asm/pgtable-2level.h +0 -2
@@ -211,8 +211,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr)#define pmd_addr_end (addr,end) (end)#define set_pte_ext (ptep,pte,ext) cpu_set_pte_ext(ptep,pte,ext) -#define pte_special (pte) (0) -static inline pte_t pte_mkspecial (pte_t pte) {return pte; }/* * We don't have huge page support for short descriptors, for the moment
arch/arm/include/asm/pgtable.h +2 -13
@@ -252,19 +252,8 @@ static inline void __sync_icache_dcache(pte_t pteval)extern void __sync_icache_dcache (pte_t pteval);#endif -static inline void set_pte_at (struct mm_struct *mm,unsigned long addr, -pte_t *ptep,pte_t pteval) -{ -unsigned long ext =0 ; - -if (addr <TASK_SIZE &&pte_valid_user (pteval)) { -if (!pte_special (pteval)) -__sync_icache_dcache (pteval); - ext |=PTE_EXT_NG ; - } - -set_pte_ext (ptep, pteval, ext); -} +void set_pte_at (struct mm_struct *mm,unsigned long addr, +pte_t *ptep,pte_t pteval);static inline pte_t clear_pte_bit (pte_t pte,pgprot_t prot) {
arch/arm/mm/mmu.c +14 -0
@@ -1672,3 +1672,17 @@ void __init early_mm_init(const struct machine_desc *mdesc)build_mem_type_table ();early_paging_init (mdesc); } + +void set_pte_at (struct mm_struct *mm,unsigned long addr, +pte_t *ptep,pte_t pteval) +{ +unsigned long ext =0 ; + +if (addr <TASK_SIZE &&pte_valid_user (pteval)) { +if (!pte_special (pteval)) +__sync_icache_dcache (pteval); + ext |=PTE_EXT_NG ; + } + +set_pte_ext (ptep, pteval, ext); +}
arch/csky/include/asm/pgtable.h +0 -3
@@ -110,9 +110,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];extern void load_pgd (unsigned long pg_dir);extern pte_t invalid_pte_table[PTRS_PER_PTE ]; -static inline int pte_special (pte_t pte) {return 0 ; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; } -static inline void set_pte (pte_t *p,pte_t pte) { *p = pte;
arch/hexagon/include/asm/pgtable.h +0 -2
@@ -158,8 +158,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* located in head.S *//* Seems to be zero even in architectures where the zero page is firewalled? */ #define FIRST_USER_ADDRESS 0UL -#define pte_special (pte) 0 -#define pte_mkspecial (pte) (pte)/* HUGETLB not working currently */ #ifdef CONFIG_HUGETLB_PAGE
arch/ia64/include/asm/pgtable.h +0 -2
@@ -298,7 +298,6 @@ extern unsigned long VMALLOC_END;#define pte_exec (pte) ((pte_val(pte) & _PAGE_AR_RX) != 0)#define pte_dirty (pte) ((pte_val(pte) & _PAGE_D) != 0)#define pte_young (pte) ((pte_val(pte) & _PAGE_A) != 0) -#define pte_special (pte) 0/* * Note: we convert AR_RWX to AR_RX and AR_RW to AR_R by clearing the 2nd bit in the
@@ -311,7 +310,6 @@ extern unsigned long VMALLOC_END;#define pte_mkclean (pte) (__pte(pte_val(pte) & ~_PAGE_D))#define pte_mkdirty (pte) (__pte(pte_val(pte) | _PAGE_D))#define pte_mkhuge (pte) (__pte(pte_val(pte))) -#define pte_mkspecial (pte) (pte)/* * Because ia64's Icache and Dcache is not coherent (on a cpu), we need to
arch/m68k/include/asm/mcf_pgtable.h +0 -10
@@ -235,11 +235,6 @@ static inline int pte_young(pte_t pte)return pte_val (pte) &CF_PAGE_ACCESSED ; } -static inline int pte_special (pte_t pte) -{ -return 0 ; -} -static inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) &= ~CF_PAGE_WRITABLE ;
@@ -312,11 +307,6 @@ static inline pte_t pte_mkcache(pte_t pte)return pte; } -static inline pte_t pte_mkspecial (pte_t pte) -{ -return pte; -} -#define swapper_pg_dir kernel_pg_dirextern pgd_t kernel_pg_dir[PTRS_PER_PGD ];
arch/m68k/include/asm/motorola_pgtable.h +0 -2
@@ -168,7 +168,6 @@ static inline void pud_set(pud_t *pudp, pmd_t *pmdp)static inline int pte_write (pte_t pte) {return !(pte_val (pte) & _PAGE_RONLY); }static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; } -static inline int pte_special (pte_t pte) {return 0 ; }static inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) |= _PAGE_RONLY;return pte; }static inline pte_t pte_mkclean (pte_t pte) {pte_val (pte) &= ~_PAGE_DIRTY;return pte; }
@@ -186,7 +185,6 @@ static inline pte_t pte_mkcache(pte_t pte)pte_val (pte) = (pte_val (pte) & _CACHEMASK040) | m68k_supervisor_cachemode;return pte; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; }#define PAGE_DIR_OFFSET (tsk,address) pgd_offset((tsk),(address))
arch/m68k/include/asm/sun3_pgtable.h +0 -2
@@ -155,7 +155,6 @@ static inline void pmd_clear (pmd_t *pmdp) { pmd_val (*pmdp) = 0; }static inline int pte_write (pte_t pte) {return pte_val (pte) &SUN3_PAGE_WRITEABLE ; }static inline int pte_dirty (pte_t pte) {return pte_val (pte) &SUN3_PAGE_MODIFIED ; }static inline int pte_young (pte_t pte) {return pte_val (pte) &SUN3_PAGE_ACCESSED ; } -static inline int pte_special (pte_t pte) {return 0 ; }static inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) &= ~SUN3_PAGE_WRITEABLE ;return pte; }static inline pte_t pte_mkclean (pte_t pte) {pte_val (pte) &= ~SUN3_PAGE_MODIFIED ;return pte; }
@@ -168,7 +167,6 @@ static inline pte_t pte_mknocache(pte_t pte) { pte_val(pte) |= SUN3_PAGE_NOCACHE//static inline pte_t pte_mkcache(pte_t pte) { pte_val(pte) &= SUN3_PAGE_NOCACHE; return pte; } // until then, use: static inline pte_t pte_mkcache (pte_t pte) {return pte; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; }extern pgd_t swapper_pg_dir[PTRS_PER_PGD ];extern pgd_t kernel_pg_dir[PTRS_PER_PGD ];
arch/microblaze/include/asm/pgtable.h +0 -4
@@ -80,10 +80,6 @@ extern pte_t *va_to_pte(unsigned long address);* Undefined behaviour if not.. */ -static inline int pte_special (pte_t pte) {return 0 ; } - -static inline pte_t pte_mkspecial (pte_t pte) {return pte; } -/* Start and end of the vmalloc area. */ /* Make sure to map the vmalloc area above the pinned kernel memory area of 32Mb. */
arch/mips/include/asm/pgtable.h +30 -14
72 lines not on this page · raw message
arch/nds32/include/asm/pgtable.h +0 -9
@@ -286,15 +286,6 @@ PTE_BIT_FUNC(mkclean, &=~_PAGE_D); PTE_BIT_FUNC(mkdirty, |=_PAGE_D); PTE_BIT_FUNC(mkold, &=~_PAGE_YOUNG); PTE_BIT_FUNC(mkyoung, |=_PAGE_YOUNG); -static inline int pte_special (pte_t pte) -{ -return 0 ; -} - -static inline pte_t pte_mkspecial (pte_t pte) -{ -return pte; -}/* * Mark the prot value as uncacheable and unbufferable.
arch/nios2/include/asm/pgtable.h +0 -3
@@ -113,7 +113,6 @@ static inline int pte_dirty(pte_t pte) \ {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) \ {return pte_val (pte) & _PAGE_ACCESSED; } -static inline int pte_special (pte_t pte) {return 0 ; }#define pgprot_noncached pgprot_noncached
@@ -168,8 +167,6 @@ static inline pte_t pte_mkdirty(pte_t pte)return pte; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; } -static inline pte_t pte_mkyoung (pte_t pte) {pte_val (pte) |= _PAGE_ACCESSED;
arch/openrisc/include/asm/pgtable.h +0 -2
@@ -236,8 +236,6 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_WRITE; }static inline int pte_exec (pte_t pte) {return pte_val (pte) & _PAGE_EXEC; }static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; } -static inline int pte_special (pte_t pte) {return 0 ; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; }static inline pte_t pte_wrprotect (pte_t pte) {
arch/parisc/include/asm/pgtable.h +0 -2
@@ -377,7 +377,6 @@ static inline void pud_clear(pud_t *pud) {static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; }static inline int pte_write (pte_t pte) {return pte_val (pte) & _PAGE_WRITE; } -static inline int pte_special (pte_t pte) {return 0 ; }static inline pte_t pte_mkclean (pte_t pte) {pte_val (pte) &= ~_PAGE_DIRTY;return pte; }static inline pte_t pte_mkold (pte_t pte) {pte_val (pte) &= ~_PAGE_ACCESSED;return pte; }
@@ -385,7 +384,6 @@ static inline pte_t pte_wrprotect(pte_t pte) { pte_val(pte) &= ~_PAGE_WRITE; retstatic inline pte_t pte_mkdirty (pte_t pte) {pte_val (pte) |= _PAGE_DIRTY;return pte; }static inline pte_t pte_mkyoung (pte_t pte) {pte_val (pte) |= _PAGE_ACCESSED;return pte; }static inline pte_t pte_mkwrite (pte_t pte) {pte_val (pte) |= _PAGE_WRITE;return pte; } -static inline pte_t pte_mkspecial (pte_t pte) {return pte; }/* * Huge pte definitions.
arch/sparc/include/asm/pgtable_32.h +0 -7
@@ -223,11 +223,6 @@ static inline int pte_young(pte_t pte)return pte_val (pte) &SRMMU_REF ; } -static inline int pte_special (pte_t pte) -{ -return 0 ; -} -static inline pte_t pte_wrprotect (pte_t pte) {return __pte (pte_val (pte) & ~SRMMU_WRITE );
@@ -258,8 +253,6 @@ static inline pte_t pte_mkyoung(pte_t pte)return __pte (pte_val (pte) |SRMMU_REF ); } -#define pte_mkspecial (pte) (pte) -#define pfn_pte (pfn, prot) mk_pte(pfn_to_page(pfn), prot)static inline unsigned long pte_pfn (pte_t pte)
arch/um/include/asm/pgtable.h +0 -10
@@ -167,11 +167,6 @@ static inline int pte_newprot(pte_t pte)return (pte_present (pte) && (pte_get_bits (pte, _PAGE_NEWPROT))); } -static inline int pte_special (pte_t pte) -{ -return 0 ; -} -/* * ================================= * Flags setting section.
@@ -247,11 +242,6 @@ static inline pte_t pte_mknewpage(pte_t pte)return (pte); } -static inline pte_t pte_mkspecial (pte_t pte) -{ -return (pte); -} -static inline void set_pte (pte_t *pteptr,pte_t pteval) {pte_copy (*pteptr, pteval);
arch/unicore32/include/asm/pgtable.h +0 -3
@@ -177,7 +177,6 @@ extern struct page *empty_zero_page;#define pte_dirty (pte) (pte_val(pte) & PTE_DIRTY)#define pte_young (pte) (pte_val(pte) & PTE_YOUNG)#define pte_exec (pte) (pte_val(pte) & PTE_EXEC) -#define pte_special (pte) (0)#define PTE_BIT_FUNC (fn, op) \ static inline pte_t pte_##fn(pte_t pte) { pte_val(pte) op; return pte; }
@@ -189,8 +188,6 @@ PTE_BIT_FUNC(mkdirty, |= PTE_DIRTY); PTE_BIT_FUNC(mkold, &= ~PTE_YOUNG); PTE_BIT_FUNC(mkyoung, |= PTE_YOUNG); -static inline pte_t pte_mkspecial (pte_t pte) {return pte; } -/* * Mark the prot value as uncacheable. */
arch/xtensa/include/asm/pgtable.h +0 -3
@@ -266,7 +266,6 @@ static inline void paging_init(void) { }static inline int pte_write (pte_t pte) {return pte_val (pte) & _PAGE_WRITABLE; }static inline int pte_dirty (pte_t pte) {return pte_val (pte) & _PAGE_DIRTY; }static inline int pte_young (pte_t pte) {return pte_val (pte) & _PAGE_ACCESSED; } -static inline int pte_special (pte_t pte) {return 0 ; }static inline pte_t pte_wrprotect (pte_t pte) {pte_val (pte) &= ~(_PAGE_WRITABLE | _PAGE_HW_WRITE);return pte; }
@@ -280,8 +279,6 @@ static inline pte_t pte_mkyoung(pte_t pte) {pte_val (pte) |= _PAGE_ACCESSED;return pte; }static inline pte_t pte_mkwrite (pte_t pte) {pte_val (pte) |= _PAGE_WRITABLE;return pte; } -static inline pte_t pte_mkspecial (pte_t pte) - {return pte; }#define pgprot_noncached (prot) (__pgprot(pgprot_val(prot) & ~_PAGE_CA_MASK))
include/linux/mm.h +12 -0
@@ -1720,6 +1720,18 @@ static inline void sync_mm_rss(struct mm_struct *mm) }#endif +#ifndef CONFIG_ARCH_HAS_PTE_SPECIAL +static inline int pte_special (pte_t pte) +{ +return 0 ; +} + +static inline pte_t pte_mkspecial (pte_t pte) +{ +return pte; +} +#endif +#ifndef CONFIG_ARCH_HAS_PTE_DEVMAP static inline int pte_devmap (pte_t pte) {
Signature · 1 line
2.20.1