* [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms
@ 2022-06-16 4:09 Anshuman Khandual
2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual
` (2 more replies)
0 siblings, 3 replies; 28+ messages in thread
From: Anshuman Khandual @ 2022-06-16 4:09 UTC (permalink / raw)
To: linux-mm; +Cc: hch, Anshuman Khandual, Andrew Morton, linux-kernel
__SXXX/__PXXX macros is an unnecessary abstraction layer in creating the
generic protection_map[] array which is used for vm_get_page_prot(). This
abstraction layer can be avoided, if the platforms just define the array
protection_map[] for all possible vm_flags access permission combinations.
This series drops __SXXX/__PXXX macros from across platforms in the tree.
First it makes protection_map[] array private (static) on platforms which
enable ARCH_HAS_VM_GET_PAGE_PROT, later moves protection_map[] array into
arch for all remaining platforms (!ARCH_HAS_VM_GET_PAGE_PROT), dropping
the generic one. In the process __SXXX/__PXXX macros become redundant and
thus get dropped off completely. I understand that the diff stat is large
here, but please do suggest if there is a better way. This series applies
on v5.19-rc1 and has been build tested for multiple platforms.
The CC list for this series has been reduced to just minimum, until there
is some initial agreement.
- Anshuman
Changes in V3:
- Fix build issues on powerpc and riscv
Changes in V2:
https://lore.kernel.org/all/20220613053354.553579-1-anshuman.khandual@arm.com/
- Add 'const' identifier to protection_map[] on powerpc
- Dropped #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT check from sparc 32
- Dropped protection_map[] init from sparc 64
- Dropped all new platform changes subscribing ARCH_HAS_VM_GET_PAGE_PROT
- Added a second patch which moves generic protection_map[] array into
all remaining platforms (!ARCH_HAS_VM_GET_PAGE_PROT)
Changes in V1:
https://lore.kernel.org/linux-mm/20220603101411.488970-1-anshuman.khandual@arm.com/
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org
Anshuman Khandual (2):
mm/mmap: Restrict generic protection_map[] array visibility
mm/mmap: Drop generic protection_map[] array
arch/alpha/include/asm/pgtable.h | 17 -------
arch/alpha/mm/init.c | 21 +++++++++
arch/arc/include/asm/pgtable-bits-arcv2.h | 18 --------
arch/arc/mm/mmap.c | 19 ++++++++
arch/arm/include/asm/pgtable.h | 17 -------
arch/arm/lib/uaccess_with_memcpy.c | 2 +-
arch/arm/mm/mmu.c | 19 ++++++++
arch/arm64/include/asm/pgtable-prot.h | 18 --------
arch/arm64/mm/mmap.c | 21 +++++++++
arch/csky/include/asm/pgtable.h | 18 --------
arch/csky/mm/init.c | 19 ++++++++
arch/hexagon/include/asm/pgtable.h | 27 ------------
arch/hexagon/mm/init.c | 41 +++++++++++++++++
arch/ia64/include/asm/pgtable.h | 18 --------
arch/ia64/mm/init.c | 27 +++++++++++-
arch/loongarch/include/asm/pgtable-bits.h | 19 --------
arch/loongarch/mm/cache.c | 45 +++++++++++++++++++
arch/m68k/include/asm/mcf_pgtable.h | 54 -----------------------
arch/m68k/include/asm/motorola_pgtable.h | 22 ---------
arch/m68k/include/asm/sun3_pgtable.h | 17 -------
arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++
arch/m68k/mm/motorola.c | 19 ++++++++
arch/m68k/mm/sun3mmu.c | 19 ++++++++
arch/microblaze/include/asm/pgtable.h | 17 -------
arch/microblaze/mm/init.c | 19 ++++++++
arch/mips/include/asm/pgtable.h | 22 ---------
arch/mips/mm/cache.c | 2 +
arch/nios2/include/asm/pgtable.h | 16 -------
arch/nios2/mm/init.c | 19 ++++++++
arch/openrisc/include/asm/pgtable.h | 18 --------
arch/openrisc/mm/init.c | 19 ++++++++
arch/parisc/include/asm/pgtable.h | 18 --------
arch/parisc/mm/init.c | 19 ++++++++
arch/powerpc/include/asm/pgtable.h | 18 --------
arch/powerpc/mm/book3s64/pgtable.c | 6 +++
arch/powerpc/mm/pgtable.c | 20 +++++++++
arch/riscv/include/asm/pgtable.h | 20 ---------
arch/riscv/mm/init.c | 19 ++++++++
arch/s390/include/asm/pgtable.h | 17 -------
arch/s390/mm/mmap.c | 19 ++++++++
arch/sh/include/asm/pgtable.h | 17 -------
arch/sh/mm/mmap.c | 19 ++++++++
arch/sparc/include/asm/pgtable_32.h | 19 --------
arch/sparc/include/asm/pgtable_64.h | 19 --------
arch/sparc/mm/init_32.c | 19 ++++++++
arch/sparc/mm/init_64.c | 3 ++
arch/um/include/asm/pgtable.h | 17 -------
arch/um/kernel/mem.c | 19 ++++++++
arch/x86/include/asm/pgtable_types.h | 19 --------
arch/x86/mm/pgprot.c | 19 ++++++++
arch/x86/um/mem_32.c | 2 +-
arch/xtensa/include/asm/pgtable.h | 18 --------
arch/xtensa/mm/init.c | 19 ++++++++
include/linux/mm.h | 2 +
mm/mmap.c | 19 --------
55 files changed, 547 insertions(+), 522 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-16 4:09 [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Anshuman Khandual @ 2022-06-16 4:09 ` Anshuman Khandual 2022-06-16 5:35 ` Christophe Leroy 2022-06-16 12:44 ` kernel test robot 2022-06-16 4:09 ` [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array Anshuman Khandual 2022-06-16 5:22 ` [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Christophe Leroy 2 siblings, 2 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-16 4:09 UTC (permalink / raw) To: linux-mm Cc: hch, Anshuman Khandual, Andrew Morton, linux-kernel, Christoph Hellwig Restrict generic protection_map[] array visibility only for platforms which do not enable ARCH_HAS_VM_GET_PAGE_PROT. For other platforms that do define their own vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, could have their private static protection_map[] still implementing an array look up. These private protection_map[] array could do without __PXXX/__SXXX macros, making them redundant and dropping them off as well. But platforms which do not define their custom vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, will still have to provide __PXXX/__SXXX macros. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/arm64/include/asm/pgtable-prot.h | 18 ------------------ arch/arm64/mm/mmap.c | 21 +++++++++++++++++++++ arch/powerpc/include/asm/pgtable.h | 2 ++ arch/powerpc/mm/book3s64/pgtable.c | 20 ++++++++++++++++++++ arch/sparc/include/asm/pgtable_64.h | 19 ------------------- arch/sparc/mm/init_64.c | 3 +++ arch/x86/include/asm/pgtable_types.h | 19 ------------------- arch/x86/mm/pgprot.c | 19 +++++++++++++++++++ include/linux/mm.h | 2 ++ mm/mmap.c | 2 +- 10 files changed, 68 insertions(+), 57 deletions(-) diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h index 62e0ebeed720..9b165117a454 100644 --- a/arch/arm64/include/asm/pgtable-prot.h +++ b/arch/arm64/include/asm/pgtable-prot.h @@ -89,24 +89,6 @@ extern bool arm64_use_ng_mappings; #define PAGE_READONLY_EXEC __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_RDONLY | PTE_NG | PTE_PXN) #define PAGE_EXECONLY __pgprot(_PAGE_DEFAULT | PTE_RDONLY | PTE_NG | PTE_PXN) -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_READONLY -#define __P011 PAGE_READONLY -#define __P100 PAGE_READONLY_EXEC /* PAGE_EXECONLY if Enhanced PAN */ -#define __P101 PAGE_READONLY_EXEC -#define __P110 PAGE_READONLY_EXEC -#define __P111 PAGE_READONLY_EXEC - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY_EXEC /* PAGE_EXECONLY if Enhanced PAN */ -#define __S101 PAGE_READONLY_EXEC -#define __S110 PAGE_SHARED_EXEC -#define __S111 PAGE_SHARED_EXEC - #endif /* __ASSEMBLY__ */ #endif /* __ASM_PGTABLE_PROT_H */ diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c index 78e9490f748d..8f5b7ce857ed 100644 --- a/arch/arm64/mm/mmap.c +++ b/arch/arm64/mm/mmap.c @@ -13,6 +13,27 @@ #include <asm/cpufeature.h> #include <asm/page.h> +static pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_READONLY, + [VM_WRITE | VM_READ] = PAGE_READONLY, + /* PAGE_EXECONLY if Enhanced PAN */ + [VM_EXEC] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_WRITE] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_READONLY_EXEC, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + /* PAGE_EXECONLY if Enhanced PAN */ + [VM_SHARED | VM_EXEC] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_EXEC +}; + /* * You really shouldn't be using read() or write() on /dev/mem. This might go * away in the future. diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index d564d0ecd4cd..8ed2a80c896e 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -21,6 +21,7 @@ struct mm_struct; #endif /* !CONFIG_PPC_BOOK3S */ /* Note due to the way vm flags are laid out, the bits are XWR */ +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT #define __P000 PAGE_NONE #define __P001 PAGE_READONLY #define __P010 PAGE_COPY @@ -38,6 +39,7 @@ struct mm_struct; #define __S101 PAGE_READONLY_X #define __S110 PAGE_SHARED_X #define __S111 PAGE_SHARED_X +#endif #ifndef __ASSEMBLY__ diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index 7b9966402b25..d3b019b95c1d 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -551,6 +551,26 @@ unsigned long memremap_compat_align(void) EXPORT_SYMBOL_GPL(memremap_compat_align); #endif +/* Note due to the way vm flags are laid out, the bits are XWR */ +static const pgprot_t protection_map[16] = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY_X, + [VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X +}; + pgprot_t vm_get_page_prot(unsigned long vm_flags) { unsigned long prot = pgprot_val(protection_map[vm_flags & diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 4679e45c8348..a779418ceba9 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -187,25 +187,6 @@ bool kern_addr_valid(unsigned long addr); #define _PAGE_SZHUGE_4U _PAGE_SZ4MB_4U #define _PAGE_SZHUGE_4V _PAGE_SZ4MB_4V -/* These are actually filled in at boot time by sun4{u,v}_pgprot_init() */ -#define __P000 __pgprot(0) -#define __P001 __pgprot(0) -#define __P010 __pgprot(0) -#define __P011 __pgprot(0) -#define __P100 __pgprot(0) -#define __P101 __pgprot(0) -#define __P110 __pgprot(0) -#define __P111 __pgprot(0) - -#define __S000 __pgprot(0) -#define __S001 __pgprot(0) -#define __S010 __pgprot(0) -#define __S011 __pgprot(0) -#define __S100 __pgprot(0) -#define __S101 __pgprot(0) -#define __S110 __pgprot(0) -#define __S111 __pgprot(0) - #ifndef __ASSEMBLY__ pte_t mk_pte_io(unsigned long, pgprot_t, int, unsigned long); diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index f6174df2d5af..d6faee23c77d 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2634,6 +2634,9 @@ void vmemmap_free(unsigned long start, unsigned long end, } #endif /* CONFIG_SPARSEMEM_VMEMMAP */ +/* These are actually filled in at boot time by sun4{u,v}_pgprot_init() */ +static pgprot_t protection_map[16] __ro_after_init; + static void prot_init_common(unsigned long page_none, unsigned long page_shared, unsigned long page_copy, diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index bdaf8391e2e0..aa174fed3a71 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -230,25 +230,6 @@ enum page_cache_mode { #endif /* __ASSEMBLY__ */ -/* xwr */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY_EXEC -#define __P101 PAGE_READONLY_EXEC -#define __P110 PAGE_COPY_EXEC -#define __P111 PAGE_COPY_EXEC - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY_EXEC -#define __S101 PAGE_READONLY_EXEC -#define __S110 PAGE_SHARED_EXEC -#define __S111 PAGE_SHARED_EXEC - /* * early identity mapping pte attrib macros. */ diff --git a/arch/x86/mm/pgprot.c b/arch/x86/mm/pgprot.c index 763742782286..7eca1b009af6 100644 --- a/arch/x86/mm/pgprot.c +++ b/arch/x86/mm/pgprot.c @@ -4,6 +4,25 @@ #include <linux/mm.h> #include <asm/pgtable.h> +static pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_WRITE] = PAGE_COPY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_EXEC, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_EXEC +}; + pgprot_t vm_get_page_prot(unsigned long vm_flags) { unsigned long val = pgprot_val(protection_map[vm_flags & diff --git a/include/linux/mm.h b/include/linux/mm.h index bc8f326be0ce..2254c1980c8e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -420,11 +420,13 @@ extern unsigned int kobjsize(const void *objp); #endif #define VM_FLAGS_CLEAR (ARCH_VM_PKEY_FLAGS | VM_ARCH_CLEAR) +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT /* * mapping from the currently active vm_flags protection bits (the * low four bits) to a page protection mask.. */ extern pgprot_t protection_map[16]; +#endif /* * The default fault flags that should be used by most of the diff --git a/mm/mmap.c b/mm/mmap.c index 61e6135c54ef..e66920414945 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -101,6 +101,7 @@ static void unmap_region(struct mm_struct *mm, * w: (no) no * x: (yes) yes */ +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT pgprot_t protection_map[16] __ro_after_init = { [VM_NONE] = __P000, [VM_READ] = __P001, @@ -120,7 +121,6 @@ pgprot_t protection_map[16] __ro_after_init = { [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __S111 }; -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT pgprot_t vm_get_page_prot(unsigned long vm_flags) { return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; -- 2.25.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual @ 2022-06-16 5:35 ` Christophe Leroy 2022-06-20 5:16 ` Anshuman Khandual 2022-06-16 12:44 ` kernel test robot 1 sibling, 1 reply; 28+ messages in thread From: Christophe Leroy @ 2022-06-16 5:35 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: hch, Andrew Morton, linux-kernel, Christoph Hellwig Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : > Restrict generic protection_map[] array visibility only for platforms which > do not enable ARCH_HAS_VM_GET_PAGE_PROT. For other platforms that do define > their own vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, could have > their private static protection_map[] still implementing an array look up. > These private protection_map[] array could do without __PXXX/__SXXX macros, > making them redundant and dropping them off as well. > > But platforms which do not define their custom vm_get_page_prot() enabling > ARCH_HAS_VM_GET_PAGE_PROT, will still have to provide __PXXX/__SXXX macros. > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Acked-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > arch/arm64/include/asm/pgtable-prot.h | 18 ------------------ > arch/arm64/mm/mmap.c | 21 +++++++++++++++++++++ > arch/powerpc/include/asm/pgtable.h | 2 ++ > arch/powerpc/mm/book3s64/pgtable.c | 20 ++++++++++++++++++++ > arch/sparc/include/asm/pgtable_64.h | 19 ------------------- > arch/sparc/mm/init_64.c | 3 +++ > arch/x86/include/asm/pgtable_types.h | 19 ------------------- > arch/x86/mm/pgprot.c | 19 +++++++++++++++++++ > include/linux/mm.h | 2 ++ > mm/mmap.c | 2 +- > 10 files changed, 68 insertions(+), 57 deletions(-) > > diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h > index d564d0ecd4cd..8ed2a80c896e 100644 > --- a/arch/powerpc/include/asm/pgtable.h > +++ b/arch/powerpc/include/asm/pgtable.h > @@ -21,6 +21,7 @@ struct mm_struct; > #endif /* !CONFIG_PPC_BOOK3S */ > > /* Note due to the way vm flags are laid out, the bits are XWR */ > +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT This ifdef if not necessary for now, it doesn't matter if __P000 etc still exist thought not used. > #define __P000 PAGE_NONE > #define __P001 PAGE_READONLY > #define __P010 PAGE_COPY > @@ -38,6 +39,7 @@ struct mm_struct; > #define __S101 PAGE_READONLY_X > #define __S110 PAGE_SHARED_X > #define __S111 PAGE_SHARED_X > +#endif > > #ifndef __ASSEMBLY__ > > diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c > index 7b9966402b25..d3b019b95c1d 100644 > --- a/arch/powerpc/mm/book3s64/pgtable.c > +++ b/arch/powerpc/mm/book3s64/pgtable.c > @@ -551,6 +551,26 @@ unsigned long memremap_compat_align(void) > EXPORT_SYMBOL_GPL(memremap_compat_align); > #endif > > +/* Note due to the way vm flags are laid out, the bits are XWR */ > +static const pgprot_t protection_map[16] = { > + [VM_NONE] = PAGE_NONE, > + [VM_READ] = PAGE_READONLY, > + [VM_WRITE] = PAGE_COPY, > + [VM_WRITE | VM_READ] = PAGE_COPY, > + [VM_EXEC] = PAGE_READONLY_X, > + [VM_EXEC | VM_READ] = PAGE_READONLY_X, > + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, > + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, > + [VM_SHARED] = PAGE_NONE, > + [VM_SHARED | VM_READ] = PAGE_READONLY, > + [VM_SHARED | VM_WRITE] = PAGE_SHARED, > + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, > + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, > + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, > + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, > + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X > +}; > + There is not much point is first additing that here and then move it elsewhere in the second patch. I think with my suggestion to use #ifdef __P000 as a guard, the powerpc changes could go in a single patch. > pgprot_t vm_get_page_prot(unsigned long vm_flags) > { > unsigned long prot = pgprot_val(protection_map[vm_flags & > diff --git a/mm/mmap.c b/mm/mmap.c > index 61e6135c54ef..e66920414945 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -101,6 +101,7 @@ static void unmap_region(struct mm_struct *mm, > * w: (no) no > * x: (yes) yes > */ > +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT You should use #ifdef __P000 instead, that way you could migrate architectures one by one. > pgprot_t protection_map[16] __ro_after_init = { > [VM_NONE] = __P000, > [VM_READ] = __P001, > @@ -120,7 +121,6 @@ pgprot_t protection_map[16] __ro_after_init = { > [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __S111 > }; > > -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > pgprot_t vm_get_page_prot(unsigned long vm_flags) > { > return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-16 5:35 ` Christophe Leroy @ 2022-06-20 5:16 ` Anshuman Khandual 2022-06-20 6:41 ` Christophe Leroy 0 siblings, 1 reply; 28+ messages in thread From: Anshuman Khandual @ 2022-06-20 5:16 UTC (permalink / raw) To: Christophe Leroy, linux-mm Cc: hch, Andrew Morton, linux-kernel, Christoph Hellwig On 6/16/22 11:05, Christophe Leroy wrote: > > Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >> Restrict generic protection_map[] array visibility only for platforms which >> do not enable ARCH_HAS_VM_GET_PAGE_PROT. For other platforms that do define >> their own vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, could have >> their private static protection_map[] still implementing an array look up. >> These private protection_map[] array could do without __PXXX/__SXXX macros, >> making them redundant and dropping them off as well. >> >> But platforms which do not define their custom vm_get_page_prot() enabling >> ARCH_HAS_VM_GET_PAGE_PROT, will still have to provide __PXXX/__SXXX macros. >> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> Cc: linux-mm@kvack.org >> Cc: linux-kernel@vger.kernel.org >> Acked-by: Christoph Hellwig <hch@lst.de> >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >> --- >> arch/arm64/include/asm/pgtable-prot.h | 18 ------------------ >> arch/arm64/mm/mmap.c | 21 +++++++++++++++++++++ >> arch/powerpc/include/asm/pgtable.h | 2 ++ >> arch/powerpc/mm/book3s64/pgtable.c | 20 ++++++++++++++++++++ >> arch/sparc/include/asm/pgtable_64.h | 19 ------------------- >> arch/sparc/mm/init_64.c | 3 +++ >> arch/x86/include/asm/pgtable_types.h | 19 ------------------- >> arch/x86/mm/pgprot.c | 19 +++++++++++++++++++ >> include/linux/mm.h | 2 ++ >> mm/mmap.c | 2 +- >> 10 files changed, 68 insertions(+), 57 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >> index d564d0ecd4cd..8ed2a80c896e 100644 >> --- a/arch/powerpc/include/asm/pgtable.h >> +++ b/arch/powerpc/include/asm/pgtable.h >> @@ -21,6 +21,7 @@ struct mm_struct; >> #endif /* !CONFIG_PPC_BOOK3S */ >> >> /* Note due to the way vm flags are laid out, the bits are XWR */ >> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > This ifdef if not necessary for now, it doesn't matter if __P000 etc > still exist thought not used. > >> #define __P000 PAGE_NONE >> #define __P001 PAGE_READONLY >> #define __P010 PAGE_COPY >> @@ -38,6 +39,7 @@ struct mm_struct; >> #define __S101 PAGE_READONLY_X >> #define __S110 PAGE_SHARED_X >> #define __S111 PAGE_SHARED_X >> +#endif >> >> #ifndef __ASSEMBLY__ >> >> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c >> index 7b9966402b25..d3b019b95c1d 100644 >> --- a/arch/powerpc/mm/book3s64/pgtable.c >> +++ b/arch/powerpc/mm/book3s64/pgtable.c >> @@ -551,6 +551,26 @@ unsigned long memremap_compat_align(void) >> EXPORT_SYMBOL_GPL(memremap_compat_align); >> #endif >> >> +/* Note due to the way vm flags are laid out, the bits are XWR */ >> +static const pgprot_t protection_map[16] = { >> + [VM_NONE] = PAGE_NONE, >> + [VM_READ] = PAGE_READONLY, >> + [VM_WRITE] = PAGE_COPY, >> + [VM_WRITE | VM_READ] = PAGE_COPY, >> + [VM_EXEC] = PAGE_READONLY_X, >> + [VM_EXEC | VM_READ] = PAGE_READONLY_X, >> + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, >> + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, >> + [VM_SHARED] = PAGE_NONE, >> + [VM_SHARED | VM_READ] = PAGE_READONLY, >> + [VM_SHARED | VM_WRITE] = PAGE_SHARED, >> + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, >> + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, >> + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, >> + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, >> + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X >> +}; >> + > There is not much point is first additing that here and then move it > elsewhere in the second patch. > > I think with my suggestion to use #ifdef __P000 as a guard, the powerpc > changes could go in a single patch. > >> pgprot_t vm_get_page_prot(unsigned long vm_flags) >> { >> unsigned long prot = pgprot_val(protection_map[vm_flags & >> diff --git a/mm/mmap.c b/mm/mmap.c >> index 61e6135c54ef..e66920414945 100644 >> --- a/mm/mmap.c >> +++ b/mm/mmap.c >> @@ -101,6 +101,7 @@ static void unmap_region(struct mm_struct *mm, >> * w: (no) no >> * x: (yes) yes >> */ >> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > You should use #ifdef __P000 instead, that way you could migrate > architectures one by one. If vm_get_page_prot() gets moved into all platforms, wondering what would be the preferred method to organize this patch series ? 1. Move protection_map[] inside platforms with ARCH_HAS_VM_PAGE_PROT (current patch 1) 2. Convert remaining platforms to use ARCH_HAS_VM_PAGE_PROT one after the other 3. Drop ARCH_HAS_VM_PAGE_PROT completely Using "#ifdef __P000" for wrapping protection_map[] will leave two different #ifdefs in flight i.e __P000, ARCH_HAS_VM_PAGE_PROT in the generic mmap code, until both gets dropped eventually. But using "#ifdef __P000" does enable splitting the first patch into multiple changes for each individual platforms. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-20 5:16 ` Anshuman Khandual @ 2022-06-20 6:41 ` Christophe Leroy 2022-06-21 9:44 ` Anshuman Khandual 0 siblings, 1 reply; 28+ messages in thread From: Christophe Leroy @ 2022-06-20 6:41 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: hch, Andrew Morton, linux-kernel, Christoph Hellwig Le 20/06/2022 à 07:16, Anshuman Khandual a écrit : > > > On 6/16/22 11:05, Christophe Leroy wrote: >> >> Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >>> Restrict generic protection_map[] array visibility only for platforms which >>> do not enable ARCH_HAS_VM_GET_PAGE_PROT. For other platforms that do define >>> their own vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, could have >>> their private static protection_map[] still implementing an array look up. >>> These private protection_map[] array could do without __PXXX/__SXXX macros, >>> making them redundant and dropping them off as well. >>> >>> But platforms which do not define their custom vm_get_page_prot() enabling >>> ARCH_HAS_VM_GET_PAGE_PROT, will still have to provide __PXXX/__SXXX macros. >>> >>> Cc: Andrew Morton <akpm@linux-foundation.org> >>> Cc: linux-mm@kvack.org >>> Cc: linux-kernel@vger.kernel.org >>> Acked-by: Christoph Hellwig <hch@lst.de> >>> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >>> --- >>> arch/arm64/include/asm/pgtable-prot.h | 18 ------------------ >>> arch/arm64/mm/mmap.c | 21 +++++++++++++++++++++ >>> arch/powerpc/include/asm/pgtable.h | 2 ++ >>> arch/powerpc/mm/book3s64/pgtable.c | 20 ++++++++++++++++++++ >>> arch/sparc/include/asm/pgtable_64.h | 19 ------------------- >>> arch/sparc/mm/init_64.c | 3 +++ >>> arch/x86/include/asm/pgtable_types.h | 19 ------------------- >>> arch/x86/mm/pgprot.c | 19 +++++++++++++++++++ >>> include/linux/mm.h | 2 ++ >>> mm/mmap.c | 2 +- >>> 10 files changed, 68 insertions(+), 57 deletions(-) >>> >>> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >>> index d564d0ecd4cd..8ed2a80c896e 100644 >>> --- a/arch/powerpc/include/asm/pgtable.h >>> +++ b/arch/powerpc/include/asm/pgtable.h >>> @@ -21,6 +21,7 @@ struct mm_struct; >>> #endif /* !CONFIG_PPC_BOOK3S */ >>> >>> /* Note due to the way vm flags are laid out, the bits are XWR */ >>> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >> This ifdef if not necessary for now, it doesn't matter if __P000 etc >> still exist thought not used. >> >>> #define __P000 PAGE_NONE >>> #define __P001 PAGE_READONLY >>> #define __P010 PAGE_COPY >>> @@ -38,6 +39,7 @@ struct mm_struct; >>> #define __S101 PAGE_READONLY_X >>> #define __S110 PAGE_SHARED_X >>> #define __S111 PAGE_SHARED_X >>> +#endif >>> >>> #ifndef __ASSEMBLY__ >>> >>> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c >>> index 7b9966402b25..d3b019b95c1d 100644 >>> --- a/arch/powerpc/mm/book3s64/pgtable.c >>> +++ b/arch/powerpc/mm/book3s64/pgtable.c >>> @@ -551,6 +551,26 @@ unsigned long memremap_compat_align(void) >>> EXPORT_SYMBOL_GPL(memremap_compat_align); >>> #endif >>> >>> +/* Note due to the way vm flags are laid out, the bits are XWR */ >>> +static const pgprot_t protection_map[16] = { >>> + [VM_NONE] = PAGE_NONE, >>> + [VM_READ] = PAGE_READONLY, >>> + [VM_WRITE] = PAGE_COPY, >>> + [VM_WRITE | VM_READ] = PAGE_COPY, >>> + [VM_EXEC] = PAGE_READONLY_X, >>> + [VM_EXEC | VM_READ] = PAGE_READONLY_X, >>> + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, >>> + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, >>> + [VM_SHARED] = PAGE_NONE, >>> + [VM_SHARED | VM_READ] = PAGE_READONLY, >>> + [VM_SHARED | VM_WRITE] = PAGE_SHARED, >>> + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, >>> + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, >>> + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, >>> + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, >>> + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X >>> +}; >>> + >> There is not much point is first additing that here and then move it >> elsewhere in the second patch. >> >> I think with my suggestion to use #ifdef __P000 as a guard, the powerpc >> changes could go in a single patch. >> >>> pgprot_t vm_get_page_prot(unsigned long vm_flags) >>> { >>> unsigned long prot = pgprot_val(protection_map[vm_flags & >>> diff --git a/mm/mmap.c b/mm/mmap.c >>> index 61e6135c54ef..e66920414945 100644 >>> --- a/mm/mmap.c >>> +++ b/mm/mmap.c >>> @@ -101,6 +101,7 @@ static void unmap_region(struct mm_struct *mm, >>> * w: (no) no >>> * x: (yes) yes >>> */ >>> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >> You should use #ifdef __P000 instead, that way you could migrate >> architectures one by one. > > If vm_get_page_prot() gets moved into all platforms, wondering what would be > the preferred method to organize this patch series ? > > 1. Move protection_map[] inside platforms with ARCH_HAS_VM_PAGE_PROT (current patch 1) > 2. Convert remaining platforms to use ARCH_HAS_VM_PAGE_PROT one after the other > 3. Drop ARCH_HAS_VM_PAGE_PROT completely > > Using "#ifdef __P000" for wrapping protection_map[] will leave two different #ifdefs > in flight i.e __P000, ARCH_HAS_VM_PAGE_PROT in the generic mmap code, until both gets > dropped eventually. But using "#ifdef __P000" does enable splitting the first patch > into multiple changes for each individual platforms. From previous discussions and based on Christoph's suggestion, I guess we now aim at getting vm_get_page_prot() moved into all platforms together with protection_map[]. Therefore the use of #ifdef __P000 could be very temporary at the begining of the series: 1. Guard generic protection_map[] with #ifdef ___P000 2. Move protection_map[] into architecture and drop __Pxxx/__Sxxx for arm64 3. Same for sparc 4. Same for x86 5. Convert entire powerpc to ARCH_HAS_VM_PAGE_PROT and move protection_map[] into architecture and drop __Pxxx/__Sxxx 6. Replace #ifdef __P000 by #ifdef CONFIG_ARCH_HAS_VM_PAGE_PROT 7. Convert all remaining platforms to CONFIG_ARCH_HAS_VM_PAGE_PROT one by one (but keep a protection_map[] table, don't use switch/case) 8. Drop ARCH_HAS_VM_PAGE_PROT completely. Eventually you can squash step 6 into step 8. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-20 6:41 ` Christophe Leroy @ 2022-06-21 9:44 ` Anshuman Khandual 0 siblings, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-21 9:44 UTC (permalink / raw) To: Christophe Leroy, linux-mm Cc: hch, Andrew Morton, linux-kernel, Christoph Hellwig On 6/20/22 12:11, Christophe Leroy wrote: > > > Le 20/06/2022 à 07:16, Anshuman Khandual a écrit : >> >> >> On 6/16/22 11:05, Christophe Leroy wrote: >>> >>> Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >>>> Restrict generic protection_map[] array visibility only for platforms which >>>> do not enable ARCH_HAS_VM_GET_PAGE_PROT. For other platforms that do define >>>> their own vm_get_page_prot() enabling ARCH_HAS_VM_GET_PAGE_PROT, could have >>>> their private static protection_map[] still implementing an array look up. >>>> These private protection_map[] array could do without __PXXX/__SXXX macros, >>>> making them redundant and dropping them off as well. >>>> >>>> But platforms which do not define their custom vm_get_page_prot() enabling >>>> ARCH_HAS_VM_GET_PAGE_PROT, will still have to provide __PXXX/__SXXX macros. >>>> >>>> Cc: Andrew Morton <akpm@linux-foundation.org> >>>> Cc: linux-mm@kvack.org >>>> Cc: linux-kernel@vger.kernel.org >>>> Acked-by: Christoph Hellwig <hch@lst.de> >>>> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >>>> --- >>>> arch/arm64/include/asm/pgtable-prot.h | 18 ------------------ >>>> arch/arm64/mm/mmap.c | 21 +++++++++++++++++++++ >>>> arch/powerpc/include/asm/pgtable.h | 2 ++ >>>> arch/powerpc/mm/book3s64/pgtable.c | 20 ++++++++++++++++++++ >>>> arch/sparc/include/asm/pgtable_64.h | 19 ------------------- >>>> arch/sparc/mm/init_64.c | 3 +++ >>>> arch/x86/include/asm/pgtable_types.h | 19 ------------------- >>>> arch/x86/mm/pgprot.c | 19 +++++++++++++++++++ >>>> include/linux/mm.h | 2 ++ >>>> mm/mmap.c | 2 +- >>>> 10 files changed, 68 insertions(+), 57 deletions(-) >>>> >>>> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >>>> index d564d0ecd4cd..8ed2a80c896e 100644 >>>> --- a/arch/powerpc/include/asm/pgtable.h >>>> +++ b/arch/powerpc/include/asm/pgtable.h >>>> @@ -21,6 +21,7 @@ struct mm_struct; >>>> #endif /* !CONFIG_PPC_BOOK3S */ >>>> >>>> /* Note due to the way vm flags are laid out, the bits are XWR */ >>>> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >>> This ifdef if not necessary for now, it doesn't matter if __P000 etc >>> still exist thought not used. >>> >>>> #define __P000 PAGE_NONE >>>> #define __P001 PAGE_READONLY >>>> #define __P010 PAGE_COPY >>>> @@ -38,6 +39,7 @@ struct mm_struct; >>>> #define __S101 PAGE_READONLY_X >>>> #define __S110 PAGE_SHARED_X >>>> #define __S111 PAGE_SHARED_X >>>> +#endif >>>> >>>> #ifndef __ASSEMBLY__ >>>> >>>> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c >>>> index 7b9966402b25..d3b019b95c1d 100644 >>>> --- a/arch/powerpc/mm/book3s64/pgtable.c >>>> +++ b/arch/powerpc/mm/book3s64/pgtable.c >>>> @@ -551,6 +551,26 @@ unsigned long memremap_compat_align(void) >>>> EXPORT_SYMBOL_GPL(memremap_compat_align); >>>> #endif >>>> >>>> +/* Note due to the way vm flags are laid out, the bits are XWR */ >>>> +static const pgprot_t protection_map[16] = { >>>> + [VM_NONE] = PAGE_NONE, >>>> + [VM_READ] = PAGE_READONLY, >>>> + [VM_WRITE] = PAGE_COPY, >>>> + [VM_WRITE | VM_READ] = PAGE_COPY, >>>> + [VM_EXEC] = PAGE_READONLY_X, >>>> + [VM_EXEC | VM_READ] = PAGE_READONLY_X, >>>> + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, >>>> + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, >>>> + [VM_SHARED] = PAGE_NONE, >>>> + [VM_SHARED | VM_READ] = PAGE_READONLY, >>>> + [VM_SHARED | VM_WRITE] = PAGE_SHARED, >>>> + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, >>>> + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, >>>> + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, >>>> + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, >>>> + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X >>>> +}; >>>> + >>> There is not much point is first additing that here and then move it >>> elsewhere in the second patch. >>> >>> I think with my suggestion to use #ifdef __P000 as a guard, the powerpc >>> changes could go in a single patch. >>> >>>> pgprot_t vm_get_page_prot(unsigned long vm_flags) >>>> { >>>> unsigned long prot = pgprot_val(protection_map[vm_flags & >>>> diff --git a/mm/mmap.c b/mm/mmap.c >>>> index 61e6135c54ef..e66920414945 100644 >>>> --- a/mm/mmap.c >>>> +++ b/mm/mmap.c >>>> @@ -101,6 +101,7 @@ static void unmap_region(struct mm_struct *mm, >>>> * w: (no) no >>>> * x: (yes) yes >>>> */ >>>> +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >>> You should use #ifdef __P000 instead, that way you could migrate >>> architectures one by one. >> >> If vm_get_page_prot() gets moved into all platforms, wondering what would be >> the preferred method to organize this patch series ? >> >> 1. Move protection_map[] inside platforms with ARCH_HAS_VM_PAGE_PROT (current patch 1) >> 2. Convert remaining platforms to use ARCH_HAS_VM_PAGE_PROT one after the other >> 3. Drop ARCH_HAS_VM_PAGE_PROT completely >> >> Using "#ifdef __P000" for wrapping protection_map[] will leave two different #ifdefs >> in flight i.e __P000, ARCH_HAS_VM_PAGE_PROT in the generic mmap code, until both gets >> dropped eventually. But using "#ifdef __P000" does enable splitting the first patch >> into multiple changes for each individual platforms. > > From previous discussions and based on Christoph's suggestion, I guess > we now aim at getting vm_get_page_prot() moved into all platforms > together with protection_map[]. Therefore the use of #ifdef __P000 could > be very temporary at the begining of the series: > 1. Guard generic protection_map[] with #ifdef ___P000 > 2. Move protection_map[] into architecture and drop __Pxxx/__Sxxx for arm64 > 3. Same for sparc > 4. Same for x86 > 5. Convert entire powerpc to ARCH_HAS_VM_PAGE_PROT and move > protection_map[] into architecture and drop __Pxxx/__Sxxx > 6. Replace #ifdef __P000 by #ifdef CONFIG_ARCH_HAS_VM_PAGE_PROT > 7. Convert all remaining platforms to CONFIG_ARCH_HAS_VM_PAGE_PROT one > by one (but keep a protection_map[] table, don't use switch/case) > 8. Drop ARCH_HAS_VM_PAGE_PROT completely. > > Eventually you can squash step 6 into step 8. Keeping individual platform changes in a separate patch will make the series cleaner, and also much easier to review. But the flow explained above sounds good to me. I will work on these changes. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual 2022-06-16 5:35 ` Christophe Leroy @ 2022-06-16 12:44 ` kernel test robot 2022-06-20 4:45 ` Anshuman Khandual 1 sibling, 1 reply; 28+ messages in thread From: kernel test robot @ 2022-06-16 12:44 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: kbuild-all, hch, Anshuman Khandual, Andrew Morton, Linux Memory Management List, linux-kernel, Christoph Hellwig Hi Anshuman, Thank you for the patch! Yet something to improve: [auto build test ERROR on akpm-mm/mm-everything] url: https://github.com/intel-lab-lkp/linux/commits/Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220616/202206162004.ak9KTfMD-lkp@intel.com/config) compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 reproduce (this is a W=1 build): # https://github.com/intel-lab-lkp/linux/commit/4eb89368b130fe235d5e587bcc2eec18bb688e2d git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 git checkout 4eb89368b130fe235d5e587bcc2eec18bb688e2d # save the config file mkdir build_dir && cp config build_dir/.config make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash arch/x86/ If you fix the issue, kindly add following tag where applicable Reported-by: kernel test robot <lkp@intel.com> All errors (new ones prefixed by >>): In file included from arch/x86/include/asm/percpu.h:27, from arch/x86/include/asm/preempt.h:6, from include/linux/preempt.h:78, from include/linux/spinlock.h:55, from include/linux/mmzone.h:8, from include/linux/gfp.h:6, from include/linux/mm.h:7, from arch/x86/mm/mem_encrypt_amd.c:14: arch/x86/mm/mem_encrypt_amd.c: In function 'sme_early_init': >> arch/x86/mm/mem_encrypt_amd.c:499:36: error: 'protection_map' undeclared (first use in this function) 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) | ^~~~~~~~~~~~~~ include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | ^~~ arch/x86/mm/mem_encrypt_amd.c:499:36: note: each undeclared identifier is reported only once for each function it appears in 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) | ^~~~~~~~~~~~~~ include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | ^~~ In file included from include/linux/bits.h:22, from include/linux/ratelimit_types.h:5, from include/linux/printk.h:9, from include/asm-generic/bug.h:22, from arch/x86/include/asm/bug.h:87, from include/linux/bug.h:5, from include/linux/mmdebug.h:5, from include/linux/mm.h:6, from arch/x86/mm/mem_encrypt_amd.c:14: include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); }))) | ^ include/linux/compiler.h:240:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO' 240 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) | ^~~~~~~~~~~~~~~~~ include/linux/kernel.h:55:59: note: in expansion of macro '__must_be_array' 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) | ^~~~~~~~~~~~~~~ arch/x86/mm/mem_encrypt_amd.c:499:25: note: in expansion of macro 'ARRAY_SIZE' 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) | ^~~~~~~~~~ vim +/protection_map +499 arch/x86/mm/mem_encrypt_amd.c 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 486 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 487 void __init sme_early_init(void) 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 488 { 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 489 unsigned int i; 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 490 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 491 if (!sme_me_mask) 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 492 return; 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 493 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 494 early_pmd_flags = __sme_set(early_pmd_flags); 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 495 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 496 __supported_pte_mask = __sme_set(__supported_pte_mask); 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 497 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 498 /* Update the protection map with memory encryption mask */ 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 @499 for (i = 0; i < ARRAY_SIZE(protection_map); i++) 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 500 protection_map[i] = pgprot_encrypted(protection_map[i]); 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 501 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 502 x86_platform.guest.enc_status_change_prepare = amd_enc_status_change_prepare; 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 503 x86_platform.guest.enc_status_change_finish = amd_enc_status_change_finish; 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 504 x86_platform.guest.enc_tlb_flush_required = amd_enc_tlb_flush_required; 1e8c5971c24989 arch/x86/mm/mem_encrypt_amd.c Brijesh Singh 2022-02-22 505 x86_platform.guest.enc_cache_flush_required = amd_enc_cache_flush_required; f4495615d76cfe arch/x86/mm/mem_encrypt.c Ashish Kalra 2021-08-24 506 } f4495615d76cfe arch/x86/mm/mem_encrypt.c Ashish Kalra 2021-08-24 507 -- 0-DAY CI Kernel Test Service https://01.org/lkp ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-16 12:44 ` kernel test robot @ 2022-06-20 4:45 ` Anshuman Khandual 0 siblings, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-20 4:45 UTC (permalink / raw) To: kernel test robot, linux-mm Cc: kbuild-all, hch, Andrew Morton, linux-kernel, Christoph Hellwig On 6/16/22 18:14, kernel test robot wrote: > Hi Anshuman, > > Thank you for the patch! Yet something to improve: > > [auto build test ERROR on akpm-mm/mm-everything] > > url: https://github.com/intel-lab-lkp/linux/commits/Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything > config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220616/202206162004.ak9KTfMD-lkp@intel.com/config) > compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 > reproduce (this is a W=1 build): > # https://github.com/intel-lab-lkp/linux/commit/4eb89368b130fe235d5e587bcc2eec18bb688e2d > git remote add linux-review https://github.com/intel-lab-lkp/linux > git fetch --no-tags linux-review Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 > git checkout 4eb89368b130fe235d5e587bcc2eec18bb688e2d > # save the config file > mkdir build_dir && cp config build_dir/.config > make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash arch/x86/ > > If you fix the issue, kindly add following tag where applicable > Reported-by: kernel test robot <lkp@intel.com> > > All errors (new ones prefixed by >>): > > In file included from arch/x86/include/asm/percpu.h:27, > from arch/x86/include/asm/preempt.h:6, > from include/linux/preempt.h:78, > from include/linux/spinlock.h:55, > from include/linux/mmzone.h:8, > from include/linux/gfp.h:6, > from include/linux/mm.h:7, > from arch/x86/mm/mem_encrypt_amd.c:14: > arch/x86/mm/mem_encrypt_amd.c: In function 'sme_early_init': >>> arch/x86/mm/mem_encrypt_amd.c:499:36: error: 'protection_map' undeclared (first use in this function) > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~~~~~ > include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~ > arch/x86/mm/mem_encrypt_amd.c:499:36: note: each undeclared identifier is reported only once for each function it appears in > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~~~~~ > include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~ > In file included from include/linux/bits.h:22, > from include/linux/ratelimit_types.h:5, > from include/linux/printk.h:9, > from include/asm-generic/bug.h:22, > from arch/x86/include/asm/bug.h:87, > from include/linux/bug.h:5, > from include/linux/mmdebug.h:5, > from include/linux/mm.h:6, > from arch/x86/mm/mem_encrypt_amd.c:14: > include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); }))) > | ^ > include/linux/compiler.h:240:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO' > 240 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) > | ^~~~~~~~~~~~~~~~~ > include/linux/kernel.h:55:59: note: in expansion of macro '__must_be_array' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~~~~~~~~~~~~~ > arch/x86/mm/mem_encrypt_amd.c:499:25: note: in expansion of macro 'ARRAY_SIZE' > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~ This patch fixes the build failure here. diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index f6d038e2cd8e..d0c2ec1bb659 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -484,6 +484,8 @@ void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, boo enc_dec_hypercall(vaddr, npages, enc); } +extern pgprot_t protection_map[16]; + void __init sme_early_init(void) { unsigned int i; diff --git a/arch/x86/mm/pgprot.c b/arch/x86/mm/pgprot.c index 7eca1b009af6..96eca0b2ec90 100644 --- a/arch/x86/mm/pgprot.c +++ b/arch/x86/mm/pgprot.c @@ -4,7 +4,7 @@ #include <linux/mm.h> #include <asm/pgtable.h> -static pgprot_t protection_map[16] __ro_after_init = { +pgprot_t protection_map[16] __ro_after_init = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READONLY, [VM_WRITE] = PAGE_COPY, ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility @ 2022-06-20 4:45 ` Anshuman Khandual 0 siblings, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-20 4:45 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 5314 bytes --] On 6/16/22 18:14, kernel test robot wrote: > Hi Anshuman, > > Thank you for the patch! Yet something to improve: > > [auto build test ERROR on akpm-mm/mm-everything] > > url: https://github.com/intel-lab-lkp/linux/commits/Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 > base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything > config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220616/202206162004.ak9KTfMD-lkp(a)intel.com/config) > compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 > reproduce (this is a W=1 build): > # https://github.com/intel-lab-lkp/linux/commit/4eb89368b130fe235d5e587bcc2eec18bb688e2d > git remote add linux-review https://github.com/intel-lab-lkp/linux > git fetch --no-tags linux-review Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 > git checkout 4eb89368b130fe235d5e587bcc2eec18bb688e2d > # save the config file > mkdir build_dir && cp config build_dir/.config > make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash arch/x86/ > > If you fix the issue, kindly add following tag where applicable > Reported-by: kernel test robot <lkp@intel.com> > > All errors (new ones prefixed by >>): > > In file included from arch/x86/include/asm/percpu.h:27, > from arch/x86/include/asm/preempt.h:6, > from include/linux/preempt.h:78, > from include/linux/spinlock.h:55, > from include/linux/mmzone.h:8, > from include/linux/gfp.h:6, > from include/linux/mm.h:7, > from arch/x86/mm/mem_encrypt_amd.c:14: > arch/x86/mm/mem_encrypt_amd.c: In function 'sme_early_init': >>> arch/x86/mm/mem_encrypt_amd.c:499:36: error: 'protection_map' undeclared (first use in this function) > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~~~~~ > include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~ > arch/x86/mm/mem_encrypt_amd.c:499:36: note: each undeclared identifier is reported only once for each function it appears in > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~~~~~ > include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~ > In file included from include/linux/bits.h:22, > from include/linux/ratelimit_types.h:5, > from include/linux/printk.h:9, > from include/asm-generic/bug.h:22, > from arch/x86/include/asm/bug.h:87, > from include/linux/bug.h:5, > from include/linux/mmdebug.h:5, > from include/linux/mm.h:6, > from arch/x86/mm/mem_encrypt_amd.c:14: > include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant > 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); }))) > | ^ > include/linux/compiler.h:240:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO' > 240 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) > | ^~~~~~~~~~~~~~~~~ > include/linux/kernel.h:55:59: note: in expansion of macro '__must_be_array' > 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) > | ^~~~~~~~~~~~~~~ > arch/x86/mm/mem_encrypt_amd.c:499:25: note: in expansion of macro 'ARRAY_SIZE' > 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) > | ^~~~~~~~~~ This patch fixes the build failure here. diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index f6d038e2cd8e..d0c2ec1bb659 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -484,6 +484,8 @@ void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, boo enc_dec_hypercall(vaddr, npages, enc); } +extern pgprot_t protection_map[16]; + void __init sme_early_init(void) { unsigned int i; diff --git a/arch/x86/mm/pgprot.c b/arch/x86/mm/pgprot.c index 7eca1b009af6..96eca0b2ec90 100644 --- a/arch/x86/mm/pgprot.c +++ b/arch/x86/mm/pgprot.c @@ -4,7 +4,7 @@ #include <linux/mm.h> #include <asm/pgtable.h> -static pgprot_t protection_map[16] __ro_after_init = { +pgprot_t protection_map[16] __ro_after_init = { [VM_NONE] = PAGE_NONE, [VM_READ] = PAGE_READONLY, [VM_WRITE] = PAGE_COPY, ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-20 4:45 ` Anshuman Khandual @ 2022-06-20 5:55 ` Christoph Hellwig -1 siblings, 0 replies; 28+ messages in thread From: Christoph Hellwig @ 2022-06-20 5:55 UTC (permalink / raw) To: Anshuman Khandual Cc: kernel test robot, linux-mm, kbuild-all, hch, Andrew Morton, linux-kernel, Christoph Hellwig On Mon, Jun 20, 2022 at 10:15:31AM +0530, Anshuman Khandual wrote: > +extern pgprot_t protection_map[16]; externs in .c files are never a good idea. I'd rather add a helper function toadd pgprot_encrypted to protection_map to pgprot.c. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility @ 2022-06-20 5:55 ` Christoph Hellwig 0 siblings, 0 replies; 28+ messages in thread From: Christoph Hellwig @ 2022-06-20 5:55 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 243 bytes --] On Mon, Jun 20, 2022 at 10:15:31AM +0530, Anshuman Khandual wrote: > +extern pgprot_t protection_map[16]; externs in .c files are never a good idea. I'd rather add a helper function toadd pgprot_encrypted to protection_map to pgprot.c. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility 2022-06-20 4:45 ` Anshuman Khandual @ 2022-06-20 6:43 ` Christophe Leroy -1 siblings, 0 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-20 6:43 UTC (permalink / raw) To: Anshuman Khandual, kernel test robot, linux-mm Cc: kbuild-all, hch, Andrew Morton, linux-kernel, Christoph Hellwig Le 20/06/2022 à 06:45, Anshuman Khandual a écrit : > > On 6/16/22 18:14, kernel test robot wrote: >> Hi Anshuman, >> >> Thank you for the patch! Yet something to improve: >> >> [auto build test ERROR on akpm-mm/mm-everything] >> >> url: https://github.com/intel-lab-lkp/linux/commits/Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 >> base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything >> config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220616/202206162004.ak9KTfMD-lkp@intel.com/config) >> compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 >> reproduce (this is a W=1 build): >> # https://github.com/intel-lab-lkp/linux/commit/4eb89368b130fe235d5e587bcc2eec18bb688e2d >> git remote add linux-review https://github.com/intel-lab-lkp/linux >> git fetch --no-tags linux-review Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 >> git checkout 4eb89368b130fe235d5e587bcc2eec18bb688e2d >> # save the config file >> mkdir build_dir && cp config build_dir/.config >> make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash arch/x86/ >> >> If you fix the issue, kindly add following tag where applicable >> Reported-by: kernel test robot <lkp@intel.com> >> >> All errors (new ones prefixed by >>): >> >> In file included from arch/x86/include/asm/percpu.h:27, >> from arch/x86/include/asm/preempt.h:6, >> from include/linux/preempt.h:78, >> from include/linux/spinlock.h:55, >> from include/linux/mmzone.h:8, >> from include/linux/gfp.h:6, >> from include/linux/mm.h:7, >> from arch/x86/mm/mem_encrypt_amd.c:14: >> arch/x86/mm/mem_encrypt_amd.c: In function 'sme_early_init': >>>> arch/x86/mm/mem_encrypt_amd.c:499:36: error: 'protection_map' undeclared (first use in this function) >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~~~~~ >> include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~ >> arch/x86/mm/mem_encrypt_amd.c:499:36: note: each undeclared identifier is reported only once for each function it appears in >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~~~~~ >> include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~ >> In file included from include/linux/bits.h:22, >> from include/linux/ratelimit_types.h:5, >> from include/linux/printk.h:9, >> from include/asm-generic/bug.h:22, >> from arch/x86/include/asm/bug.h:87, >> from include/linux/bug.h:5, >> from include/linux/mmdebug.h:5, >> from include/linux/mm.h:6, >> from arch/x86/mm/mem_encrypt_amd.c:14: >> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant >> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); }))) >> | ^ >> include/linux/compiler.h:240:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO' >> 240 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) >> | ^~~~~~~~~~~~~~~~~ >> include/linux/kernel.h:55:59: note: in expansion of macro '__must_be_array' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~~~~~~~~~~~~~ >> arch/x86/mm/mem_encrypt_amd.c:499:25: note: in expansion of macro 'ARRAY_SIZE' >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~ > > This patch fixes the build failure here. > > diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c > index f6d038e2cd8e..d0c2ec1bb659 100644 > --- a/arch/x86/mm/mem_encrypt_amd.c > +++ b/arch/x86/mm/mem_encrypt_amd.c > @@ -484,6 +484,8 @@ void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, boo > enc_dec_hypercall(vaddr, npages, enc); > } > > +extern pgprot_t protection_map[16]; Adding extern declaration in C files is not the best solution. Isn't there a H header with that declaration ? > + > void __init sme_early_init(void) > { > unsigned int i; > diff --git a/arch/x86/mm/pgprot.c b/arch/x86/mm/pgprot.c > index 7eca1b009af6..96eca0b2ec90 100644 > --- a/arch/x86/mm/pgprot.c > +++ b/arch/x86/mm/pgprot.c > @@ -4,7 +4,7 @@ > #include <linux/mm.h> > #include <asm/pgtable.h> > > -static pgprot_t protection_map[16] __ro_after_init = { > +pgprot_t protection_map[16] __ro_after_init = { > [VM_NONE] = PAGE_NONE, > [VM_READ] = PAGE_READONLY, > [VM_WRITE] = PAGE_COPY, > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility @ 2022-06-20 6:43 ` Christophe Leroy 0 siblings, 0 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-20 6:43 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 5676 bytes --] Le 20/06/2022 à 06:45, Anshuman Khandual a écrit : > > On 6/16/22 18:14, kernel test robot wrote: >> Hi Anshuman, >> >> Thank you for the patch! Yet something to improve: >> >> [auto build test ERROR on akpm-mm/mm-everything] >> >> url: https://github.com/intel-lab-lkp/linux/commits/Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 >> base: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-everything >> config: x86_64-allyesconfig (https://download.01.org/0day-ci/archive/20220616/202206162004.ak9KTfMD-lkp(a)intel.com/config) >> compiler: gcc-11 (Debian 11.3.0-3) 11.3.0 >> reproduce (this is a W=1 build): >> # https://github.com/intel-lab-lkp/linux/commit/4eb89368b130fe235d5e587bcc2eec18bb688e2d >> git remote add linux-review https://github.com/intel-lab-lkp/linux >> git fetch --no-tags linux-review Anshuman-Khandual/mm-mmap-Drop-__SXXX-__PXXX-macros-from-across-platforms/20220616-121132 >> git checkout 4eb89368b130fe235d5e587bcc2eec18bb688e2d >> # save the config file >> mkdir build_dir && cp config build_dir/.config >> make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash arch/x86/ >> >> If you fix the issue, kindly add following tag where applicable >> Reported-by: kernel test robot <lkp@intel.com> >> >> All errors (new ones prefixed by >>): >> >> In file included from arch/x86/include/asm/percpu.h:27, >> from arch/x86/include/asm/preempt.h:6, >> from include/linux/preempt.h:78, >> from include/linux/spinlock.h:55, >> from include/linux/mmzone.h:8, >> from include/linux/gfp.h:6, >> from include/linux/mm.h:7, >> from arch/x86/mm/mem_encrypt_amd.c:14: >> arch/x86/mm/mem_encrypt_amd.c: In function 'sme_early_init': >>>> arch/x86/mm/mem_encrypt_amd.c:499:36: error: 'protection_map' undeclared (first use in this function) >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~~~~~ >> include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~ >> arch/x86/mm/mem_encrypt_amd.c:499:36: note: each undeclared identifier is reported only once for each function it appears in >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~~~~~ >> include/linux/kernel.h:55:33: note: in definition of macro 'ARRAY_SIZE' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~ >> In file included from include/linux/bits.h:22, >> from include/linux/ratelimit_types.h:5, >> from include/linux/printk.h:9, >> from include/asm-generic/bug.h:22, >> from arch/x86/include/asm/bug.h:87, >> from include/linux/bug.h:5, >> from include/linux/mmdebug.h:5, >> from include/linux/mm.h:6, >> from arch/x86/mm/mem_encrypt_amd.c:14: >> include/linux/build_bug.h:16:51: error: bit-field '<anonymous>' width not an integer constant >> 16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); }))) >> | ^ >> include/linux/compiler.h:240:33: note: in expansion of macro 'BUILD_BUG_ON_ZERO' >> 240 | #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) >> | ^~~~~~~~~~~~~~~~~ >> include/linux/kernel.h:55:59: note: in expansion of macro '__must_be_array' >> 55 | #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) >> | ^~~~~~~~~~~~~~~ >> arch/x86/mm/mem_encrypt_amd.c:499:25: note: in expansion of macro 'ARRAY_SIZE' >> 499 | for (i = 0; i < ARRAY_SIZE(protection_map); i++) >> | ^~~~~~~~~~ > > This patch fixes the build failure here. > > diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c > index f6d038e2cd8e..d0c2ec1bb659 100644 > --- a/arch/x86/mm/mem_encrypt_amd.c > +++ b/arch/x86/mm/mem_encrypt_amd.c > @@ -484,6 +484,8 @@ void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, boo > enc_dec_hypercall(vaddr, npages, enc); > } > > +extern pgprot_t protection_map[16]; Adding extern declaration in C files is not the best solution. Isn't there a H header with that declaration ? > + > void __init sme_early_init(void) > { > unsigned int i; > diff --git a/arch/x86/mm/pgprot.c b/arch/x86/mm/pgprot.c > index 7eca1b009af6..96eca0b2ec90 100644 > --- a/arch/x86/mm/pgprot.c > +++ b/arch/x86/mm/pgprot.c > @@ -4,7 +4,7 @@ > #include <linux/mm.h> > #include <asm/pgtable.h> > > -static pgprot_t protection_map[16] __ro_after_init = { > +pgprot_t protection_map[16] __ro_after_init = { > [VM_NONE] = PAGE_NONE, > [VM_READ] = PAGE_READONLY, > [VM_WRITE] = PAGE_COPY, > ^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 4:09 [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Anshuman Khandual 2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual @ 2022-06-16 4:09 ` Anshuman Khandual 2022-06-16 5:27 ` Christophe Leroy 2022-06-16 5:45 ` Christophe Leroy 2022-06-16 5:22 ` [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Christophe Leroy 2 siblings, 2 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-16 4:09 UTC (permalink / raw) To: linux-mm Cc: hch, Anshuman Khandual, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig Move the protection_array[] array inside the arch for those platforms which do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can be dropped completely which are now redundant. Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Reported-by: kernel test robot <lkp@intel.com> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- arch/alpha/include/asm/pgtable.h | 17 ------- arch/alpha/mm/init.c | 21 +++++++++ arch/arc/include/asm/pgtable-bits-arcv2.h | 18 -------- arch/arc/mm/mmap.c | 19 ++++++++ arch/arm/include/asm/pgtable.h | 17 ------- arch/arm/lib/uaccess_with_memcpy.c | 2 +- arch/arm/mm/mmu.c | 19 ++++++++ arch/csky/include/asm/pgtable.h | 18 -------- arch/csky/mm/init.c | 19 ++++++++ arch/hexagon/include/asm/pgtable.h | 27 ------------ arch/hexagon/mm/init.c | 41 +++++++++++++++++ arch/ia64/include/asm/pgtable.h | 18 -------- arch/ia64/mm/init.c | 27 +++++++++++- arch/loongarch/include/asm/pgtable-bits.h | 19 -------- arch/loongarch/mm/cache.c | 45 +++++++++++++++++++ arch/m68k/include/asm/mcf_pgtable.h | 54 ----------------------- arch/m68k/include/asm/motorola_pgtable.h | 22 --------- arch/m68k/include/asm/sun3_pgtable.h | 17 ------- arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++ arch/m68k/mm/motorola.c | 19 ++++++++ arch/m68k/mm/sun3mmu.c | 19 ++++++++ arch/microblaze/include/asm/pgtable.h | 17 ------- arch/microblaze/mm/init.c | 19 ++++++++ arch/mips/include/asm/pgtable.h | 22 --------- arch/mips/mm/cache.c | 2 + arch/nios2/include/asm/pgtable.h | 16 ------- arch/nios2/mm/init.c | 19 ++++++++ arch/openrisc/include/asm/pgtable.h | 18 -------- arch/openrisc/mm/init.c | 19 ++++++++ arch/parisc/include/asm/pgtable.h | 18 -------- arch/parisc/mm/init.c | 19 ++++++++ arch/powerpc/include/asm/pgtable.h | 20 --------- arch/powerpc/mm/book3s64/pgtable.c | 24 +++------- arch/powerpc/mm/pgtable.c | 20 +++++++++ arch/riscv/include/asm/pgtable.h | 20 --------- arch/riscv/mm/init.c | 19 ++++++++ arch/s390/include/asm/pgtable.h | 17 ------- arch/s390/mm/mmap.c | 19 ++++++++ arch/sh/include/asm/pgtable.h | 17 ------- arch/sh/mm/mmap.c | 19 ++++++++ arch/sparc/include/asm/pgtable_32.h | 19 -------- arch/sparc/mm/init_32.c | 19 ++++++++ arch/sparc/mm/init_64.c | 2 +- arch/um/include/asm/pgtable.h | 17 ------- arch/um/kernel/mem.c | 19 ++++++++ arch/x86/um/mem_32.c | 2 +- arch/xtensa/include/asm/pgtable.h | 18 -------- arch/xtensa/mm/init.c | 19 ++++++++ include/linux/mm.h | 2 +- mm/mmap.c | 19 -------- 50 files changed, 503 insertions(+), 489 deletions(-) diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h index 170451fde043..3ea9661c09ff 100644 --- a/arch/alpha/include/asm/pgtable.h +++ b/arch/alpha/include/asm/pgtable.h @@ -116,23 +116,6 @@ struct vm_area_struct; * arch/alpha/mm/fault.c) */ /* xwr */ -#define __P000 _PAGE_P(_PAGE_FOE | _PAGE_FOW | _PAGE_FOR) -#define __P001 _PAGE_P(_PAGE_FOE | _PAGE_FOW) -#define __P010 _PAGE_P(_PAGE_FOE) -#define __P011 _PAGE_P(_PAGE_FOE) -#define __P100 _PAGE_P(_PAGE_FOW | _PAGE_FOR) -#define __P101 _PAGE_P(_PAGE_FOW) -#define __P110 _PAGE_P(0) -#define __P111 _PAGE_P(0) - -#define __S000 _PAGE_S(_PAGE_FOE | _PAGE_FOW | _PAGE_FOR) -#define __S001 _PAGE_S(_PAGE_FOE | _PAGE_FOW) -#define __S010 _PAGE_S(_PAGE_FOE) -#define __S011 _PAGE_S(_PAGE_FOE) -#define __S100 _PAGE_S(_PAGE_FOW | _PAGE_FOR) -#define __S101 _PAGE_S(_PAGE_FOW) -#define __S110 _PAGE_S(0) -#define __S111 _PAGE_S(0) /* * pgprot_noncached() is only for infiniband pci support, and a real diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 7511723b7669..3f86cff0937b 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c @@ -280,3 +280,24 @@ mem_init(void) high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); memblock_free_all(); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = _PAGE_P(_PAGE_FOE | _PAGE_FOW | + _PAGE_FOR), + [VM_READ] = _PAGE_P(_PAGE_FOE | _PAGE_FOW), + [VM_WRITE] = _PAGE_P(_PAGE_FOE), + [VM_WRITE | VM_READ] = _PAGE_P(_PAGE_FOE), + [VM_EXEC] = _PAGE_P(_PAGE_FOW | _PAGE_FOR), + [VM_EXEC | VM_READ] = _PAGE_P(_PAGE_FOW), + [VM_EXEC | VM_WRITE] = _PAGE_P(0), + [VM_EXEC | VM_WRITE | VM_READ] = _PAGE_P(0), + [VM_SHARED] = _PAGE_S(_PAGE_FOE | _PAGE_FOW | + _PAGE_FOR), + [VM_SHARED | VM_READ] = _PAGE_S(_PAGE_FOE | _PAGE_FOW), + [VM_SHARED | VM_WRITE] = _PAGE_S(_PAGE_FOE), + [VM_SHARED | VM_WRITE | VM_READ] = _PAGE_S(_PAGE_FOE), + [VM_SHARED | VM_EXEC] = _PAGE_S(_PAGE_FOW | _PAGE_FOR), + [VM_SHARED | VM_EXEC | VM_READ] = _PAGE_S(_PAGE_FOW), + [VM_SHARED | VM_EXEC | VM_WRITE] = _PAGE_S(0), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = _PAGE_S(0) +}; diff --git a/arch/arc/include/asm/pgtable-bits-arcv2.h b/arch/arc/include/asm/pgtable-bits-arcv2.h index 183d23bc1e00..b23be557403e 100644 --- a/arch/arc/include/asm/pgtable-bits-arcv2.h +++ b/arch/arc/include/asm/pgtable-bits-arcv2.h @@ -72,24 +72,6 @@ * This is to enable COW mechanism */ /* xwr */ -#define __P000 PAGE_U_NONE -#define __P001 PAGE_U_R -#define __P010 PAGE_U_R /* Pvt-W => !W */ -#define __P011 PAGE_U_R /* Pvt-W => !W */ -#define __P100 PAGE_U_X_R /* X => R */ -#define __P101 PAGE_U_X_R -#define __P110 PAGE_U_X_R /* Pvt-W => !W and X => R */ -#define __P111 PAGE_U_X_R /* Pvt-W => !W */ - -#define __S000 PAGE_U_NONE -#define __S001 PAGE_U_R -#define __S010 PAGE_U_W_R /* W => R */ -#define __S011 PAGE_U_W_R -#define __S100 PAGE_U_X_R /* X => R */ -#define __S101 PAGE_U_X_R -#define __S110 PAGE_U_X_W_R /* X => R */ -#define __S111 PAGE_U_X_W_R - #ifndef __ASSEMBLY__ #define pte_write(pte) (pte_val(pte) & _PAGE_WRITE) diff --git a/arch/arc/mm/mmap.c b/arch/arc/mm/mmap.c index 722d26b94307..114e6ac6613f 100644 --- a/arch/arc/mm/mmap.c +++ b/arch/arc/mm/mmap.c @@ -74,3 +74,22 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, info.align_offset = pgoff << PAGE_SHIFT; return vm_unmapped_area(&info); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_U_NONE, + [VM_READ] = PAGE_U_R, + [VM_WRITE] = PAGE_U_R, + [VM_WRITE | VM_READ] = PAGE_U_R, + [VM_EXEC] = PAGE_U_X_R, + [VM_EXEC | VM_READ] = PAGE_U_X_R, + [VM_EXEC | VM_WRITE] = PAGE_U_X_R, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_U_X_R, + [VM_SHARED] = PAGE_U_NONE, + [VM_SHARED | VM_READ] = PAGE_U_R, + [VM_SHARED | VM_WRITE] = PAGE_U_W_R, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_U_W_R, + [VM_SHARED | VM_EXEC] = PAGE_U_X_R, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_U_X_R, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_U_X_W_R, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_U_X_W_R +}; diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index cd1f84bb40ae..78a532068fec 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -137,23 +137,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, * 2) If we could do execute protection, then read is implied * 3) write implies read permissions */ -#define __P000 __PAGE_NONE -#define __P001 __PAGE_READONLY -#define __P010 __PAGE_COPY -#define __P011 __PAGE_COPY -#define __P100 __PAGE_READONLY_EXEC -#define __P101 __PAGE_READONLY_EXEC -#define __P110 __PAGE_COPY_EXEC -#define __P111 __PAGE_COPY_EXEC - -#define __S000 __PAGE_NONE -#define __S001 __PAGE_READONLY -#define __S010 __PAGE_SHARED -#define __S011 __PAGE_SHARED -#define __S100 __PAGE_READONLY_EXEC -#define __S101 __PAGE_READONLY_EXEC -#define __S110 __PAGE_SHARED_EXEC -#define __S111 __PAGE_SHARED_EXEC #ifndef __ASSEMBLY__ /* diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index c30b689bec2e..14eecaaf295f 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -237,7 +237,7 @@ static int __init test_size_treshold(void) if (!dst_page) goto no_dst; kernel_ptr = page_address(src_page); - user_ptr = vmap(&dst_page, 1, VM_IOREMAP, __pgprot(__P010)); + user_ptr = vmap(&dst_page, 1, VM_IOREMAP, __pgprot(__PAGE_COPY)); if (!user_ptr) goto no_vmap; diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 5e2be37a198e..3d1174e9960c 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1773,3 +1773,22 @@ void set_pte_at(struct mm_struct *mm, unsigned long addr, set_pte_ext(ptep, pteval, ext); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = __PAGE_NONE, + [VM_READ] = __PAGE_READONLY, + [VM_WRITE] = __PAGE_COPY, + [VM_WRITE | VM_READ] = __PAGE_COPY, + [VM_EXEC] = __PAGE_READONLY_EXEC, + [VM_EXEC | VM_READ] = __PAGE_READONLY_EXEC, + [VM_EXEC | VM_WRITE] = __PAGE_COPY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = __PAGE_COPY_EXEC, + [VM_SHARED] = __PAGE_NONE, + [VM_SHARED | VM_READ] = __PAGE_READONLY, + [VM_SHARED | VM_WRITE] = __PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = __PAGE_SHARED, + [VM_SHARED | VM_EXEC] = __PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_READ] = __PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE] = __PAGE_SHARED_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __PAGE_SHARED_EXEC +}; diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h index bbe245117777..229a5f4ad7fc 100644 --- a/arch/csky/include/asm/pgtable.h +++ b/arch/csky/include/asm/pgtable.h @@ -77,24 +77,6 @@ #define MAX_SWAPFILES_CHECK() \ BUILD_BUG_ON(MAX_SWAPFILES_SHIFT != 5) -#define __P000 PAGE_NONE -#define __P001 PAGE_READ -#define __P010 PAGE_READ -#define __P011 PAGE_READ -#define __P100 PAGE_READ -#define __P101 PAGE_READ -#define __P110 PAGE_READ -#define __P111 PAGE_READ - -#define __S000 PAGE_NONE -#define __S001 PAGE_READ -#define __S010 PAGE_WRITE -#define __S011 PAGE_WRITE -#define __S100 PAGE_READ -#define __S101 PAGE_READ -#define __S110 PAGE_WRITE -#define __S111 PAGE_WRITE - extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) diff --git a/arch/csky/mm/init.c b/arch/csky/mm/init.c index bf2004aa811a..cd9b8001b021 100644 --- a/arch/csky/mm/init.c +++ b/arch/csky/mm/init.c @@ -197,3 +197,22 @@ void __init fixaddr_init(void) vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK; fixrange_init(vaddr, vaddr + PMD_SIZE, swapper_pg_dir); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READ, + [VM_WRITE] = PAGE_READ, + [VM_WRITE | VM_READ] = PAGE_READ, + [VM_EXEC] = PAGE_READ, + [VM_EXEC | VM_READ] = PAGE_READ, + [VM_EXEC | VM_WRITE] = PAGE_READ, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_READ, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READ, + [VM_SHARED | VM_WRITE] = PAGE_WRITE, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_WRITE, + [VM_SHARED | VM_EXEC] = PAGE_READ, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READ, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_WRITE, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_WRITE +}; diff --git a/arch/hexagon/include/asm/pgtable.h b/arch/hexagon/include/asm/pgtable.h index 0610724d6a28..f7048c18b6f9 100644 --- a/arch/hexagon/include/asm/pgtable.h +++ b/arch/hexagon/include/asm/pgtable.h @@ -126,33 +126,6 @@ extern unsigned long _dflt_cache_att; */ #define CACHEDEF (CACHE_DEFAULT << 6) -/* Private (copy-on-write) page protections. */ -#define __P000 __pgprot(_PAGE_PRESENT | _PAGE_USER | CACHEDEF) -#define __P001 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | CACHEDEF) -#define __P010 __P000 /* Write-only copy-on-write */ -#define __P011 __P001 /* Read/Write copy-on-write */ -#define __P100 __pgprot(_PAGE_PRESENT | _PAGE_USER | \ - _PAGE_EXECUTE | CACHEDEF) -#define __P101 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_EXECUTE | \ - _PAGE_READ | CACHEDEF) -#define __P110 __P100 /* Write/execute copy-on-write */ -#define __P111 __P101 /* Read/Write/Execute, copy-on-write */ - -/* Shared page protections. */ -#define __S000 __P000 -#define __S001 __P001 -#define __S010 __pgprot(_PAGE_PRESENT | _PAGE_USER | \ - _PAGE_WRITE | CACHEDEF) -#define __S011 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | \ - _PAGE_WRITE | CACHEDEF) -#define __S100 __pgprot(_PAGE_PRESENT | _PAGE_USER | \ - _PAGE_EXECUTE | CACHEDEF) -#define __S101 __P101 -#define __S110 __pgprot(_PAGE_PRESENT | _PAGE_USER | \ - _PAGE_EXECUTE | _PAGE_WRITE | CACHEDEF) -#define __S111 __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | \ - _PAGE_EXECUTE | _PAGE_WRITE | CACHEDEF) - extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; /* located in head.S */ /* HUGETLB not working currently */ diff --git a/arch/hexagon/mm/init.c b/arch/hexagon/mm/init.c index 3167a3b5c97b..319952b2dabf 100644 --- a/arch/hexagon/mm/init.c +++ b/arch/hexagon/mm/init.c @@ -234,3 +234,44 @@ void __init setup_arch_memory(void) * which is called by start_kernel() later on in the process */ } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + CACHEDEF), + [VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_READ | CACHEDEF), + [VM_WRITE] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + CACHEDEF), + [VM_WRITE | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_READ | CACHEDEF), + [VM_EXEC] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | CACHEDEF), + [VM_EXEC | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | _PAGE_READ | + CACHEDEF), + [VM_EXEC | VM_WRITE] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | CACHEDEF), + [VM_EXEC | VM_WRITE | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | _PAGE_READ | + CACHEDEF), + [VM_SHARED] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + CACHEDEF), + [VM_SHARED | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_READ | CACHEDEF), + [VM_SHARED | VM_WRITE] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_WRITE | CACHEDEF), + [VM_SHARED | VM_WRITE | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_READ | _PAGE_WRITE | + CACHEDEF), + [VM_SHARED | VM_EXEC] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | CACHEDEF), + [VM_SHARED | VM_EXEC | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | _PAGE_READ | + CACHEDEF), + [VM_SHARED | VM_EXEC | VM_WRITE] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_EXECUTE | _PAGE_WRITE | + CACHEDEF), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __pgprot(_PAGE_PRESENT | _PAGE_USER | + _PAGE_READ | _PAGE_EXECUTE | + _PAGE_WRITE | CACHEDEF) +}; diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 7aa8f2330fb1..6925e28ae61d 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -161,24 +161,6 @@ * attempts to write to the page. */ /* xwr */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_READONLY /* write to priv pg -> copy & make writable */ -#define __P011 PAGE_READONLY /* ditto */ -#define __P100 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_X_RX) -#define __P101 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX) -#define __P110 PAGE_COPY_EXEC -#define __P111 PAGE_COPY_EXEC - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED /* we don't have (and don't need) write-only */ -#define __S011 PAGE_SHARED -#define __S100 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_X_RX) -#define __S101 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX) -#define __S110 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RWX) -#define __S111 __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RWX) - #define pgd_ERROR(e) printk("%s:%d: bad pgd %016lx.\n", __FILE__, __LINE__, pgd_val(e)) #if CONFIG_PGTABLE_LEVELS == 4 #define pud_ERROR(e) printk("%s:%d: bad pud %016lx.\n", __FILE__, __LINE__, pud_val(e)) diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 855d949d81df..1a86188c738c 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -273,7 +273,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; - gate_vma.vm_page_prot = __P101; + gate_vma.vm_page_prot = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX); return 0; } @@ -490,3 +490,28 @@ void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) __remove_pages(start_pfn, nr_pages, altmap); } #endif + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_READONLY, + [VM_WRITE | VM_READ] = PAGE_READONLY, + [VM_EXEC] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_X_RX), + [VM_EXEC | VM_READ] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_RX), + [VM_EXEC | VM_WRITE] = PAGE_COPY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_EXEC, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_X_RX), + [VM_SHARED | VM_EXEC | VM_READ] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_RX), + [VM_SHARED | VM_EXEC | VM_WRITE] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_RWX), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __pgprot(__ACCESS_BITS | _PAGE_PL_3 | + _PAGE_AR_RWX) +}; diff --git a/arch/loongarch/include/asm/pgtable-bits.h b/arch/loongarch/include/asm/pgtable-bits.h index 3badd112d9ab..9ca147a29bab 100644 --- a/arch/loongarch/include/asm/pgtable-bits.h +++ b/arch/loongarch/include/asm/pgtable-bits.h @@ -83,25 +83,6 @@ _PAGE_GLOBAL | _PAGE_KERN | _CACHE_SUC) #define PAGE_KERNEL_WUC __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \ _PAGE_GLOBAL | _PAGE_KERN | _CACHE_WUC) - -#define __P000 __pgprot(_CACHE_CC | _PAGE_USER | _PAGE_PROTNONE | _PAGE_NO_EXEC | _PAGE_NO_READ) -#define __P001 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC) -#define __P010 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC) -#define __P011 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC) -#define __P100 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) -#define __P101 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) -#define __P110 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) -#define __P111 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) - -#define __S000 __pgprot(_CACHE_CC | _PAGE_USER | _PAGE_PROTNONE | _PAGE_NO_EXEC | _PAGE_NO_READ) -#define __S001 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC) -#define __S010 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE) -#define __S011 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE) -#define __S100 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) -#define __S101 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT) -#define __S110 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_WRITE) -#define __S111 __pgprot(_CACHE_CC | _PAGE_VALID | _PAGE_USER | _PAGE_PRESENT | _PAGE_WRITE) - #ifndef __ASSEMBLY__ #define pgprot_noncached pgprot_noncached diff --git a/arch/loongarch/mm/cache.c b/arch/loongarch/mm/cache.c index 9e5ce5aa73f7..fd7053c07c71 100644 --- a/arch/loongarch/mm/cache.c +++ b/arch/loongarch/mm/cache.c @@ -139,3 +139,48 @@ void cpu_cache_init(void) shm_align_mask = PAGE_SIZE - 1; } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = __pgprot(_CACHE_CC | _PAGE_USER | + _PAGE_PROTNONE | _PAGE_NO_EXEC | + _PAGE_NO_READ), + [VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC), + [VM_WRITE] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC), + [VM_WRITE | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC), + [VM_EXEC] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_EXEC | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_EXEC | VM_WRITE] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_EXEC | VM_WRITE | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_SHARED] = __pgprot(_CACHE_CC | _PAGE_USER | + _PAGE_PROTNONE | _PAGE_NO_EXEC | + _PAGE_NO_READ), + [VM_SHARED | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC), + [VM_SHARED | VM_WRITE] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC | _PAGE_WRITE), + [VM_SHARED | VM_WRITE | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_NO_EXEC | _PAGE_WRITE), + [VM_SHARED | VM_EXEC] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_SHARED | VM_EXEC | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT), + [VM_SHARED | VM_EXEC | VM_WRITE] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_WRITE), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __pgprot(_CACHE_CC | _PAGE_VALID | + _PAGE_USER | _PAGE_PRESENT | + _PAGE_WRITE) +}; diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h index 94f38d76e278..0e9c1b28dcab 100644 --- a/arch/m68k/include/asm/mcf_pgtable.h +++ b/arch/m68k/include/asm/mcf_pgtable.h @@ -91,60 +91,6 @@ * for use. In general, the bit positions are xwr, and P-items are * private, the S-items are shared. */ -#define __P000 PAGE_NONE -#define __P001 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE) -#define __P010 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_WRITABLE) -#define __P011 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE \ - | CF_PAGE_WRITABLE) -#define __P100 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_EXEC) -#define __P101 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE \ - | CF_PAGE_EXEC) -#define __P110 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_WRITABLE \ - | CF_PAGE_EXEC) -#define __P111 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE \ - | CF_PAGE_WRITABLE \ - | CF_PAGE_EXEC) - -#define __S000 PAGE_NONE -#define __S001 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE) -#define __S010 PAGE_SHARED -#define __S011 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_SHARED \ - | CF_PAGE_READABLE) -#define __S100 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_EXEC) -#define __S101 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_READABLE \ - | CF_PAGE_EXEC) -#define __S110 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_SHARED \ - | CF_PAGE_EXEC) -#define __S111 __pgprot(CF_PAGE_VALID \ - | CF_PAGE_ACCESSED \ - | CF_PAGE_SHARED \ - | CF_PAGE_READABLE \ - | CF_PAGE_EXEC) - #define PTE_MASK PAGE_MASK #define CF_PAGE_CHG_MASK (PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY) diff --git a/arch/m68k/include/asm/motorola_pgtable.h b/arch/m68k/include/asm/motorola_pgtable.h index 7c9b56e2a750..63aaece0722f 100644 --- a/arch/m68k/include/asm/motorola_pgtable.h +++ b/arch/m68k/include/asm/motorola_pgtable.h @@ -83,28 +83,6 @@ extern unsigned long mm_cachebits; #define PAGE_COPY_C __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED) #define PAGE_READONLY_C __pgprot(_PAGE_PRESENT | _PAGE_RONLY | _PAGE_ACCESSED) -/* - * The m68k can't do page protection for execute, and considers that the same are read. - * Also, write permissions imply read permissions. This is the closest we can get.. - */ -#define __P000 PAGE_NONE_C -#define __P001 PAGE_READONLY_C -#define __P010 PAGE_COPY_C -#define __P011 PAGE_COPY_C -#define __P100 PAGE_READONLY_C -#define __P101 PAGE_READONLY_C -#define __P110 PAGE_COPY_C -#define __P111 PAGE_COPY_C - -#define __S000 PAGE_NONE_C -#define __S001 PAGE_READONLY_C -#define __S010 PAGE_SHARED_C -#define __S011 PAGE_SHARED_C -#define __S100 PAGE_READONLY_C -#define __S101 PAGE_READONLY_C -#define __S110 PAGE_SHARED_C -#define __S111 PAGE_SHARED_C - #define pmd_pgtable(pmd) ((pgtable_t)pmd_page_vaddr(pmd)) /* diff --git a/arch/m68k/include/asm/sun3_pgtable.h b/arch/m68k/include/asm/sun3_pgtable.h index 5e4e753f0d24..9d919491765b 100644 --- a/arch/m68k/include/asm/sun3_pgtable.h +++ b/arch/m68k/include/asm/sun3_pgtable.h @@ -71,23 +71,6 @@ * protection settings, valid (implying read and execute) and writeable. These * are as close as we can get... */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY -#define __P101 PAGE_READONLY -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY -#define __S101 PAGE_READONLY -#define __S110 PAGE_SHARED -#define __S111 PAGE_SHARED /* Use these fake page-protections on PMDs. */ #define SUN3_PMD_VALID (0x00000001) diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index 6f1f25125294..5502f26d39f7 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -234,3 +234,57 @@ void steal_context(void) destroy_context(mm); } +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE), + [VM_WRITE] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_WRITABLE), + [VM_WRITE | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_WRITABLE), + [VM_EXEC] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_EXEC), + [VM_EXEC | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_EXEC), + [VM_EXEC | VM_WRITE] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_WRITABLE | + CF_PAGE_EXEC), + [VM_EXEC | VM_WRITE | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_WRITABLE | + CF_PAGE_EXEC), + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE), + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_SHARED), + [VM_SHARED | VM_EXEC] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_EXEC), + [VM_SHARED | VM_EXEC | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_EXEC), + [VM_SHARED | VM_EXEC | VM_WRITE] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_SHARED | + CF_PAGE_EXEC), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __pgprot(CF_PAGE_VALID | + CF_PAGE_ACCESSED | + CF_PAGE_READABLE | + CF_PAGE_SHARED | + CF_PAGE_EXEC) +}; diff --git a/arch/m68k/mm/motorola.c b/arch/m68k/mm/motorola.c index df7f797c908a..2a633feffb60 100644 --- a/arch/m68k/mm/motorola.c +++ b/arch/m68k/mm/motorola.c @@ -482,3 +482,22 @@ void __init paging_init(void) max_zone_pfn[ZONE_DMA] = memblock_end_of_DRAM(); free_area_init(max_zone_pfn); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE_C, + [VM_READ] = PAGE_READONLY_C, + [VM_WRITE] = PAGE_COPY_C, + [VM_WRITE | VM_READ] = PAGE_COPY_C, + [VM_EXEC] = PAGE_READONLY_C, + [VM_EXEC | VM_READ] = PAGE_READONLY_C, + [VM_EXEC | VM_WRITE] = PAGE_COPY_C, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_C, + [VM_SHARED] = PAGE_NONE_C, + [VM_SHARED | VM_READ] = PAGE_READONLY_C, + [VM_SHARED | VM_WRITE] = PAGE_SHARED_C, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED_C, + [VM_SHARED | VM_EXEC] = PAGE_READONLY_C, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_C, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_C, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_C +}; diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index dad494224497..b2e6220e3d20 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c @@ -95,3 +95,22 @@ void __init paging_init(void) } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY, + [VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED +}; diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h index 0c72646370e1..ba348e997dbb 100644 --- a/arch/microblaze/include/asm/pgtable.h +++ b/arch/microblaze/include/asm/pgtable.h @@ -204,23 +204,6 @@ extern pte_t *va_to_pte(unsigned long address); * We consider execute permission the same as read. * Also, write permissions imply read permissions. */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY_X -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY_X -#define __P100 PAGE_READONLY -#define __P101 PAGE_READONLY_X -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY_X - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY_X -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED_X -#define __S100 PAGE_READONLY -#define __S101 PAGE_READONLY_X -#define __S110 PAGE_SHARED -#define __S111 PAGE_SHARED_X #ifndef __ASSEMBLY__ /* diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index f4e503461d24..4bf4ee8344ea 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c @@ -285,3 +285,22 @@ void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) return p; } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY_X, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_EXEC] = PAGE_READONLY, + [VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED_X, + [VM_SHARED | VM_EXEC] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X +}; diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index 374c6322775d..6caec386ad2f 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -41,28 +41,6 @@ struct vm_area_struct; * by reasonable means.. */ -/* - * Dummy values to fill the table in mmap.c - * The real values will be generated at runtime - */ -#define __P000 __pgprot(0) -#define __P001 __pgprot(0) -#define __P010 __pgprot(0) -#define __P011 __pgprot(0) -#define __P100 __pgprot(0) -#define __P101 __pgprot(0) -#define __P110 __pgprot(0) -#define __P111 __pgprot(0) - -#define __S000 __pgprot(0) -#define __S001 __pgprot(0) -#define __S010 __pgprot(0) -#define __S011 __pgprot(0) -#define __S100 __pgprot(0) -#define __S101 __pgprot(0) -#define __S110 __pgprot(0) -#define __S111 __pgprot(0) - extern unsigned long _page_cachable_default; extern void __update_cache(unsigned long address, pte_t pte); diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 7be7240f7703..d2fe64a0a31c 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -159,6 +159,8 @@ EXPORT_SYMBOL(_page_cachable_default); #define PM(p) __pgprot(_page_cachable_default | (p)) +pgprot_t protection_map[16]; + static inline void setup_protection_map(void) { protection_map[0] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ); diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h index 262d0609268c..470516d4555e 100644 --- a/arch/nios2/include/asm/pgtable.h +++ b/arch/nios2/include/asm/pgtable.h @@ -40,24 +40,8 @@ struct mm_struct; */ /* Remove W bit on private pages for COW support */ -#define __P000 MKP(0, 0, 0) -#define __P001 MKP(0, 0, 1) -#define __P010 MKP(0, 0, 0) /* COW */ -#define __P011 MKP(0, 0, 1) /* COW */ -#define __P100 MKP(1, 0, 0) -#define __P101 MKP(1, 0, 1) -#define __P110 MKP(1, 0, 0) /* COW */ -#define __P111 MKP(1, 0, 1) /* COW */ /* Shared pages can have exact HW mapping */ -#define __S000 MKP(0, 0, 0) -#define __S001 MKP(0, 0, 1) -#define __S010 MKP(0, 1, 0) -#define __S011 MKP(0, 1, 1) -#define __S100 MKP(1, 0, 0) -#define __S101 MKP(1, 0, 1) -#define __S110 MKP(1, 1, 0) -#define __S111 MKP(1, 1, 1) /* Used all over the kernel */ #define PAGE_KERNEL __pgprot(_PAGE_PRESENT | _PAGE_CACHED | _PAGE_READ | \ diff --git a/arch/nios2/mm/init.c b/arch/nios2/mm/init.c index 613fcaa5988a..fa1bc9c7da9a 100644 --- a/arch/nios2/mm/init.c +++ b/arch/nios2/mm/init.c @@ -124,3 +124,22 @@ const char *arch_vma_name(struct vm_area_struct *vma) { return (vma->vm_start == KUSER_BASE) ? "[kuser]" : NULL; } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = MKP(0, 0, 0), + [VM_READ] = MKP(0, 0, 1), + [VM_WRITE] = MKP(0, 0, 0), + [VM_WRITE | VM_READ] = MKP(0, 0, 1), + [VM_EXEC] = MKP(1, 0, 0), + [VM_EXEC | VM_READ] = MKP(1, 0, 1), + [VM_EXEC | VM_WRITE] = MKP(1, 0, 0), + [VM_EXEC | VM_WRITE | VM_READ] = MKP(1, 0, 1), + [VM_SHARED] = MKP(0, 0, 0), + [VM_SHARED | VM_READ] = MKP(0, 0, 1), + [VM_SHARED | VM_WRITE] = MKP(0, 1, 0), + [VM_SHARED | VM_WRITE | VM_READ] = MKP(0, 1, 1), + [VM_SHARED | VM_EXEC] = MKP(1, 0, 0), + [VM_SHARED | VM_EXEC | VM_READ] = MKP(1, 0, 1), + [VM_SHARED | VM_EXEC | VM_WRITE] = MKP(1, 1, 0), + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = MKP(1, 1, 1) +}; diff --git a/arch/openrisc/include/asm/pgtable.h b/arch/openrisc/include/asm/pgtable.h index c3abbf71e09f..dcae8aea132f 100644 --- a/arch/openrisc/include/asm/pgtable.h +++ b/arch/openrisc/include/asm/pgtable.h @@ -176,24 +176,6 @@ extern void paging_init(void); __pgprot(_PAGE_ALL | _PAGE_SRE | _PAGE_SWE \ | _PAGE_SHARED | _PAGE_DIRTY | _PAGE_EXEC | _PAGE_CI) -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY_X -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY_X -#define __P100 PAGE_READONLY -#define __P101 PAGE_READONLY_X -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY_X - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY_X -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED_X -#define __S100 PAGE_READONLY -#define __S101 PAGE_READONLY_X -#define __S110 PAGE_SHARED -#define __S111 PAGE_SHARED_X - /* zero page used for uninitialized stuff */ extern unsigned long empty_zero_page[2048]; #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c index 3a021ab6f1ae..5bebd8380e31 100644 --- a/arch/openrisc/mm/init.c +++ b/arch/openrisc/mm/init.c @@ -208,3 +208,22 @@ void __init mem_init(void) mem_init_done = 1; return; } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY_X, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_EXEC] = PAGE_READONLY, + [VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED_X, + [VM_SHARED | VM_EXEC] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X +}; diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index 69765a6dbe89..6a1899a9b420 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -271,24 +271,6 @@ extern void __update_cache(pte_t pte); */ /*xwr*/ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 __P000 /* copy on write */ -#define __P011 __P001 /* copy on write */ -#define __P100 PAGE_EXECREAD -#define __P101 PAGE_EXECREAD -#define __P110 __P100 /* copy on write */ -#define __P111 __P101 /* copy on write */ - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_WRITEONLY -#define __S011 PAGE_SHARED -#define __S100 PAGE_EXECREAD -#define __S101 PAGE_EXECREAD -#define __S110 PAGE_RWX -#define __S111 PAGE_RWX - extern pgd_t swapper_pg_dir[]; /* declared in init_task.c */ diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index 0a81499dd35e..77f5d2a9073e 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -871,3 +871,22 @@ void flush_tlb_all(void) spin_unlock(&sid_lock); } #endif + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_NONE, + [VM_WRITE | VM_READ] = PAGE_READONLY, + [VM_EXEC] = PAGE_EXECREAD, + [VM_EXEC | VM_READ] = PAGE_EXECREAD, + [VM_EXEC | VM_WRITE] = PAGE_EXECREAD, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_EXECREAD, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_WRITEONLY, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_EXECREAD, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_EXECREAD, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_RWX, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_RWX +}; diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index 8ed2a80c896e..bd636295a794 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -21,26 +21,6 @@ struct mm_struct; #endif /* !CONFIG_PPC_BOOK3S */ /* Note due to the way vm flags are laid out, the bits are XWR */ -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY_X -#define __P101 PAGE_READONLY_X -#define __P110 PAGE_COPY_X -#define __P111 PAGE_COPY_X - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY_X -#define __S101 PAGE_READONLY_X -#define __S110 PAGE_SHARED_X -#define __S111 PAGE_SHARED_X -#endif - #ifndef __ASSEMBLY__ #ifndef MAX_PTRS_PER_PGD diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index d3b019b95c1d..de76dd4d447c 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -551,25 +551,11 @@ unsigned long memremap_compat_align(void) EXPORT_SYMBOL_GPL(memremap_compat_align); #endif -/* Note due to the way vm flags are laid out, the bits are XWR */ -static const pgprot_t protection_map[16] = { - [VM_NONE] = PAGE_NONE, - [VM_READ] = PAGE_READONLY, - [VM_WRITE] = PAGE_COPY, - [VM_WRITE | VM_READ] = PAGE_COPY, - [VM_EXEC] = PAGE_READONLY_X, - [VM_EXEC | VM_READ] = PAGE_READONLY_X, - [VM_EXEC | VM_WRITE] = PAGE_COPY_X, - [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, - [VM_SHARED] = PAGE_NONE, - [VM_SHARED | VM_READ] = PAGE_READONLY, - [VM_SHARED | VM_WRITE] = PAGE_SHARED, - [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, - [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, - [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, - [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X -}; +/* + * Generic declaration in (include/linux/mm.h) is not available + * here as the platform enables ARCH_HAS_VM_GET_PAGE_PROT. + */ +extern pgprot_t protection_map[16]; pgprot_t vm_get_page_prot(unsigned long vm_flags) { diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c index e6166b71d36d..780fbecd7bf6 100644 --- a/arch/powerpc/mm/pgtable.c +++ b/arch/powerpc/mm/pgtable.c @@ -472,3 +472,23 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, return ret_pte; } EXPORT_SYMBOL_GPL(__find_linux_pte); + +/* Note due to the way vm flags are laid out, the bits are XWR */ +pgprot_t protection_map[16] = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY_X, + [VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X +}; diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 1d1be9d9419c..23e643db6575 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -186,26 +186,6 @@ extern struct pt_alloc_ops pt_ops __initdata; extern pgd_t swapper_pg_dir[]; -/* MAP_PRIVATE permissions: xwr (copy-on-write) */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READ -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_EXEC -#define __P101 PAGE_READ_EXEC -#define __P110 PAGE_COPY_EXEC -#define __P111 PAGE_COPY_READ_EXEC - -/* MAP_SHARED permissions: xwr */ -#define __S000 PAGE_NONE -#define __S001 PAGE_READ -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_EXEC -#define __S101 PAGE_READ_EXEC -#define __S110 PAGE_SHARED_EXEC -#define __S111 PAGE_SHARED_EXEC - #ifdef CONFIG_TRANSPARENT_HUGEPAGE static inline int pmd_present(pmd_t pmd) { diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index d466ec670e1f..84ee476ba4a4 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -288,6 +288,25 @@ static pmd_t __maybe_unused early_dtb_pmd[PTRS_PER_PMD] __initdata __aligned(PAG #define early_pg_dir ((pgd_t *)XIP_FIXUP(early_pg_dir)) #endif /* CONFIG_XIP_KERNEL */ +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READ, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_EXEC, + [VM_EXEC | VM_READ] = PAGE_READ_EXEC, + [VM_EXEC | VM_WRITE] = PAGE_COPY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_READ_EXEC, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READ, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_EXEC, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READ_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_EXEC +}; + void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot) { unsigned long addr = __fix_to_virt(idx); diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index a397b072a580..c63a05b5368a 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -424,23 +424,6 @@ static inline int is_module_addr(void *addr) * implies read permission. */ /*xwr*/ -#define __P000 PAGE_NONE -#define __P001 PAGE_RO -#define __P010 PAGE_RO -#define __P011 PAGE_RO -#define __P100 PAGE_RX -#define __P101 PAGE_RX -#define __P110 PAGE_RX -#define __P111 PAGE_RX - -#define __S000 PAGE_NONE -#define __S001 PAGE_RO -#define __S010 PAGE_RW -#define __S011 PAGE_RW -#define __S100 PAGE_RX -#define __S101 PAGE_RX -#define __S110 PAGE_RWX -#define __S111 PAGE_RWX /* * Segment entry (large page) protection definitions. diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index d545f5c39f7e..25e6249d44ab 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -188,3 +188,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack) mm->get_unmapped_area = arch_get_unmapped_area_topdown; } } + +pgprot_t protection_map[16] = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_RO, + [VM_WRITE] = PAGE_RO, + [VM_WRITE | VM_READ] = PAGE_RO, + [VM_EXEC] = PAGE_RX, + [VM_EXEC | VM_READ] = PAGE_RX, + [VM_EXEC | VM_WRITE] = PAGE_RX, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_RX, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_RO, + [VM_SHARED | VM_WRITE] = PAGE_RW, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_RW, + [VM_SHARED | VM_EXEC] = PAGE_RX, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_RX, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_RWX, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_RWX +}; diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.h index d7ddb1ec86a0..6fb9ec54cf9b 100644 --- a/arch/sh/include/asm/pgtable.h +++ b/arch/sh/include/asm/pgtable.h @@ -89,23 +89,6 @@ static inline unsigned long phys_addr_mask(void) * completely separate permission bits for user and kernel space. */ /*xwr*/ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_EXECREAD -#define __P101 PAGE_EXECREAD -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_WRITEONLY -#define __S011 PAGE_SHARED -#define __S100 PAGE_EXECREAD -#define __S101 PAGE_EXECREAD -#define __S110 PAGE_RWX -#define __S111 PAGE_RWX typedef pte_t *pte_addr_t; diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c index 6a1a1297baae..81fc312f9e97 100644 --- a/arch/sh/mm/mmap.c +++ b/arch/sh/mm/mmap.c @@ -162,3 +162,22 @@ int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) { return 1; } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_EXECREAD, + [VM_EXEC | VM_READ] = PAGE_EXECREAD, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_WRITEONLY, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_EXECREAD, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_EXECREAD, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_RWX, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_RWX +}; diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 4866625da314..8ff549004fac 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -64,25 +64,6 @@ void paging_init(void); extern unsigned long ptr_in_current_pgd; -/* xwr */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY -#define __P101 PAGE_READONLY -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY -#define __S101 PAGE_READONLY -#define __S110 PAGE_SHARED -#define __S111 PAGE_SHARED - /* First physical page can be anywhere, the following is needed so that * va-->pa and vice versa conversions work properly without performance * hit for all __pa()/__va() operations. diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 1e9f577f084d..98d100982d7c 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -302,3 +302,22 @@ void sparc_flush_page_to_ram(struct page *page) __flush_page_to_ram(vaddr); } EXPORT_SYMBOL(sparc_flush_page_to_ram); + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY, + [VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED +}; diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index d6faee23c77d..0e76c355c563 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c @@ -2635,7 +2635,7 @@ void vmemmap_free(unsigned long start, unsigned long end, #endif /* CONFIG_SPARSEMEM_VMEMMAP */ /* These are actually filled in at boot time by sun4{u,v}_pgprot_init() */ -static pgprot_t protection_map[16] __ro_after_init; +pgprot_t protection_map[16] __ro_after_init; static void prot_init_common(unsigned long page_none, unsigned long page_shared, diff --git a/arch/um/include/asm/pgtable.h b/arch/um/include/asm/pgtable.h index 167e236d9bb8..66bc3f99d9be 100644 --- a/arch/um/include/asm/pgtable.h +++ b/arch/um/include/asm/pgtable.h @@ -68,23 +68,6 @@ extern unsigned long end_iomem; * Also, write permissions imply read permissions. This is the closest we can * get.. */ -#define __P000 PAGE_NONE -#define __P001 PAGE_READONLY -#define __P010 PAGE_COPY -#define __P011 PAGE_COPY -#define __P100 PAGE_READONLY -#define __P101 PAGE_READONLY -#define __P110 PAGE_COPY -#define __P111 PAGE_COPY - -#define __S000 PAGE_NONE -#define __S001 PAGE_READONLY -#define __S010 PAGE_SHARED -#define __S011 PAGE_SHARED -#define __S100 PAGE_READONLY -#define __S101 PAGE_READONLY -#define __S110 PAGE_SHARED -#define __S111 PAGE_SHARED /* * ZERO_PAGE is a global shared page that is always zero: used diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 15295c3237a0..78809967e843 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -197,3 +197,22 @@ void *uml_kmalloc(int size, int flags) { return kmalloc(size, flags); } + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY, + [VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_EXEC | VM_WRITE] = PAGE_COPY, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED +}; diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c index 19c5dbd46770..cafd01f730da 100644 --- a/arch/x86/um/mem_32.c +++ b/arch/x86/um/mem_32.c @@ -17,7 +17,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; - gate_vma.vm_page_prot = __P101; + gate_vma.vm_page_prot = PAGE_READONLY; return 0; } diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 0a91376131c5..e0d5531ae00d 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -200,24 +200,6 @@ * What follows is the closest we can get by reasonable means.. * See linux/mm/mmap.c for protection_map[] array that uses these definitions. */ -#define __P000 PAGE_NONE /* private --- */ -#define __P001 PAGE_READONLY /* private --r */ -#define __P010 PAGE_COPY /* private -w- */ -#define __P011 PAGE_COPY /* private -wr */ -#define __P100 PAGE_READONLY_EXEC /* private x-- */ -#define __P101 PAGE_READONLY_EXEC /* private x-r */ -#define __P110 PAGE_COPY_EXEC /* private xw- */ -#define __P111 PAGE_COPY_EXEC /* private xwr */ - -#define __S000 PAGE_NONE /* shared --- */ -#define __S001 PAGE_READONLY /* shared --r */ -#define __S010 PAGE_SHARED /* shared -w- */ -#define __S011 PAGE_SHARED /* shared -wr */ -#define __S100 PAGE_READONLY_EXEC /* shared x-- */ -#define __S101 PAGE_READONLY_EXEC /* shared x-r */ -#define __S110 PAGE_SHARED_EXEC /* shared xw- */ -#define __S111 PAGE_SHARED_EXEC /* shared xwr */ - #ifndef __ASSEMBLY__ #define pte_ERROR(e) \ diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c index 6a32b2cf2718..5b9ac0c69c32 100644 --- a/arch/xtensa/mm/init.c +++ b/arch/xtensa/mm/init.c @@ -216,3 +216,22 @@ static int __init parse_memmap_opt(char *str) return 0; } early_param("memmap", parse_memmap_opt); + +pgprot_t protection_map[16] __ro_after_init = { + [VM_NONE] = PAGE_NONE, + [VM_READ] = PAGE_READONLY, + [VM_WRITE] = PAGE_COPY, + [VM_WRITE | VM_READ] = PAGE_COPY, + [VM_EXEC] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_EXEC | VM_WRITE] = PAGE_COPY_EXEC, + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_EXEC, + [VM_SHARED] = PAGE_NONE, + [VM_SHARED | VM_READ] = PAGE_READONLY, + [VM_SHARED | VM_WRITE] = PAGE_SHARED, + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, + [VM_SHARED | VM_EXEC] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_EXEC, + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_EXEC +}; diff --git a/include/linux/mm.h b/include/linux/mm.h index 2254c1980c8e..65b7f3d9ff87 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -420,11 +420,11 @@ extern unsigned int kobjsize(const void *objp); #endif #define VM_FLAGS_CLEAR (ARCH_VM_PKEY_FLAGS | VM_ARCH_CLEAR) -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT /* * mapping from the currently active vm_flags protection bits (the * low four bits) to a page protection mask.. */ +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT extern pgprot_t protection_map[16]; #endif diff --git a/mm/mmap.c b/mm/mmap.c index e66920414945..012261c8efb8 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -102,25 +102,6 @@ static void unmap_region(struct mm_struct *mm, * x: (yes) yes */ #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT -pgprot_t protection_map[16] __ro_after_init = { - [VM_NONE] = __P000, - [VM_READ] = __P001, - [VM_WRITE] = __P010, - [VM_WRITE | VM_READ] = __P011, - [VM_EXEC] = __P100, - [VM_EXEC | VM_READ] = __P101, - [VM_EXEC | VM_WRITE] = __P110, - [VM_EXEC | VM_WRITE | VM_READ] = __P111, - [VM_SHARED] = __S000, - [VM_SHARED | VM_READ] = __S001, - [VM_SHARED | VM_WRITE] = __S010, - [VM_SHARED | VM_WRITE | VM_READ] = __S011, - [VM_SHARED | VM_EXEC] = __S100, - [VM_SHARED | VM_EXEC | VM_READ] = __S101, - [VM_SHARED | VM_EXEC | VM_WRITE] = __S110, - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __S111 -}; - pgprot_t vm_get_page_prot(unsigned long vm_flags) { return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; -- 2.25.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 4:09 ` [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array Anshuman Khandual @ 2022-06-16 5:27 ` Christophe Leroy 2022-06-16 6:10 ` hch 2022-06-17 3:46 ` Anshuman Khandual 2022-06-16 5:45 ` Christophe Leroy 1 sibling, 2 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-16 5:27 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : > Move the protection_array[] array inside the arch for those platforms which s/protection_array/protection_map > do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can > be dropped completely which are now redundant. I see some protection_map[] are __ro_after_init, some not. I'm sure several of them could be const as they are never modified. Christophe ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 5:27 ` Christophe Leroy @ 2022-06-16 6:10 ` hch 2022-06-17 3:46 ` Anshuman Khandual 1 sibling, 0 replies; 28+ messages in thread From: hch @ 2022-06-16 6:10 UTC (permalink / raw) To: Christophe Leroy Cc: Anshuman Khandual, linux-mm, hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On Thu, Jun 16, 2022 at 05:27:15AM +0000, Christophe Leroy wrote: > > > Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : > > Move the protection_array[] array inside the arch for those platforms which > > s/protection_array/protection_map > > > do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can > > be dropped completely which are now redundant. > > I see some protection_map[] are __ro_after_init, some not. > > I'm sure several of them could be const as they are never modified. Yes, most should be const as they are never modified. A few have init time modifications and can be __ro_after_init. If we actually have any that are modified later on that is a bug that we need to look into with the respective arch maintainers. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 5:27 ` Christophe Leroy 2022-06-16 6:10 ` hch @ 2022-06-17 3:46 ` Anshuman Khandual 1 sibling, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-17 3:46 UTC (permalink / raw) To: Christophe Leroy, linux-mm Cc: hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On 6/16/22 10:57, Christophe Leroy wrote: > > > Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >> Move the protection_array[] array inside the arch for those platforms which > > s/protection_array/protection_map Sure, will fix this typo. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 4:09 ` [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array Anshuman Khandual 2022-06-16 5:27 ` Christophe Leroy @ 2022-06-16 5:45 ` Christophe Leroy 2022-06-16 6:12 ` hch 2022-06-17 3:43 ` Anshuman Khandual 1 sibling, 2 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-16 5:45 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : > Move the protection_array[] array inside the arch for those platforms which > do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can > be dropped completely which are now redundant. > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > Reported-by: kernel test robot <lkp@intel.com> > Acked-by: Christoph Hellwig <hch@lst.de> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > arch/alpha/include/asm/pgtable.h | 17 ------- > arch/alpha/mm/init.c | 21 +++++++++ > arch/arc/include/asm/pgtable-bits-arcv2.h | 18 -------- > arch/arc/mm/mmap.c | 19 ++++++++ > arch/arm/include/asm/pgtable.h | 17 ------- > arch/arm/lib/uaccess_with_memcpy.c | 2 +- > arch/arm/mm/mmu.c | 19 ++++++++ > arch/csky/include/asm/pgtable.h | 18 -------- > arch/csky/mm/init.c | 19 ++++++++ > arch/hexagon/include/asm/pgtable.h | 27 ------------ > arch/hexagon/mm/init.c | 41 +++++++++++++++++ > arch/ia64/include/asm/pgtable.h | 18 -------- > arch/ia64/mm/init.c | 27 +++++++++++- > arch/loongarch/include/asm/pgtable-bits.h | 19 -------- > arch/loongarch/mm/cache.c | 45 +++++++++++++++++++ > arch/m68k/include/asm/mcf_pgtable.h | 54 ----------------------- > arch/m68k/include/asm/motorola_pgtable.h | 22 --------- > arch/m68k/include/asm/sun3_pgtable.h | 17 ------- > arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++ > arch/m68k/mm/motorola.c | 19 ++++++++ > arch/m68k/mm/sun3mmu.c | 19 ++++++++ > arch/microblaze/include/asm/pgtable.h | 17 ------- > arch/microblaze/mm/init.c | 19 ++++++++ > arch/mips/include/asm/pgtable.h | 22 --------- > arch/mips/mm/cache.c | 2 + > arch/nios2/include/asm/pgtable.h | 16 ------- > arch/nios2/mm/init.c | 19 ++++++++ > arch/openrisc/include/asm/pgtable.h | 18 -------- > arch/openrisc/mm/init.c | 19 ++++++++ > arch/parisc/include/asm/pgtable.h | 18 -------- > arch/parisc/mm/init.c | 19 ++++++++ > arch/powerpc/include/asm/pgtable.h | 20 --------- > arch/powerpc/mm/book3s64/pgtable.c | 24 +++------- > arch/powerpc/mm/pgtable.c | 20 +++++++++ > arch/riscv/include/asm/pgtable.h | 20 --------- > arch/riscv/mm/init.c | 19 ++++++++ > arch/s390/include/asm/pgtable.h | 17 ------- > arch/s390/mm/mmap.c | 19 ++++++++ > arch/sh/include/asm/pgtable.h | 17 ------- > arch/sh/mm/mmap.c | 19 ++++++++ > arch/sparc/include/asm/pgtable_32.h | 19 -------- > arch/sparc/mm/init_32.c | 19 ++++++++ > arch/sparc/mm/init_64.c | 2 +- > arch/um/include/asm/pgtable.h | 17 ------- > arch/um/kernel/mem.c | 19 ++++++++ > arch/x86/um/mem_32.c | 2 +- > arch/xtensa/include/asm/pgtable.h | 18 -------- > arch/xtensa/mm/init.c | 19 ++++++++ > include/linux/mm.h | 2 +- > mm/mmap.c | 19 -------- > 50 files changed, 503 insertions(+), 489 deletions(-) > > diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h > index 8ed2a80c896e..bd636295a794 100644 > --- a/arch/powerpc/include/asm/pgtable.h > +++ b/arch/powerpc/include/asm/pgtable.h > @@ -21,26 +21,6 @@ struct mm_struct; > #endif /* !CONFIG_PPC_BOOK3S */ > > /* Note due to the way vm flags are laid out, the bits are XWR */ > -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > -#define __P000 PAGE_NONE > -#define __P001 PAGE_READONLY > -#define __P010 PAGE_COPY > -#define __P011 PAGE_COPY > -#define __P100 PAGE_READONLY_X > -#define __P101 PAGE_READONLY_X > -#define __P110 PAGE_COPY_X > -#define __P111 PAGE_COPY_X > - > -#define __S000 PAGE_NONE > -#define __S001 PAGE_READONLY > -#define __S010 PAGE_SHARED > -#define __S011 PAGE_SHARED > -#define __S100 PAGE_READONLY_X > -#define __S101 PAGE_READONLY_X > -#define __S110 PAGE_SHARED_X > -#define __S111 PAGE_SHARED_X > -#endif > - > #ifndef __ASSEMBLY__ > > #ifndef MAX_PTRS_PER_PGD > diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c > index d3b019b95c1d..de76dd4d447c 100644 > --- a/arch/powerpc/mm/book3s64/pgtable.c > +++ b/arch/powerpc/mm/book3s64/pgtable.c > @@ -551,25 +551,11 @@ unsigned long memremap_compat_align(void) > EXPORT_SYMBOL_GPL(memremap_compat_align); > #endif > > -/* Note due to the way vm flags are laid out, the bits are XWR */ > -static const pgprot_t protection_map[16] = { > - [VM_NONE] = PAGE_NONE, > - [VM_READ] = PAGE_READONLY, > - [VM_WRITE] = PAGE_COPY, > - [VM_WRITE | VM_READ] = PAGE_COPY, > - [VM_EXEC] = PAGE_READONLY_X, > - [VM_EXEC | VM_READ] = PAGE_READONLY_X, > - [VM_EXEC | VM_WRITE] = PAGE_COPY_X, > - [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, > - [VM_SHARED] = PAGE_NONE, > - [VM_SHARED | VM_READ] = PAGE_READONLY, > - [VM_SHARED | VM_WRITE] = PAGE_SHARED, > - [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, > - [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, > - [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, > - [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, > - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X > -}; > +/* > + * Generic declaration in (include/linux/mm.h) is not available > + * here as the platform enables ARCH_HAS_VM_GET_PAGE_PROT. > + */ > +extern pgprot_t protection_map[16]; > > pgprot_t vm_get_page_prot(unsigned long vm_flags) > { > diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c > index e6166b71d36d..780fbecd7bf6 100644 > --- a/arch/powerpc/mm/pgtable.c > +++ b/arch/powerpc/mm/pgtable.c > @@ -472,3 +472,23 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, > return ret_pte; > } > EXPORT_SYMBOL_GPL(__find_linux_pte); > + > +/* Note due to the way vm flags are laid out, the bits are XWR */ > +pgprot_t protection_map[16] = { Was const previously, now back to non const ? Maybe due to a conflict with linux/mm.h ? At least it should be __ro_after_init. > + [VM_NONE] = PAGE_NONE, > + [VM_READ] = PAGE_READONLY, > + [VM_WRITE] = PAGE_COPY, > + [VM_WRITE | VM_READ] = PAGE_COPY, > + [VM_EXEC] = PAGE_READONLY_X, > + [VM_EXEC | VM_READ] = PAGE_READONLY_X, > + [VM_EXEC | VM_WRITE] = PAGE_COPY_X, > + [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, > + [VM_SHARED] = PAGE_NONE, > + [VM_SHARED | VM_READ] = PAGE_READONLY, > + [VM_SHARED | VM_WRITE] = PAGE_SHARED, > + [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, > + [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, > + [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, > + [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, > + [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X > +}; > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 2254c1980c8e..65b7f3d9ff87 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -420,11 +420,11 @@ extern unsigned int kobjsize(const void *objp); > #endif > #define VM_FLAGS_CLEAR (ARCH_VM_PKEY_FLAGS | VM_ARCH_CLEAR) > > -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > /* > * mapping from the currently active vm_flags protection bits (the > * low four bits) to a page protection mask.. > */ > +#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > extern pgprot_t protection_map[16]; > #endif > > diff --git a/mm/mmap.c b/mm/mmap.c > index e66920414945..012261c8efb8 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -102,25 +102,6 @@ static void unmap_region(struct mm_struct *mm, > * x: (yes) yes > */ > #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT > -pgprot_t protection_map[16] __ro_after_init = { > - [VM_NONE] = __P000, > - [VM_READ] = __P001, > - [VM_WRITE] = __P010, > - [VM_WRITE | VM_READ] = __P011, > - [VM_EXEC] = __P100, > - [VM_EXEC | VM_READ] = __P101, > - [VM_EXEC | VM_WRITE] = __P110, > - [VM_EXEC | VM_WRITE | VM_READ] = __P111, > - [VM_SHARED] = __S000, > - [VM_SHARED | VM_READ] = __S001, > - [VM_SHARED | VM_WRITE] = __S010, > - [VM_SHARED | VM_WRITE | VM_READ] = __S011, > - [VM_SHARED | VM_EXEC] = __S100, > - [VM_SHARED | VM_EXEC | VM_READ] = __S101, > - [VM_SHARED | VM_EXEC | VM_WRITE] = __S110, > - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = __S111 > -}; > - > pgprot_t vm_get_page_prot(unsigned long vm_flags) > { > return protection_map[vm_flags & (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]; ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 5:45 ` Christophe Leroy @ 2022-06-16 6:12 ` hch 2022-06-17 3:29 ` Anshuman Khandual 2022-06-17 3:43 ` Anshuman Khandual 1 sibling, 1 reply; 28+ messages in thread From: hch @ 2022-06-16 6:12 UTC (permalink / raw) To: Christophe Leroy Cc: Anshuman Khandual, linux-mm, hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On Thu, Jun 16, 2022 at 05:45:39AM +0000, Christophe Leroy wrote: > > +/* Note due to the way vm flags are laid out, the bits are XWR */ > > +pgprot_t protection_map[16] = { > > Was const previously, now back to non const ? Maybe due to a conflict > with linux/mm.h ? At least it should be __ro_after_init. Maybe we just need to duplicate vm_get_page_prot in all the architectures and thus avoid making protection_map global in a common header entirely. That certainly seems like the cleaner interface. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 6:12 ` hch @ 2022-06-17 3:29 ` Anshuman Khandual 2022-06-17 5:48 ` Christophe Leroy 0 siblings, 1 reply; 28+ messages in thread From: Anshuman Khandual @ 2022-06-17 3:29 UTC (permalink / raw) To: hch, Christophe Leroy Cc: linux-mm, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On 6/16/22 11:42, hch@infradead.org wrote: > On Thu, Jun 16, 2022 at 05:45:39AM +0000, Christophe Leroy wrote: >>> +/* Note due to the way vm flags are laid out, the bits are XWR */ >>> +pgprot_t protection_map[16] = { >> >> Was const previously, now back to non const ? Maybe due to a conflict >> with linux/mm.h ? At least it should be __ro_after_init. > > Maybe we just need to duplicate vm_get_page_prot in all the > architectures and thus avoid making protection_map global in a > common header entirely. That certainly seems like the cleaner > interface. Agreed, also it does free up the platforms to provide any appropriate qualifiers for the protection_map[] array i.e __ro_after_init, const etc without impacting generic declaration used in a generic function. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-17 3:29 ` Anshuman Khandual @ 2022-06-17 5:48 ` Christophe Leroy 2022-06-17 8:00 ` hch 0 siblings, 1 reply; 28+ messages in thread From: Christophe Leroy @ 2022-06-17 5:48 UTC (permalink / raw) To: Anshuman Khandual, hch Cc: linux-mm, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig Le 17/06/2022 à 05:29, Anshuman Khandual a écrit : > > > On 6/16/22 11:42, hch@infradead.org wrote: >> On Thu, Jun 16, 2022 at 05:45:39AM +0000, Christophe Leroy wrote: >>>> +/* Note due to the way vm flags are laid out, the bits are XWR */ >>>> +pgprot_t protection_map[16] = { >>> >>> Was const previously, now back to non const ? Maybe due to a conflict >>> with linux/mm.h ? At least it should be __ro_after_init. >> >> Maybe we just need to duplicate vm_get_page_prot in all the >> architectures and thus avoid making protection_map global in a >> common header entirely. That certainly seems like the cleaner >> interface. > > Agreed, also it does free up the platforms to provide any appropriate > qualifiers for the protection_map[] array i.e __ro_after_init, const > etc without impacting generic declaration used in a generic function. Maybe all we need is to keep protection_map[] declaration architecture specific. Is it a good idea to duplicate vm_get_page_prot() in each architecture ? Maybe it is, but it will also mean changing common code like mm/debug_vm_pgtable.c which accesses protection_map[] directly as of today. On the other hand it means we can then drop CONFIG_ARCH_HAS_VM_GET_PAGE_PROT completely at the end. In a way that's a way back into your first version of the series, but without the uggly switch/case, maybe that's the best solution after all. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-17 5:48 ` Christophe Leroy @ 2022-06-17 8:00 ` hch 2022-06-20 4:14 ` Anshuman Khandual 0 siblings, 1 reply; 28+ messages in thread From: hch @ 2022-06-17 8:00 UTC (permalink / raw) To: Christophe Leroy Cc: Anshuman Khandual, hch, linux-mm, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On Fri, Jun 17, 2022 at 05:48:11AM +0000, Christophe Leroy wrote: > Is it a good idea to duplicate vm_get_page_prot() in each architecture ? It is a completely trivial array index. And I really like the idea of not having the protection_map in common code - it really is an implementation detail. But what we could do is something like #define DECLARE_VM_GET_PAGE_PROT \ pgprot_t vm_get_page_prot(unsigned long vm_flags) \ { \ return protection_map[vm_flags & \ (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)]; \ } \ EXPORT_SYMBOL(vm_get_page_prot); as a helper for the architectures. > Maybe it is, but it will also mean changing common code like > mm/debug_vm_pgtable.c which accesses protection_map[] directly as of today. That's already gone thanks to the good work from Anshuman. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-17 8:00 ` hch @ 2022-06-20 4:14 ` Anshuman Khandual 0 siblings, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-20 4:14 UTC (permalink / raw) To: hch, Christophe Leroy Cc: linux-mm, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On 6/17/22 13:30, hch@infradead.org wrote: > On Fri, Jun 17, 2022 at 05:48:11AM +0000, Christophe Leroy wrote: >> Is it a good idea to duplicate vm_get_page_prot() in each architecture ? > > It is a completely trivial array index. And I really like the idea > of not having the protection_map in common code - it really is an > implementation detail. But what we could do is something like > > #define DECLARE_VM_GET_PAGE_PROT \ > pgprot_t vm_get_page_prot(unsigned long vm_flags) \ > { \ > return protection_map[vm_flags & \ > (VM_READ | VM_WRITE | VM_EXEC | VM_SHARED)]; \ > } \ > EXPORT_SYMBOL(vm_get_page_prot); > > as a helper for the architectures. Agreed, this will ensure the exact same implementation for all platforms (except those custom vm_get_page_prot), without deviations and mistakes. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-16 5:45 ` Christophe Leroy 2022-06-16 6:12 ` hch @ 2022-06-17 3:43 ` Anshuman Khandual 2022-06-17 5:40 ` Christophe Leroy 1 sibling, 1 reply; 28+ messages in thread From: Anshuman Khandual @ 2022-06-17 3:43 UTC (permalink / raw) To: Christophe Leroy, linux-mm Cc: hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig On 6/16/22 11:15, Christophe Leroy wrote: > > Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >> Move the protection_array[] array inside the arch for those platforms which >> do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can >> be dropped completely which are now redundant. >> >> Cc: Andrew Morton <akpm@linux-foundation.org> >> Cc: linux-mm@kvack.org >> Cc: linux-kernel@vger.kernel.org >> Reported-by: kernel test robot <lkp@intel.com> >> Acked-by: Christoph Hellwig <hch@lst.de> >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >> --- >> arch/alpha/include/asm/pgtable.h | 17 ------- >> arch/alpha/mm/init.c | 21 +++++++++ >> arch/arc/include/asm/pgtable-bits-arcv2.h | 18 -------- >> arch/arc/mm/mmap.c | 19 ++++++++ >> arch/arm/include/asm/pgtable.h | 17 ------- >> arch/arm/lib/uaccess_with_memcpy.c | 2 +- >> arch/arm/mm/mmu.c | 19 ++++++++ >> arch/csky/include/asm/pgtable.h | 18 -------- >> arch/csky/mm/init.c | 19 ++++++++ >> arch/hexagon/include/asm/pgtable.h | 27 ------------ >> arch/hexagon/mm/init.c | 41 +++++++++++++++++ >> arch/ia64/include/asm/pgtable.h | 18 -------- >> arch/ia64/mm/init.c | 27 +++++++++++- >> arch/loongarch/include/asm/pgtable-bits.h | 19 -------- >> arch/loongarch/mm/cache.c | 45 +++++++++++++++++++ >> arch/m68k/include/asm/mcf_pgtable.h | 54 ----------------------- >> arch/m68k/include/asm/motorola_pgtable.h | 22 --------- >> arch/m68k/include/asm/sun3_pgtable.h | 17 ------- >> arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++ >> arch/m68k/mm/motorola.c | 19 ++++++++ >> arch/m68k/mm/sun3mmu.c | 19 ++++++++ >> arch/microblaze/include/asm/pgtable.h | 17 ------- >> arch/microblaze/mm/init.c | 19 ++++++++ >> arch/mips/include/asm/pgtable.h | 22 --------- >> arch/mips/mm/cache.c | 2 + >> arch/nios2/include/asm/pgtable.h | 16 ------- >> arch/nios2/mm/init.c | 19 ++++++++ >> arch/openrisc/include/asm/pgtable.h | 18 -------- >> arch/openrisc/mm/init.c | 19 ++++++++ >> arch/parisc/include/asm/pgtable.h | 18 -------- >> arch/parisc/mm/init.c | 19 ++++++++ >> arch/powerpc/include/asm/pgtable.h | 20 --------- >> arch/powerpc/mm/book3s64/pgtable.c | 24 +++------- >> arch/powerpc/mm/pgtable.c | 20 +++++++++ >> arch/riscv/include/asm/pgtable.h | 20 --------- >> arch/riscv/mm/init.c | 19 ++++++++ >> arch/s390/include/asm/pgtable.h | 17 ------- >> arch/s390/mm/mmap.c | 19 ++++++++ >> arch/sh/include/asm/pgtable.h | 17 ------- >> arch/sh/mm/mmap.c | 19 ++++++++ >> arch/sparc/include/asm/pgtable_32.h | 19 -------- >> arch/sparc/mm/init_32.c | 19 ++++++++ >> arch/sparc/mm/init_64.c | 2 +- >> arch/um/include/asm/pgtable.h | 17 ------- >> arch/um/kernel/mem.c | 19 ++++++++ >> arch/x86/um/mem_32.c | 2 +- >> arch/xtensa/include/asm/pgtable.h | 18 -------- >> arch/xtensa/mm/init.c | 19 ++++++++ >> include/linux/mm.h | 2 +- >> mm/mmap.c | 19 -------- >> 50 files changed, 503 insertions(+), 489 deletions(-) >> >> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >> index 8ed2a80c896e..bd636295a794 100644 >> --- a/arch/powerpc/include/asm/pgtable.h >> +++ b/arch/powerpc/include/asm/pgtable.h >> @@ -21,26 +21,6 @@ struct mm_struct; >> #endif /* !CONFIG_PPC_BOOK3S */ >> >> /* Note due to the way vm flags are laid out, the bits are XWR */ >> -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >> -#define __P000 PAGE_NONE >> -#define __P001 PAGE_READONLY >> -#define __P010 PAGE_COPY >> -#define __P011 PAGE_COPY >> -#define __P100 PAGE_READONLY_X >> -#define __P101 PAGE_READONLY_X >> -#define __P110 PAGE_COPY_X >> -#define __P111 PAGE_COPY_X >> - >> -#define __S000 PAGE_NONE >> -#define __S001 PAGE_READONLY >> -#define __S010 PAGE_SHARED >> -#define __S011 PAGE_SHARED >> -#define __S100 PAGE_READONLY_X >> -#define __S101 PAGE_READONLY_X >> -#define __S110 PAGE_SHARED_X >> -#define __S111 PAGE_SHARED_X >> -#endif >> - >> #ifndef __ASSEMBLY__ >> >> #ifndef MAX_PTRS_PER_PGD >> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c >> index d3b019b95c1d..de76dd4d447c 100644 >> --- a/arch/powerpc/mm/book3s64/pgtable.c >> +++ b/arch/powerpc/mm/book3s64/pgtable.c >> @@ -551,25 +551,11 @@ unsigned long memremap_compat_align(void) >> EXPORT_SYMBOL_GPL(memremap_compat_align); >> #endif >> >> -/* Note due to the way vm flags are laid out, the bits are XWR */ >> -static const pgprot_t protection_map[16] = { >> - [VM_NONE] = PAGE_NONE, >> - [VM_READ] = PAGE_READONLY, >> - [VM_WRITE] = PAGE_COPY, >> - [VM_WRITE | VM_READ] = PAGE_COPY, >> - [VM_EXEC] = PAGE_READONLY_X, >> - [VM_EXEC | VM_READ] = PAGE_READONLY_X, >> - [VM_EXEC | VM_WRITE] = PAGE_COPY_X, >> - [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, >> - [VM_SHARED] = PAGE_NONE, >> - [VM_SHARED | VM_READ] = PAGE_READONLY, >> - [VM_SHARED | VM_WRITE] = PAGE_SHARED, >> - [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, >> - [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, >> - [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, >> - [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, >> - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X >> -}; >> +/* >> + * Generic declaration in (include/linux/mm.h) is not available >> + * here as the platform enables ARCH_HAS_VM_GET_PAGE_PROT. >> + */ >> +extern pgprot_t protection_map[16]; >> >> pgprot_t vm_get_page_prot(unsigned long vm_flags) >> { >> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c >> index e6166b71d36d..780fbecd7bf6 100644 >> --- a/arch/powerpc/mm/pgtable.c >> +++ b/arch/powerpc/mm/pgtable.c >> @@ -472,3 +472,23 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, >> return ret_pte; >> } >> EXPORT_SYMBOL_GPL(__find_linux_pte); >> + >> +/* Note due to the way vm flags are laid out, the bits are XWR */ >> +pgprot_t protection_map[16] = { > > Was const previously, now back to non const ? Maybe due to a conflict > with linux/mm.h ? At least it should be __ro_after_init. > Right, the generic declaration in linux/mm.h prevents different types for protection_map[] on different platforms. As mentioned before, may be we should move generic vm_get_page_prot() inside the platforms ? ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array 2022-06-17 3:43 ` Anshuman Khandual @ 2022-06-17 5:40 ` Christophe Leroy 0 siblings, 0 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-17 5:40 UTC (permalink / raw) To: Anshuman Khandual, linux-mm Cc: hch, Andrew Morton, linux-kernel, kernel test robot, Christoph Hellwig Le 17/06/2022 à 05:43, Anshuman Khandual a écrit : > > > On 6/16/22 11:15, Christophe Leroy wrote: >> >> Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >>> Move the protection_array[] array inside the arch for those platforms which >>> do not enable ARCH_HAS_VM_GET_PAGE_PROT. Afterwards __SXXX/__PXX macros can >>> be dropped completely which are now redundant. >>> >>> Cc: Andrew Morton <akpm@linux-foundation.org> >>> Cc: linux-mm@kvack.org >>> Cc: linux-kernel@vger.kernel.org >>> Reported-by: kernel test robot <lkp@intel.com> >>> Acked-by: Christoph Hellwig <hch@lst.de> >>> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >>> --- >>> arch/alpha/include/asm/pgtable.h | 17 ------- >>> arch/alpha/mm/init.c | 21 +++++++++ >>> arch/arc/include/asm/pgtable-bits-arcv2.h | 18 -------- >>> arch/arc/mm/mmap.c | 19 ++++++++ >>> arch/arm/include/asm/pgtable.h | 17 ------- >>> arch/arm/lib/uaccess_with_memcpy.c | 2 +- >>> arch/arm/mm/mmu.c | 19 ++++++++ >>> arch/csky/include/asm/pgtable.h | 18 -------- >>> arch/csky/mm/init.c | 19 ++++++++ >>> arch/hexagon/include/asm/pgtable.h | 27 ------------ >>> arch/hexagon/mm/init.c | 41 +++++++++++++++++ >>> arch/ia64/include/asm/pgtable.h | 18 -------- >>> arch/ia64/mm/init.c | 27 +++++++++++- >>> arch/loongarch/include/asm/pgtable-bits.h | 19 -------- >>> arch/loongarch/mm/cache.c | 45 +++++++++++++++++++ >>> arch/m68k/include/asm/mcf_pgtable.h | 54 ----------------------- >>> arch/m68k/include/asm/motorola_pgtable.h | 22 --------- >>> arch/m68k/include/asm/sun3_pgtable.h | 17 ------- >>> arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++ >>> arch/m68k/mm/motorola.c | 19 ++++++++ >>> arch/m68k/mm/sun3mmu.c | 19 ++++++++ >>> arch/microblaze/include/asm/pgtable.h | 17 ------- >>> arch/microblaze/mm/init.c | 19 ++++++++ >>> arch/mips/include/asm/pgtable.h | 22 --------- >>> arch/mips/mm/cache.c | 2 + >>> arch/nios2/include/asm/pgtable.h | 16 ------- >>> arch/nios2/mm/init.c | 19 ++++++++ >>> arch/openrisc/include/asm/pgtable.h | 18 -------- >>> arch/openrisc/mm/init.c | 19 ++++++++ >>> arch/parisc/include/asm/pgtable.h | 18 -------- >>> arch/parisc/mm/init.c | 19 ++++++++ >>> arch/powerpc/include/asm/pgtable.h | 20 --------- >>> arch/powerpc/mm/book3s64/pgtable.c | 24 +++------- >>> arch/powerpc/mm/pgtable.c | 20 +++++++++ >>> arch/riscv/include/asm/pgtable.h | 20 --------- >>> arch/riscv/mm/init.c | 19 ++++++++ >>> arch/s390/include/asm/pgtable.h | 17 ------- >>> arch/s390/mm/mmap.c | 19 ++++++++ >>> arch/sh/include/asm/pgtable.h | 17 ------- >>> arch/sh/mm/mmap.c | 19 ++++++++ >>> arch/sparc/include/asm/pgtable_32.h | 19 -------- >>> arch/sparc/mm/init_32.c | 19 ++++++++ >>> arch/sparc/mm/init_64.c | 2 +- >>> arch/um/include/asm/pgtable.h | 17 ------- >>> arch/um/kernel/mem.c | 19 ++++++++ >>> arch/x86/um/mem_32.c | 2 +- >>> arch/xtensa/include/asm/pgtable.h | 18 -------- >>> arch/xtensa/mm/init.c | 19 ++++++++ >>> include/linux/mm.h | 2 +- >>> mm/mmap.c | 19 -------- >>> 50 files changed, 503 insertions(+), 489 deletions(-) >>> >>> diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h >>> index 8ed2a80c896e..bd636295a794 100644 >>> --- a/arch/powerpc/include/asm/pgtable.h >>> +++ b/arch/powerpc/include/asm/pgtable.h >>> @@ -21,26 +21,6 @@ struct mm_struct; >>> #endif /* !CONFIG_PPC_BOOK3S */ >>> >>> /* Note due to the way vm flags are laid out, the bits are XWR */ >>> -#ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT >>> -#define __P000 PAGE_NONE >>> -#define __P001 PAGE_READONLY >>> -#define __P010 PAGE_COPY >>> -#define __P011 PAGE_COPY >>> -#define __P100 PAGE_READONLY_X >>> -#define __P101 PAGE_READONLY_X >>> -#define __P110 PAGE_COPY_X >>> -#define __P111 PAGE_COPY_X >>> - >>> -#define __S000 PAGE_NONE >>> -#define __S001 PAGE_READONLY >>> -#define __S010 PAGE_SHARED >>> -#define __S011 PAGE_SHARED >>> -#define __S100 PAGE_READONLY_X >>> -#define __S101 PAGE_READONLY_X >>> -#define __S110 PAGE_SHARED_X >>> -#define __S111 PAGE_SHARED_X >>> -#endif >>> - >>> #ifndef __ASSEMBLY__ >>> >>> #ifndef MAX_PTRS_PER_PGD >>> diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c >>> index d3b019b95c1d..de76dd4d447c 100644 >>> --- a/arch/powerpc/mm/book3s64/pgtable.c >>> +++ b/arch/powerpc/mm/book3s64/pgtable.c >>> @@ -551,25 +551,11 @@ unsigned long memremap_compat_align(void) >>> EXPORT_SYMBOL_GPL(memremap_compat_align); >>> #endif >>> >>> -/* Note due to the way vm flags are laid out, the bits are XWR */ >>> -static const pgprot_t protection_map[16] = { >>> - [VM_NONE] = PAGE_NONE, >>> - [VM_READ] = PAGE_READONLY, >>> - [VM_WRITE] = PAGE_COPY, >>> - [VM_WRITE | VM_READ] = PAGE_COPY, >>> - [VM_EXEC] = PAGE_READONLY_X, >>> - [VM_EXEC | VM_READ] = PAGE_READONLY_X, >>> - [VM_EXEC | VM_WRITE] = PAGE_COPY_X, >>> - [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_X, >>> - [VM_SHARED] = PAGE_NONE, >>> - [VM_SHARED | VM_READ] = PAGE_READONLY, >>> - [VM_SHARED | VM_WRITE] = PAGE_SHARED, >>> - [VM_SHARED | VM_WRITE | VM_READ] = PAGE_SHARED, >>> - [VM_SHARED | VM_EXEC] = PAGE_READONLY_X, >>> - [VM_SHARED | VM_EXEC | VM_READ] = PAGE_READONLY_X, >>> - [VM_SHARED | VM_EXEC | VM_WRITE] = PAGE_SHARED_X, >>> - [VM_SHARED | VM_EXEC | VM_WRITE | VM_READ] = PAGE_SHARED_X >>> -}; >>> +/* >>> + * Generic declaration in (include/linux/mm.h) is not available >>> + * here as the platform enables ARCH_HAS_VM_GET_PAGE_PROT. >>> + */ >>> +extern pgprot_t protection_map[16]; >>> >>> pgprot_t vm_get_page_prot(unsigned long vm_flags) >>> { >>> diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c >>> index e6166b71d36d..780fbecd7bf6 100644 >>> --- a/arch/powerpc/mm/pgtable.c >>> +++ b/arch/powerpc/mm/pgtable.c >>> @@ -472,3 +472,23 @@ pte_t *__find_linux_pte(pgd_t *pgdir, unsigned long ea, >>> return ret_pte; >>> } >>> EXPORT_SYMBOL_GPL(__find_linux_pte); >>> + >>> +/* Note due to the way vm flags are laid out, the bits are XWR */ >>> +pgprot_t protection_map[16] = { >> >> Was const previously, now back to non const ? Maybe due to a conflict >> with linux/mm.h ? At least it should be __ro_after_init. >> > > Right, the generic declaration in linux/mm.h prevents different types > for protection_map[] on different platforms. As mentioned before, may > be we should move generic vm_get_page_prot() inside the platforms ? Not sure that's the best way forward. You can probably just drop the generic declaration of protection_map[] in linux/mm.h and have each architecture provides its own declaration of protection_map[], then you can keep a generic vm_get_page_prot() Christophe ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms 2022-06-16 4:09 [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Anshuman Khandual 2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual 2022-06-16 4:09 ` [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array Anshuman Khandual @ 2022-06-16 5:22 ` Christophe Leroy 2022-06-16 6:13 ` hch 2022-06-17 3:07 ` Anshuman Khandual 2 siblings, 2 replies; 28+ messages in thread From: Christophe Leroy @ 2022-06-16 5:22 UTC (permalink / raw) To: Anshuman Khandual, linux-mm; +Cc: hch, Andrew Morton, linux-kernel Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : > __SXXX/__PXXX macros is an unnecessary abstraction layer in creating the > generic protection_map[] array which is used for vm_get_page_prot(). This > abstraction layer can be avoided, if the platforms just define the array > protection_map[] for all possible vm_flags access permission combinations. > > This series drops __SXXX/__PXXX macros from across platforms in the tree. > First it makes protection_map[] array private (static) on platforms which > enable ARCH_HAS_VM_GET_PAGE_PROT, later moves protection_map[] array into > arch for all remaining platforms (!ARCH_HAS_VM_GET_PAGE_PROT), dropping > the generic one. In the process __SXXX/__PXXX macros become redundant and > thus get dropped off completely. I understand that the diff stat is large > here, but please do suggest if there is a better way. This series applies > on v5.19-rc1 and has been build tested for multiple platforms. Maybe this patch could be split with one patch per architecture. All you have to do for that is to guard the generic protection_map declaration with #ifdef __S000 , then the architectures can be migrated one by one. > > The CC list for this series has been reduced to just minimum, until there > is some initial agreement. Agreement with who if people don't know this series exists ? I think you should keep the architecture lists in copy allthough you don't include individual maintainers/reviewers for now. > > - Anshuman > > Changes in V3: > > - Fix build issues on powerpc and riscv > > Changes in V2: I guess V2 was only sent to linux-mm as well ? Too bad. > > https://lore.kernel.org/all/20220613053354.553579-1-anshuman.khandual@arm.com/ > > - Add 'const' identifier to protection_map[] on powerpc > - Dropped #ifndef CONFIG_ARCH_HAS_VM_GET_PAGE_PROT check from sparc 32 > - Dropped protection_map[] init from sparc 64 > - Dropped all new platform changes subscribing ARCH_HAS_VM_GET_PAGE_PROT > - Added a second patch which moves generic protection_map[] array into > all remaining platforms (!ARCH_HAS_VM_GET_PAGE_PROT) > > Changes in V1: > > https://lore.kernel.org/linux-mm/20220603101411.488970-1-anshuman.khandual@arm.com/ > > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: linux-mm@kvack.org > Cc: linux-kernel@vger.kernel.org > > Anshuman Khandual (2): > mm/mmap: Restrict generic protection_map[] array visibility > mm/mmap: Drop generic protection_map[] array > > arch/alpha/include/asm/pgtable.h | 17 ------- > arch/alpha/mm/init.c | 21 +++++++++ > arch/arc/include/asm/pgtable-bits-arcv2.h | 18 -------- > arch/arc/mm/mmap.c | 19 ++++++++ > arch/arm/include/asm/pgtable.h | 17 ------- > arch/arm/lib/uaccess_with_memcpy.c | 2 +- > arch/arm/mm/mmu.c | 19 ++++++++ > arch/arm64/include/asm/pgtable-prot.h | 18 -------- > arch/arm64/mm/mmap.c | 21 +++++++++ > arch/csky/include/asm/pgtable.h | 18 -------- > arch/csky/mm/init.c | 19 ++++++++ > arch/hexagon/include/asm/pgtable.h | 27 ------------ > arch/hexagon/mm/init.c | 41 +++++++++++++++++ > arch/ia64/include/asm/pgtable.h | 18 -------- > arch/ia64/mm/init.c | 27 +++++++++++- > arch/loongarch/include/asm/pgtable-bits.h | 19 -------- > arch/loongarch/mm/cache.c | 45 +++++++++++++++++++ > arch/m68k/include/asm/mcf_pgtable.h | 54 ----------------------- > arch/m68k/include/asm/motorola_pgtable.h | 22 --------- > arch/m68k/include/asm/sun3_pgtable.h | 17 ------- > arch/m68k/mm/mcfmmu.c | 54 +++++++++++++++++++++++ > arch/m68k/mm/motorola.c | 19 ++++++++ > arch/m68k/mm/sun3mmu.c | 19 ++++++++ > arch/microblaze/include/asm/pgtable.h | 17 ------- > arch/microblaze/mm/init.c | 19 ++++++++ > arch/mips/include/asm/pgtable.h | 22 --------- > arch/mips/mm/cache.c | 2 + > arch/nios2/include/asm/pgtable.h | 16 ------- > arch/nios2/mm/init.c | 19 ++++++++ > arch/openrisc/include/asm/pgtable.h | 18 -------- > arch/openrisc/mm/init.c | 19 ++++++++ > arch/parisc/include/asm/pgtable.h | 18 -------- > arch/parisc/mm/init.c | 19 ++++++++ > arch/powerpc/include/asm/pgtable.h | 18 -------- > arch/powerpc/mm/book3s64/pgtable.c | 6 +++ > arch/powerpc/mm/pgtable.c | 20 +++++++++ > arch/riscv/include/asm/pgtable.h | 20 --------- > arch/riscv/mm/init.c | 19 ++++++++ > arch/s390/include/asm/pgtable.h | 17 ------- > arch/s390/mm/mmap.c | 19 ++++++++ > arch/sh/include/asm/pgtable.h | 17 ------- > arch/sh/mm/mmap.c | 19 ++++++++ > arch/sparc/include/asm/pgtable_32.h | 19 -------- > arch/sparc/include/asm/pgtable_64.h | 19 -------- > arch/sparc/mm/init_32.c | 19 ++++++++ > arch/sparc/mm/init_64.c | 3 ++ > arch/um/include/asm/pgtable.h | 17 ------- > arch/um/kernel/mem.c | 19 ++++++++ > arch/x86/include/asm/pgtable_types.h | 19 -------- > arch/x86/mm/pgprot.c | 19 ++++++++ > arch/x86/um/mem_32.c | 2 +- > arch/xtensa/include/asm/pgtable.h | 18 -------- > arch/xtensa/mm/init.c | 19 ++++++++ > include/linux/mm.h | 2 + > mm/mmap.c | 19 -------- > 55 files changed, 547 insertions(+), 522 deletions(-) > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms 2022-06-16 5:22 ` [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Christophe Leroy @ 2022-06-16 6:13 ` hch 2022-06-17 3:07 ` Anshuman Khandual 1 sibling, 0 replies; 28+ messages in thread From: hch @ 2022-06-16 6:13 UTC (permalink / raw) To: Christophe Leroy Cc: Anshuman Khandual, linux-mm, hch, Andrew Morton, linux-kernel On Thu, Jun 16, 2022 at 05:22:23AM +0000, Christophe Leroy wrote: > I think you should keep the architecture lists in copy allthough you > don't include individual maintainers/reviewers for now. That's what I tend to do for big global changes. ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms 2022-06-16 5:22 ` [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Christophe Leroy 2022-06-16 6:13 ` hch @ 2022-06-17 3:07 ` Anshuman Khandual 1 sibling, 0 replies; 28+ messages in thread From: Anshuman Khandual @ 2022-06-17 3:07 UTC (permalink / raw) To: Christophe Leroy, linux-mm; +Cc: hch, Andrew Morton, linux-kernel On 6/16/22 10:52, Christophe Leroy wrote: > > > Le 16/06/2022 à 06:09, Anshuman Khandual a écrit : >> __SXXX/__PXXX macros is an unnecessary abstraction layer in creating the >> generic protection_map[] array which is used for vm_get_page_prot(). This >> abstraction layer can be avoided, if the platforms just define the array >> protection_map[] for all possible vm_flags access permission combinations. >> >> This series drops __SXXX/__PXXX macros from across platforms in the tree. >> First it makes protection_map[] array private (static) on platforms which >> enable ARCH_HAS_VM_GET_PAGE_PROT, later moves protection_map[] array into >> arch for all remaining platforms (!ARCH_HAS_VM_GET_PAGE_PROT), dropping >> the generic one. In the process __SXXX/__PXXX macros become redundant and >> thus get dropped off completely. I understand that the diff stat is large >> here, but please do suggest if there is a better way. This series applies >> on v5.19-rc1 and has been build tested for multiple platforms. > > Maybe this patch could be split with one patch per architecture. All you > have to do for that is to guard the generic protection_map declaration > with #ifdef __S000 , then the architectures can be migrated one by one. > >> >> The CC list for this series has been reduced to just minimum, until there >> is some initial agreement. > > Agreement with who if people don't know this series exists ? > > I think you should keep the architecture lists in copy allthough you > don't include individual maintainers/reviewers for now. Sure, will do. > >> >> - Anshuman >> >> Changes in V3: >> >> - Fix build issues on powerpc and riscv >> >> Changes in V2: > > I guess V2 was only sent to linux-mm as well ? Too bad. I was in a dilemma, whether to first arrive at something more acceptable or just engage all stake holders from the beginning. I understand your concern and hence will copy architecture mailing lists from next time onward. ^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2022-06-21 9:44 UTC | newest] Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-06-16 4:09 [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Anshuman Khandual 2022-06-16 4:09 ` [PATCH V3 1/2] mm/mmap: Restrict generic protection_map[] array visibility Anshuman Khandual 2022-06-16 5:35 ` Christophe Leroy 2022-06-20 5:16 ` Anshuman Khandual 2022-06-20 6:41 ` Christophe Leroy 2022-06-21 9:44 ` Anshuman Khandual 2022-06-16 12:44 ` kernel test robot 2022-06-20 4:45 ` Anshuman Khandual 2022-06-20 4:45 ` Anshuman Khandual 2022-06-20 5:55 ` Christoph Hellwig 2022-06-20 5:55 ` Christoph Hellwig 2022-06-20 6:43 ` Christophe Leroy 2022-06-20 6:43 ` Christophe Leroy 2022-06-16 4:09 ` [PATCH V3 2/2] mm/mmap: Drop generic protection_map[] array Anshuman Khandual 2022-06-16 5:27 ` Christophe Leroy 2022-06-16 6:10 ` hch 2022-06-17 3:46 ` Anshuman Khandual 2022-06-16 5:45 ` Christophe Leroy 2022-06-16 6:12 ` hch 2022-06-17 3:29 ` Anshuman Khandual 2022-06-17 5:48 ` Christophe Leroy 2022-06-17 8:00 ` hch 2022-06-20 4:14 ` Anshuman Khandual 2022-06-17 3:43 ` Anshuman Khandual 2022-06-17 5:40 ` Christophe Leroy 2022-06-16 5:22 ` [PATCH V3 0/2] mm/mmap: Drop __SXXX/__PXXX macros from across platforms Christophe Leroy 2022-06-16 6:13 ` hch 2022-06-17 3:07 ` Anshuman Khandual
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.