| Message ID | 1566400018-15607-1-git-send-email-rppt@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: consolidate pgtable_cache_init() and pgd_cache_init() | expand |
On Wed, Aug 21, 2019 at 06:06:58PM +0300, Mike Rapoport wrote: > +++ b/arch/alpha/include/asm/pgtable.h > @@ -362,7 +362,6 @@ extern void paging_init(void); > /* > * No page table caches to initialise > */ > -#define pgtable_cache_init() do { } while (0) Delete the comment too? > +++ b/arch/arc/include/asm/pgtable.h > @@ -398,7 +398,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, > /* > * No page table caches to initialise > */ > -#define pgtable_cache_init() do { } while (0) ditto > +++ b/arch/arm/include/asm/pgtable.h > @@ -368,7 +368,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) > #define HAVE_ARCH_UNMAPPED_AREA > #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN > > -#define pgtable_cache_init() do { } while (0) > > #endif /* !__ASSEMBLY__ */ delete one of the two blank lines? > +++ b/arch/c6x/include/asm/pgtable.h > @@ -62,7 +62,6 @@ extern unsigned long empty_zero_page; > /* > * No page table caches to initialise > */ > -#define pgtable_cache_init() do { } while (0) delete comment ... more of these.
On Wed, Aug 21, 2019 at 08:15:44AM -0700, Matthew Wilcox wrote: > On Wed, Aug 21, 2019 at 06:06:58PM +0300, Mike Rapoport wrote: > > +++ b/arch/alpha/include/asm/pgtable.h > > @@ -362,7 +362,6 @@ extern void paging_init(void); > > /* > > * No page table caches to initialise > > */ > > -#define pgtable_cache_init() do { } while (0) > > Delete the comment too? > > > +++ b/arch/arc/include/asm/pgtable.h > > @@ -398,7 +398,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, > > /* > > * No page table caches to initialise > > */ > > -#define pgtable_cache_init() do { } while (0) > > ditto > > > +++ b/arch/arm/include/asm/pgtable.h > > @@ -368,7 +368,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) > > #define HAVE_ARCH_UNMAPPED_AREA > > #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN > > > > -#define pgtable_cache_init() do { } while (0) > > > > #endif /* !__ASSEMBLY__ */ > > delete one of the two blank lines? > > > +++ b/arch/c6x/include/asm/pgtable.h > > @@ -62,7 +62,6 @@ extern unsigned long empty_zero_page; > > /* > > * No page table caches to initialise > > */ > > -#define pgtable_cache_init() do { } while (0) > > delete comment ... more of these. Actually, most of them :) Thanks for spotting this.
On Wed, Aug 21, 2019 at 06:06:58PM +0300, Mike Rapoport wrote: > Both pgtable_cache_init() and pgd_cache_init() are used to initialize kmem > cache for page table allocations on several architectures that do not use > PAGE_SIZE tables for one or more levels of the page table hierarchy. > > Most architectures do not implement these functions and use __week default > NOP implementation of pgd_cache_init(). Since there is no such default for > pgtable_cache_init(), its empty stub is duplicated among most > architectures. > > Rename the definitions of pgd_cache_init() to pgtable_cache_init() and drop > empty stubs of pgtable_cache_init(). > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- [...] > diff --git a/arch/arm64/mm/pgd.c b/arch/arm64/mm/pgd.c > index 7548f9c..4a64089 100644 > --- a/arch/arm64/mm/pgd.c > +++ b/arch/arm64/mm/pgd.c > @@ -35,7 +35,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) > kmem_cache_free(pgd_cache, pgd); > } > > -void __init pgd_cache_init(void) > +void __init pgtable_cache_init(void) > { > if (PGD_SIZE == PAGE_SIZE) > return; [...] > diff --git a/init/main.c b/init/main.c > index b90cb5f..2fa8038 100644 > --- a/init/main.c > +++ b/init/main.c > @@ -507,7 +507,7 @@ void __init __weak mem_encrypt_init(void) { } > > void __init __weak poking_init(void) { } > > -void __init __weak pgd_cache_init(void) { } > +void __init __weak pgtable_cache_init(void) { } > > bool initcall_debug; > core_param(initcall_debug, initcall_debug, bool, 0644); > @@ -565,7 +565,6 @@ static void __init mm_init(void) > init_espfix_bsp(); > /* Should be run after espfix64 is set up. */ > pti_init(); > - pgd_cache_init(); > } AFAICT, this change means we now initialise our pgd cache before debug_objects_mem_init() has run. Is that going to cause fireworks with CONFIG_DEBUG_OBJECTS when we later free a pgd? Will
On Wed, Aug 21, 2019 at 04:49:42PM +0100, Will Deacon wrote: > On Wed, Aug 21, 2019 at 06:06:58PM +0300, Mike Rapoport wrote: > > Both pgtable_cache_init() and pgd_cache_init() are used to initialize kmem > > cache for page table allocations on several architectures that do not use > > PAGE_SIZE tables for one or more levels of the page table hierarchy. > > > > Most architectures do not implement these functions and use __week default > > NOP implementation of pgd_cache_init(). Since there is no such default for > > pgtable_cache_init(), its empty stub is duplicated among most > > architectures. > > > > Rename the definitions of pgd_cache_init() to pgtable_cache_init() and drop > > empty stubs of pgtable_cache_init(). > > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > > --- > > [...] > > > diff --git a/arch/arm64/mm/pgd.c b/arch/arm64/mm/pgd.c > > index 7548f9c..4a64089 100644 > > --- a/arch/arm64/mm/pgd.c > > +++ b/arch/arm64/mm/pgd.c > > @@ -35,7 +35,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) > > kmem_cache_free(pgd_cache, pgd); > > } > > > > -void __init pgd_cache_init(void) > > +void __init pgtable_cache_init(void) > > { > > if (PGD_SIZE == PAGE_SIZE) > > return; > > [...] > > > diff --git a/init/main.c b/init/main.c > > index b90cb5f..2fa8038 100644 > > --- a/init/main.c > > +++ b/init/main.c > > @@ -507,7 +507,7 @@ void __init __weak mem_encrypt_init(void) { } > > > > void __init __weak poking_init(void) { } > > > > -void __init __weak pgd_cache_init(void) { } > > +void __init __weak pgtable_cache_init(void) { } > > > > bool initcall_debug; > > core_param(initcall_debug, initcall_debug, bool, 0644); > > @@ -565,7 +565,6 @@ static void __init mm_init(void) > > init_espfix_bsp(); > > /* Should be run after espfix64 is set up. */ > > pti_init(); > > - pgd_cache_init(); > > } > > AFAICT, this change means we now initialise our pgd cache before > debug_objects_mem_init() has run. Right. > Is that going to cause fireworks with CONFIG_DEBUG_OBJECTS when we later > free a pgd? We don't allocate a pgd at that time, we only create the kmem cache for the future allocations. And that cache is never destroyed anyway. > Will
On Wed, Aug 21, 2019 at 07:01:59PM +0300, Mike Rapoport wrote: > On Wed, Aug 21, 2019 at 04:49:42PM +0100, Will Deacon wrote: > > On Wed, Aug 21, 2019 at 06:06:58PM +0300, Mike Rapoport wrote: > > > diff --git a/init/main.c b/init/main.c > > > index b90cb5f..2fa8038 100644 > > > --- a/init/main.c > > > +++ b/init/main.c > > > @@ -507,7 +507,7 @@ void __init __weak mem_encrypt_init(void) { } > > > > > > void __init __weak poking_init(void) { } > > > > > > -void __init __weak pgd_cache_init(void) { } > > > +void __init __weak pgtable_cache_init(void) { } > > > > > > bool initcall_debug; > > > core_param(initcall_debug, initcall_debug, bool, 0644); > > > @@ -565,7 +565,6 @@ static void __init mm_init(void) > > > init_espfix_bsp(); > > > /* Should be run after espfix64 is set up. */ > > > pti_init(); > > > - pgd_cache_init(); > > > } > > > > AFAICT, this change means we now initialise our pgd cache before > > debug_objects_mem_init() has run. > > Right. > > > Is that going to cause fireworks with CONFIG_DEBUG_OBJECTS when we later > > free a pgd? > > We don't allocate a pgd at that time, we only create the kmem cache for the > future allocations. And that cache is never destroyed anyway. Thanks for the explanation. In which case, for arm64: Acked-by: Will Deacon <will@kernel.org> Will
On Wed, 21 Aug 2019, Mike Rapoport wrote: > diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h > index b9b9f8a..0dca7f7 100644 > --- a/arch/x86/include/asm/pgtable_32.h > +++ b/arch/x86/include/asm/pgtable_32.h > @@ -29,7 +29,6 @@ extern pgd_t swapper_pg_dir[1024]; > extern pgd_t initial_page_table[1024]; > extern pmd_t initial_pg_pmd[]; > > -static inline void pgtable_cache_init(void) { } > void paging_init(void); > void sync_initial_page_table(void); > > diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h > index a26d2d5..0b6c4042 100644 > --- a/arch/x86/include/asm/pgtable_64.h > +++ b/arch/x86/include/asm/pgtable_64.h > @@ -241,8 +241,6 @@ extern void cleanup_highmap(void); > #define HAVE_ARCH_UNMAPPED_AREA > #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN > > -#define pgtable_cache_init() do { } while (0) > - > #define PAGE_AGP PAGE_KERNEL_NOCACHE > #define HAVE_PAGE_AGP 1 > > diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c > index 73757bc..3e4b903 100644 > --- a/arch/x86/mm/pgtable.c > +++ b/arch/x86/mm/pgtable.c > @@ -357,7 +357,7 @@ static void pgd_prepopulate_user_pmd(struct mm_struct *mm, > > static struct kmem_cache *pgd_cache; > > -void __init pgd_cache_init(void) > +void __init pgtable_cache_init(void) > { > /* > * When PAE kernel is running as a Xen domain, it does not use > @@ -402,10 +402,6 @@ static inline void _pgd_free(pgd_t *pgd) > } > #else > > -void __init pgd_cache_init(void) > -{ > -} Acked-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h index 89c2032..004c39f 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -362,7 +362,6 @@ extern void paging_init(void); /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) /* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT. */ #define HAVE_ARCH_UNMAPPED_AREA diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h index 1d87c18..a21a982 100644 --- a/arch/arc/include/asm/pgtable.h +++ b/arch/arc/include/asm/pgtable.h @@ -398,7 +398,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) #endif /* __ASSEMBLY__ */ diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h index 0b1f679..1faef7b 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h @@ -74,7 +74,6 @@ extern unsigned int kobjsize(const void *objp); /* * No page table caches to initialise. */ -#define pgtable_cache_init() do { } while (0) /* * All 32bit addresses are effectively valid for vmalloc... diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index f2e990d..ffefa19 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -368,7 +368,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -#define pgtable_cache_init() do { } while (0) #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 1535589d..8646f47 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -842,8 +842,6 @@ extern int kern_addr_valid(unsigned long addr); #include <asm-generic/pgtable.h> -static inline void pgtable_cache_init(void) { } - /* * On AArch64, the cache coherency is handled via the set_pte_at() function. */ diff --git a/arch/arm64/mm/pgd.c b/arch/arm64/mm/pgd.c index 7548f9c..4a64089 100644 --- a/arch/arm64/mm/pgd.c +++ b/arch/arm64/mm/pgd.c @@ -35,7 +35,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) kmem_cache_free(pgd_cache, pgd); } -void __init pgd_cache_init(void) +void __init pgtable_cache_init(void) { if (PGD_SIZE == PAGE_SIZE) return; diff --git a/arch/c6x/include/asm/pgtable.h b/arch/c6x/include/asm/pgtable.h index 0bd8059..0df491e 100644 --- a/arch/c6x/include/asm/pgtable.h +++ b/arch/c6x/include/asm/pgtable.h @@ -62,7 +62,6 @@ extern unsigned long empty_zero_page; /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) /* * c6x is !MMU, so define the simpliest implementation diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h index fc19ba4..d82b1fa 100644 --- a/arch/csky/include/asm/pgtable.h +++ b/arch/csky/include/asm/pgtable.h @@ -309,7 +309,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, /* * No page table caches to initialise */ -#define pgtable_cache_init() do {} while (0) #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ remap_pfn_range(vma, vaddr, pfn, size, prot) diff --git a/arch/h8300/include/asm/pgtable.h b/arch/h8300/include/asm/pgtable.h index a99caa4..dd76e6f 100644 --- a/arch/h8300/include/asm/pgtable.h +++ b/arch/h8300/include/asm/pgtable.h @@ -4,7 +4,6 @@ #define __ARCH_USE_5LEVEL_HACK #include <asm-generic/pgtable-nopud.h> #include <asm-generic/pgtable.h> -#define pgtable_cache_init() do { } while (0) extern void paging_init(void); #define PAGE_NONE __pgprot(0) /* these mean nothing to NO_MM */ #define PAGE_SHARED __pgprot(0) /* these mean nothing to NO_MM */ @@ -37,7 +36,6 @@ extern int is_in_rom(unsigned long); /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) /* * All 32bit addresses are effectively valid for vmalloc... diff --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h index a3ff6d2..06028c8 100644 --- a/arch/hexagon/include/asm/pgtable.h +++ b/arch/hexagon/include/asm/pgtable.h @@ -432,7 +432,6 @@ static inline int pte_exec(pte_t pte) #define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) /* I think this is in case we have page table caches; needed by init/main.c */ -#define pgtable_cache_init() do { } while (0) /* * Swap/file PTE definitions. If _PAGE_PRESENT is zero, the rest of the PTE is diff --git a/arch/hexagon/mm/Makefile b/arch/hexagon/mm/Makefile index 1894263..8938384 100644 --- a/arch/hexagon/mm/Makefile +++ b/arch/hexagon/mm/Makefile @@ -3,5 +3,5 @@ # Makefile for Hexagon memory management subsystem # -obj-y := init.o pgalloc.o ioremap.o uaccess.o vm_fault.o cache.o +obj-y := init.o ioremap.o uaccess.o vm_fault.o cache.o obj-y += copy_to_user.o copy_from_user.o strnlen_user.o vm_tlb.o diff --git a/arch/hexagon/mm/pgalloc.c b/arch/hexagon/mm/pgalloc.c deleted file mode 100644 index 4d43161..0000000 --- a/arch/hexagon/mm/pgalloc.c +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved. - */ - -#include <linux/init.h> - -void __init pgtable_cache_init(void) -{ -} diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index b1e7468e..d1296a5 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -569,7 +569,6 @@ extern struct page *zero_page_memmap_ptr; /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) /* These tell get_user_pages() that the first gate page is accessible from user-level. */ #define FIXADDR_USER_START GATE_ADDR diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h index b5269f1..43e0dff 100644 --- a/arch/m68k/include/asm/pgtable_mm.h +++ b/arch/m68k/include/asm/pgtable_mm.h @@ -176,6 +176,5 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) #endif /* _M68K_PGTABLE_H */ diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h index 69e2711..ae726d0 100644 --- a/arch/m68k/include/asm/pgtable_no.h +++ b/arch/m68k/include/asm/pgtable_no.h @@ -47,7 +47,6 @@ extern void paging_init(void); /* * No page table caches to initialise. */ -#define pgtable_cache_init() do { } while (0) /* * All 32bit addresses are effectively valid for vmalloc... diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 142d3f0..ddb2480 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -46,7 +46,6 @@ extern int mem_init_done; #define swapper_pg_dir ((pgd_t *) NULL) -#define pgtable_cache_init() do {} while (0) #define arch_enter_lazy_cpu_mode() do {} while (0) @@ -529,7 +528,6 @@ extern unsigned long iopa(unsigned long addr); /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) void do_page_fault(struct pt_regs *regs, unsigned long address, unsigned long error_code); diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index d60f47a..10ed453 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -664,6 +664,5 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) #endif /* _ASM_PGTABLE_H */ diff --git a/arch/nds32/include/asm/pgtable.h b/arch/nds32/include/asm/pgtable.h index c70cc56..791167d 100644 --- a/arch/nds32/include/asm/pgtable.h +++ b/arch/nds32/include/asm/pgtable.h @@ -403,7 +403,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; * into virtual address `from' */ -#define pgtable_cache_init() do { } while (0) #endif /* !__ASSEMBLY__ */ diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h index 95237b7..1a76506 100644 --- a/arch/nios2/include/asm/pgtable.h +++ b/arch/nios2/include/asm/pgtable.h @@ -291,7 +291,6 @@ static inline void pte_clear(struct mm_struct *mm, #include <asm-generic/pgtable.h> -#define pgtable_cache_init() do { } while (0) extern void __init paging_init(void); extern void __init mmu_init(void); diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h index 497fd90..7bd5633 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -446,7 +446,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) typedef pte_t *pte_addr_t; diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index a39b079..9b87769 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -133,7 +133,6 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) #define PTRS_PER_PTE (1UL << BITS_PER_PTE) /* Definitions for 2nd level */ -#define pgtable_cache_init() do { } while (0) #define PMD_SHIFT (PLD_SHIFT + BITS_PER_PTE) #define PMD_SIZE (1UL << PMD_SHIFT) diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index c58ba79..bd7212d 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -97,7 +97,6 @@ extern void update_mmu_cache(struct vm_area_struct *, unsigned long, pte_t *); unsigned long vmalloc_to_phys(void *vmalloc_addr); void pgtable_cache_add(unsigned int shift); -void pgtable_cache_init(void); #if defined(CONFIG_STRICT_KERNEL_RWX) || defined(CONFIG_PPC32) void mark_initmem_nx(void); diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index a364aba..f45f6fb 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -411,11 +411,6 @@ extern void *dtb_early_va; extern void setup_bootmem(void); extern void paging_init(void); -static inline void pgtable_cache_init(void) -{ - /* No page table caches to initialize */ -} - #define VMALLOC_SIZE (KERN_VIRT_SIZE >> 1) #define VMALLOC_END (PAGE_OFFSET - 1) #define VMALLOC_START (PAGE_OFFSET - VMALLOC_SIZE) diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 8f59454a..36c578c 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1682,11 +1682,6 @@ extern void s390_reset_cmma(struct mm_struct *mm); #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -/* - * No page table caches to initialise - */ -static inline void pgtable_cache_init(void) { } - #include <asm-generic/pgtable.h> #endif /* _S390_PAGE_H */ diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index 9085d11..cbd0f3c 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h @@ -123,11 +123,6 @@ typedef pte_t *pte_addr_t; #define pte_pfn(x) ((unsigned long)(((x).pte_low >> PAGE_SHIFT))) -/* - * Initialise the page table caches - */ -extern void pgtable_cache_init(void); - struct vm_area_struct; struct mm_struct; diff --git a/arch/sh/mm/nommu.c b/arch/sh/mm/nommu.c index cc779a9..dca946f 100644 --- a/arch/sh/mm/nommu.c +++ b/arch/sh/mm/nommu.c @@ -97,7 +97,3 @@ void __init page_table_range_init(unsigned long start, unsigned long end, void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t prot) { } - -void pgtable_cache_init(void) -{ -} diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 4eebed6..2d837d7 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -448,6 +448,5 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, /* * No page table caches to initialise */ -#define pgtable_cache_init() do { } while (0) #endif /* !(_SPARC_PGTABLE_H) */ diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 1599de7..b57f9c6 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -1135,7 +1135,6 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long, unsigned long); #define HAVE_ARCH_FB_UNMAPPED_AREA -void pgtable_cache_init(void); void sun4v_register_fault_status(void); void sun4v_ktsb_register(void); void __init cheetah_ecache_flush_init(void); diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index b377df7..ac95905 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -32,7 +32,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* zero page used for uninitialized stuff */ extern unsigned long *empty_zero_page; -#define pgtable_cache_init() do ; while (0) /* Just any arbitrary offset to the start of the vmalloc VM area: the * current 8MB value just means that there will be a 8MB "hole" after the diff --git a/arch/unicore32/include/asm/pgtable.h b/arch/unicore32/include/asm/pgtable.h index 9492aa3..c0f1363 100644 --- a/arch/unicore32/include/asm/pgtable.h +++ b/arch/unicore32/include/asm/pgtable.h @@ -287,7 +287,6 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; #include <asm-generic/pgtable.h> -#define pgtable_cache_init() do { } while (0) #endif /* !__ASSEMBLY__ */ diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index b9b9f8a..0dca7f7 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -29,7 +29,6 @@ extern pgd_t swapper_pg_dir[1024]; extern pgd_t initial_page_table[1024]; extern pmd_t initial_pg_pmd[]; -static inline void pgtable_cache_init(void) { } void paging_init(void); void sync_initial_page_table(void); diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index a26d2d5..0b6c4042 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -241,8 +241,6 @@ extern void cleanup_highmap(void); #define HAVE_ARCH_UNMAPPED_AREA #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -#define pgtable_cache_init() do { } while (0) - #define PAGE_AGP PAGE_KERNEL_NOCACHE #define HAVE_PAGE_AGP 1 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 73757bc..3e4b903 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -357,7 +357,7 @@ static void pgd_prepopulate_user_pmd(struct mm_struct *mm, static struct kmem_cache *pgd_cache; -void __init pgd_cache_init(void) +void __init pgtable_cache_init(void) { /* * When PAE kernel is running as a Xen domain, it does not use @@ -402,10 +402,6 @@ static inline void _pgd_free(pgd_t *pgd) } #else -void __init pgd_cache_init(void) -{ -} - static inline pgd_t *_pgd_alloc(void) { return (pgd_t *)__get_free_pages(GFP_PGTABLE_USER, diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index ce3ff5e..3f7fe5a 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -238,7 +238,6 @@ extern void paging_init(void); # define swapper_pg_dir NULL static inline void paging_init(void) { } #endif -static inline void pgtable_cache_init(void) { } /* * The pmd contains the kernel virtual address of the pte page. diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 0e25f55..8186918 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h @@ -1125,7 +1125,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, static inline void init_espfix_bsp(void) { } #endif -extern void __init pgd_cache_init(void); +extern void __init pgtable_cache_init(void); #ifndef __HAVE_ARCH_PFN_MODIFY_ALLOWED static inline bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot) diff --git a/init/main.c b/init/main.c index b90cb5f..2fa8038 100644 --- a/init/main.c +++ b/init/main.c @@ -507,7 +507,7 @@ void __init __weak mem_encrypt_init(void) { } void __init __weak poking_init(void) { } -void __init __weak pgd_cache_init(void) { } +void __init __weak pgtable_cache_init(void) { } bool initcall_debug; core_param(initcall_debug, initcall_debug, bool, 0644); @@ -565,7 +565,6 @@ static void __init mm_init(void) init_espfix_bsp(); /* Should be run after espfix64 is set up. */ pti_init(); - pgd_cache_init(); } void __init __weak arch_call_rest_init(void)
Both pgtable_cache_init() and pgd_cache_init() are used to initialize kmem cache for page table allocations on several architectures that do not use PAGE_SIZE tables for one or more levels of the page table hierarchy. Most architectures do not implement these functions and use __week default NOP implementation of pgd_cache_init(). Since there is no such default for pgtable_cache_init(), its empty stub is duplicated among most architectures. Rename the definitions of pgd_cache_init() to pgtable_cache_init() and drop empty stubs of pgtable_cache_init(). Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> --- arch/alpha/include/asm/pgtable.h | 1 - arch/arc/include/asm/pgtable.h | 1 - arch/arm/include/asm/pgtable-nommu.h | 1 - arch/arm/include/asm/pgtable.h | 1 - arch/arm64/include/asm/pgtable.h | 2 -- arch/arm64/mm/pgd.c | 2 +- arch/c6x/include/asm/pgtable.h | 1 - arch/csky/include/asm/pgtable.h | 1 - arch/h8300/include/asm/pgtable.h | 2 -- arch/hexagon/include/asm/pgtable.h | 1 - arch/hexagon/mm/Makefile | 2 +- arch/hexagon/mm/pgalloc.c | 10 ---------- arch/ia64/include/asm/pgtable.h | 1 - arch/m68k/include/asm/pgtable_mm.h | 1 - arch/m68k/include/asm/pgtable_no.h | 1 - arch/microblaze/include/asm/pgtable.h | 2 -- arch/mips/include/asm/pgtable.h | 1 - arch/nds32/include/asm/pgtable.h | 1 - arch/nios2/include/asm/pgtable.h | 1 - arch/openrisc/include/asm/pgtable.h | 1 - arch/parisc/include/asm/pgtable.h | 1 - arch/powerpc/include/asm/pgtable.h | 1 - arch/riscv/include/asm/pgtable.h | 5 ----- arch/s390/include/asm/pgtable.h | 5 ----- arch/sh/include/asm/pgtable.h | 5 ----- arch/sh/mm/nommu.c | 4 ---- arch/sparc/include/asm/pgtable_32.h | 1 - arch/sparc/include/asm/pgtable_64.h | 1 - arch/um/include/asm/pgtable.h | 1 - arch/unicore32/include/asm/pgtable.h | 1 - arch/x86/include/asm/pgtable_32.h | 1 - arch/x86/include/asm/pgtable_64.h | 2 -- arch/x86/mm/pgtable.c | 6 +----- arch/xtensa/include/asm/pgtable.h | 1 - include/asm-generic/pgtable.h | 2 +- init/main.c | 3 +-- 36 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 arch/hexagon/mm/pgalloc.c