mm/vma: some new flags
Subsystems (26)
cover mm/vma: some new flags
The motivation here is to consolidate VMA flag combinations commonly used across platforms and reduce code duplication while making it uncluttered in general.
This first introduces a default VM_DATA_DEFAULT_FLAGS which platforms can easily fall back on without requiring to define any similar data flag combinations as they currently do. This also adds some more common data flag combinations which are generally used when the platforms decide to override the default.
The second patch consolidates VM_READ, VM_WRITE, VM_EXEC as VM_ACCESS_FLAGS extending the existing VMA accessibility concept via vma_is_accessibility(). VM_ACCESS_FLAGS replaces many other instances which used check all three VMA access flags simultaneously.
This series is based on v5.6-rc4 after applying these.
1. https://patchwork.kernel.org/cover/11399319/
2. https://patchwork.kernel.org/patch/11399379/
Changes in V1:
- Dropped the [PATCH 3/3] which was adding more vma_is_* wrappers
- Used VM_DATA_FLAGS_EXEC for VM_DATA_DEFAULT_FLAGS instead per Vlastimil
- Dropped init use cases for VM_ACCESS_FLAGS as suggested by Vlastimil
Changes in RFC: (https://patchwork.kernel.org/project/linux-mm/list/?series=249733)
Anshuman Khandual (2):
mm/vma: Define a default value for VM_DATA_DEFAULT_FLAGS mm/vma: Introduce VM_ACCESS_FLAGS
arch/alpha/include/asm/page.h | 3 --- arch/arc/include/asm/page.h | 2 +- arch/arm/include/asm/page.h | 4 +--- arch/arm/mm/fault.c | 2 +- arch/arm64/include/asm/page.h | 4 +--- arch/arm64/mm/fault.c | 2 +- arch/c6x/include/asm/page.h | 5 +---- arch/csky/include/asm/page.h | 3 --- arch/h8300/include/asm/page.h | 2 -- arch/hexagon/include/asm/page.h | 3 +-- arch/ia64/include/asm/page.h | 5 +---- arch/m68k/include/asm/page.h | 3 --- arch/microblaze/include/asm/page.h | 2 -- arch/mips/include/asm/page.h | 5 +---- arch/nds32/include/asm/page.h | 3 --- arch/nds32/mm/fault.c | 2 +- arch/nios2/include/asm/page.h | 3 +-- arch/openrisc/include/asm/page.h | 5 ----- arch/parisc/include/asm/page.h | 3 --- arch/powerpc/include/asm/page.h | 9 ++------- arch/powerpc/include/asm/page_64.h | 7 ++----- arch/powerpc/mm/book3s64/pkeys.c | 2 +- arch/riscv/include/asm/page.h | 3 +-- arch/s390/include/asm/page.h | 3 +-- arch/s390/mm/fault.c | 2 +- arch/sh/include/asm/page.h | 3 --- arch/sparc/include/asm/page_32.h | 3 --- arch/sparc/include/asm/page_64.h | 3 --- arch/unicore32/include/asm/page.h | 3 --- arch/unicore32/mm/fault.c | 2 +- arch/x86/include/asm/page_types.h | 4 +--- arch/x86/mm/pkeys.c | 2 +- arch/x86/um/asm/vm-flags.h | 10 ++-------- arch/xtensa/include/asm/page.h | 3 --- drivers/staging/gasket/gasket_core.c | 2 +- include/linux/mm.h | 20 +++++++++++++++++++- mm/mmap.c | 2 +- mm/mprotect.c | 4 ++-- 38 files changed, 47 insertions(+), 101 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 mm/vma: Define a default value for VM_DATA_DEFAULT_FLAGS
There are many platforms with exact same value for VM_DATA_DEFAULT_FLAGS This creates a default value for VM_DATA_DEFAULT_FLAGS in line with the existing VM_STACK_DEFAULT_FLAGS. While here, also define some more macros with standard VMA access flag combinations that are used frequently across many platforms. Apart from simplification, this reduces code duplication as well.
--- arch/alpha/include/asm/page.h | 3 --- arch/arc/include/asm/page.h | 2 +- arch/arm/include/asm/page.h | 4 +--- arch/arm64/include/asm/page.h | 4 +--- arch/c6x/include/asm/page.h | 5 +---- arch/csky/include/asm/page.h | 3 --- arch/h8300/include/asm/page.h | 2 -- arch/hexagon/include/asm/page.h | 3 +-- arch/ia64/include/asm/page.h | 5 +---- arch/m68k/include/asm/page.h | 3 --- arch/microblaze/include/asm/page.h | 2 -- arch/mips/include/asm/page.h | 5 +---- arch/nds32/include/asm/page.h | 3 --- arch/nios2/include/asm/page.h | 3 +-- arch/openrisc/include/asm/page.h | 5 ----- arch/parisc/include/asm/page.h | 3 --- arch/powerpc/include/asm/page.h | 9 ++------- arch/powerpc/include/asm/page_64.h | 7 ++----- arch/riscv/include/asm/page.h | 3 +-- arch/s390/include/asm/page.h | 3 +-- arch/sh/include/asm/page.h | 3 --- arch/sparc/include/asm/page_32.h | 3 --- arch/sparc/include/asm/page_64.h | 3 --- arch/unicore32/include/asm/page.h | 3 --- arch/x86/include/asm/page_types.h | 4 +--- arch/x86/um/asm/vm-flags.h | 10 ++-------- arch/xtensa/include/asm/page.h | 3 --- include/linux/mm.h | 14 ++++++++++++++ 28 files changed, 31 insertions(+), 89 deletions(-)
arch/alpha/include/asm/page.h +0 -3
@@ -90,9 +90,6 @@ typedef struct page *pgtable_t;#define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)#endif /* CONFIG_DISCONTIGMEM */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/arc/include/asm/page.h +1 -1
@@ -102,7 +102,7 @@ typedef pte_t * pgtable_t;#define virt_addr_valid (kaddr) pfn_valid(virt_to_pfn(kaddr))/* Default Permissions for stack/heaps pages (Non Executable) */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC#define WANT_PAGE_VIRTUAL 1
arch/arm/include/asm/page.h +1 -3
@@ -161,9 +161,7 @@ extern int pfn_valid(unsigned long);#endif /* !__ASSEMBLY__ */ -#define VM_DATA_DEFAULT_FLAGS \ - (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#include <asm-generic/getorder.h>
arch/arm64/include/asm/page.h +1 -3
@@ -32,9 +32,7 @@ extern int pfn_valid(unsigned long);#endif /* !__ASSEMBLY__ */ -#define VM_DATA_DEFAULT_FLAGS \ - (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#include <asm-generic/getorder.h>
arch/c6x/include/asm/page.h +1 -4
@@ -2,10 +2,7 @@#ifndef _ASM_C6X_PAGE_H#define _ASM_C6X_PAGE_H -#define VM_DATA_DEFAULT_FLAGS \ - (VM_READ | VM_WRITE | \ - ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#include <asm-generic/page.h>
arch/csky/include/asm/page.h +0 -3
@@ -85,9 +85,6 @@ extern unsigned long va_pa_offset; PHYS_OFFSET_OFFSET)#define virt_to_page (x) (mem_map + MAP_NR(x)) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#define pfn_to_kaddr (x) __va(PFN_PHYS(x))#include <asm-generic/memory_model.h>
arch/h8300/include/asm/page.h +0 -2
@@ -6,8 +6,6 @@#include <linux/types.h> #define MAP_NR (addr) (((uintptr_t)(addr)-PAGE_OFFSET) >> PAGE_SHIFT) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#ifndef __ASSEMBLY__extern unsigned long rom_length;
arch/hexagon/include/asm/page.h +1 -2
@@ -93,8 +93,7 @@ struct page;#define virt_to_page (kaddr) pfn_to_page(PFN_DOWN(__pa(kaddr)))/* Default vm area behavior is non-executable. */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC#define pfn_valid (pfn) ((pfn) < max_mapnr)#define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
arch/ia64/include/asm/page.h +1 -4
@@ -218,10 +218,7 @@ get_order (unsigned long size)#define PAGE_OFFSET RGN_BASE(RGN_KERNEL) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC | \ - (((current->personality & READ_IMPLIES_EXEC) != 0) \ - ? VM_EXEC : 0)) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#define GATE_ADDR RGN_BASE(RGN_GATE)
arch/m68k/include/asm/page.h +0 -3
@@ -55,9 +55,6 @@ extern unsigned long _ramend;#define __phys_to_pfn (paddr) ((unsigned long)((paddr) >> PAGE_SHIFT))#define __pfn_to_phys (pfn) PFN_PHYS(pfn) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/getorder.h> #endif /* _M68K_PAGE_H */
arch/microblaze/include/asm/page.h +0 -2
@@ -197,8 +197,6 @@ extern int page_is_ram(unsigned long pfn);#ifdef CONFIG_MMU -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)#endif /* CONFIG_MMU */ #endif /* __KERNEL__ */
arch/mips/include/asm/page.h +1 -4
@@ -253,10 +253,7 @@ extern bool __virt_addr_valid(const volatile void *kaddr);#define virt_addr_valid (kaddr) \ __virt_addr_valid((const volatile void *) (kaddr)) -#define VM_DATA_DEFAULT_FLAGS \ - (VM_READ | VM_WRITE | \ - ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/nds32/include/asm/page.h +0 -3
@@ -59,9 +59,6 @@ typedef struct page *pgtable_t;#endif /* !__ASSEMBLY__ */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ #endif
arch/nios2/include/asm/page.h +1 -2
@@ -98,8 +98,7 @@ static inline bool pfn_valid(unsigned long pfn)# define virt_to_page (vaddr) pfn_to_page(PFN_DOWN(virt_to_phys(vaddr)))# define virt_addr_valid (vaddr) pfn_valid(PFN_DOWN(virt_to_phys(vaddr))) -# define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +# define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC#include <asm-generic/memory_model.h>
arch/openrisc/include/asm/page.h +0 -5
@@ -86,11 +86,6 @@ typedef struct page *pgtable_t;#endif /* __ASSEMBLY__ */ - -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/parisc/include/asm/page.h +0 -3
@@ -180,9 +180,6 @@ extern int npmem_ranges;#define page_to_phys (page) (page_to_pfn(page) << PAGE_SHIFT)#define virt_to_page (kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h> #include <asm/pdc.h>
arch/powerpc/include/asm/page.h +2 -7
@@ -240,13 +240,8 @@ static inline bool pfn_valid(unsigned long pfn)* and needs to be executable. This means the whole heap ends * up being executable. */ -#define VM_DATA_DEFAULT_FLAGS32 \ - (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ - VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -#define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS32 VM_DATA_FLAGS_TSK_EXEC +#define VM_DATA_DEFAULT_FLAGS64 VM_DATA_FLAGS_NON_EXEC#ifdef __powerpc64__#include <asm/page_64.h>
arch/powerpc/include/asm/page_64.h +2 -5
@@ -94,11 +94,8 @@ extern u64 ppc64_pft_size;* stack by default, so in the absence of a PT_GNU_STACK program header * we turn execute permission off. */ -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - -#define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_STACK_DEFAULT_FLAGS32 VM_DATA_FLAGS_EXEC +#define VM_STACK_DEFAULT_FLAGS64 VM_DATA_FLAGS_NON_EXEC#define VM_STACK_DEFAULT_FLAGS \ (is_32bit_task() ? \
arch/riscv/include/asm/page.h +1 -2
@@ -137,8 +137,7 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x);#define virt_addr_valid (vaddr) (pfn_valid(virt_to_pfn(vaddr))) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/s390/include/asm/page.h +1 -2
@@ -176,8 +176,7 @@ static inline int devmem_is_allowed(unsigned long pfn)#define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_NON_EXEC#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/sh/include/asm/page.h +0 -3
@@ -182,9 +182,6 @@ typedef struct page *pgtable_t;#endif #define virt_addr_valid (kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/sparc/include/asm/page_32.h +0 -3
@@ -133,9 +133,6 @@ extern unsigned long pfn_base;#define pfn_valid (pfn) (((pfn) >= (pfn_base)) && (((pfn)-(pfn_base)) < max_mapnr))#define virt_addr_valid (kaddr) ((((unsigned long)(kaddr)-PAGE_OFFSET)>>PAGE_SHIFT) < max_mapnr) -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/memory_model.h> #include <asm-generic/getorder.h>
arch/sparc/include/asm/page_64.h +0 -3
@@ -158,9 +158,6 @@ extern unsigned long PAGE_OFFSET;#endif /* !(__ASSEMBLY__) */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/getorder.h> #endif /* _SPARC64_PAGE_H */
arch/unicore32/include/asm/page.h +0 -3
@@ -69,9 +69,6 @@ extern int pfn_valid(unsigned long);#endif /* !__ASSEMBLY__ */ -#define VM_DATA_DEFAULT_FLAGS \ - (VM_READ | VM_WRITE | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/getorder.h> #endif
arch/x86/include/asm/page_types.h +1 -3
@@ -35,9 +35,7 @@#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) -#define VM_DATA_DEFAULT_FLAGS \ - (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ - VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#define __PHYSICAL_START ALIGN(CONFIG_PHYSICAL_START, \ CONFIG_PHYSICAL_ALIGN)
arch/x86/um/asm/vm-flags.h +2 -8
@@ -9,17 +9,11 @@#ifdef CONFIG_X86_32 -#define VM_DATA_DEFAULT_FLAGS \ - (VM_READ | VM_WRITE | \ - ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_TSK_EXEC#else -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#define VM_STACK_DEFAULT_FLAGS (VM_GROWSDOWN | VM_READ | VM_WRITE | \ - VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_STACK_DEFAULT_FLAGS (VM_GROWSDOWN | VM_DATA_FLAGS_EXEC)#endif #endif
arch/xtensa/include/asm/page.h +0 -3
@@ -203,8 +203,5 @@ static inline unsigned long ___pa(unsigned long va)#endif /* __ASSEMBLY__ */ -#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#include <asm-generic/memory_model.h> #endif /* _XTENSA_PAGE_H */
include/linux/mm.h +14 -0
@@ -342,6 +342,20 @@ extern unsigned int kobjsize(const void *objp);/* Bits set in the VMA until the stack is in its final location */ #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ) +#define TASK_EXEC ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) + +/* Common data flag combinations */ +#define VM_DATA_FLAGS_TSK_EXEC (VM_READ | VM_WRITE | TASK_EXEC | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_FLAGS_NON_EXEC (VM_READ | VM_WRITE | VM_MAYREAD | \ + VM_MAYWRITE | VM_MAYEXEC) +#define VM_DATA_FLAGS_EXEC (VM_READ | VM_WRITE | VM_EXEC | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + +#ifndef VM_DATA_DEFAULT_FLAGS /* arch can override this */ +#define VM_DATA_DEFAULT_FLAGS VM_DATA_FLAGS_EXEC +#endif +#ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS#endif
Signature · 1 line
2.20.1
PATCH 2/2 mm/vma: Introduce VM_ACCESS_FLAGS
In reply to Anshuman KhandualThere are many places where all basic VMA access flags (read, write, exec) are initialized or checked against as a group. One such example is during page fault. Existing vma_is_accessible() wrapper already creates the notion of VMA accessibility as a group access permissions. Hence lets just create VM_ACCESS_FLAGS (VM_READ|VM_WRITE|VM_EXEC) which will not only reduce code duplication but also extend the VMA accessibility concept in general.
--- arch/arm/mm/fault.c | 2 +- arch/arm64/mm/fault.c | 2 +- arch/nds32/mm/fault.c | 2 +- arch/powerpc/mm/book3s64/pkeys.c | 2 +- arch/s390/mm/fault.c | 2 +- arch/unicore32/mm/fault.c | 2 +- arch/x86/mm/pkeys.c | 2 +- drivers/staging/gasket/gasket_core.c | 2 +- include/linux/mm.h | 6 +++++- mm/mmap.c | 2 +- mm/mprotect.c | 4 ++-- 11 files changed, 16 insertions(+), 12 deletions(-)
arch/arm/mm/fault.c +1 -1
@@ -189,7 +189,7 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)*/ static inline bool access_error (unsigned int fsr,struct vm_area_struct *vma) { -unsigned int mask =VM_READ |VM_WRITE |VM_EXEC ; +unsigned int mask =VM_ACCESS_FLAGS ;if ((fsr &FSR_WRITE ) && !(fsr &FSR_CM )) mask =VM_WRITE ;
arch/arm64/mm/fault.c +1 -1
@@ -445,7 +445,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,const struct fault_info *inf;struct mm_struct *mm = current->mm;vm_fault_t fault, major =0 ; -unsigned long vm_flags =VM_READ |VM_WRITE |VM_EXEC ; +unsigned long vm_flags =VM_ACCESS_FLAGS ;unsigned int mm_flags =FAULT_FLAG_ALLOW_RETRY |FAULT_FLAG_KILLABLE ;if (kprobe_page_fault (regs, esr))
arch/nds32/mm/fault.c +1 -1
@@ -79,7 +79,7 @@ void do_page_fault(unsigned long entry, unsigned long addr,struct vm_area_struct *vma;int si_code;vm_fault_t fault; -unsigned int mask =VM_READ |VM_WRITE |VM_EXEC ; +unsigned int mask =VM_ACCESS_FLAGS ;unsigned int flags =FAULT_FLAG_ALLOW_RETRY |FAULT_FLAG_KILLABLE ; error_code = error_code & (ITYPE_mskINST | ITYPE_mskETYPE);
arch/powerpc/mm/book3s64/pkeys.c +1 -1
@@ -315,7 +315,7 @@ int __execute_only_pkey(struct mm_struct *mm)static inline bool vma_is_pkey_exec_only (struct vm_area_struct *vma) {/* Do this check first since the vm_flags should be hot */ -if ((vma->vm_flags & (VM_READ |VM_WRITE |VM_EXEC )) !=VM_EXEC ) +if ((vma->vm_flags &VM_ACCESS_FLAGS ) !=VM_EXEC )return false;return (vma_pkey (vma) == vma->vm_mm->context.execute_only_pkey);
arch/s390/mm/fault.c +1 -1
@@ -584,7 +584,7 @@ void do_dat_exception(struct pt_regs *regs)int access;vm_fault_t fault; - access =VM_READ |VM_EXEC |VM_WRITE ; + access =VM_ACCESS_FLAGS ; fault =do_exception (regs, access);if (unlikely (fault))do_fault_error (regs, access, fault);
arch/unicore32/mm/fault.c +1 -1
@@ -149,7 +149,7 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs)*/ static inline bool access_error (unsigned int fsr,struct vm_area_struct *vma) { -unsigned int mask =VM_READ |VM_WRITE |VM_EXEC ; +unsigned int mask =VM_ACCESS_FLAGS ;if (!(fsr ^0x12 ))/* write? */ mask =VM_WRITE ;
arch/x86/mm/pkeys.c +1 -1
@@ -63,7 +63,7 @@ int __execute_only_pkey(struct mm_struct *mm)static inline bool vma_is_pkey_exec_only (struct vm_area_struct *vma) {/* Do this check first since the vm_flags should be hot */ -if ((vma->vm_flags & (VM_READ |VM_WRITE |VM_EXEC )) !=VM_EXEC ) +if ((vma->vm_flags &VM_ACCESS_FLAGS ) !=VM_EXEC )return false;if (vma_pkey (vma) != vma->vm_mm->context.execute_only_pkey)return false;
drivers/staging/gasket/gasket_core.c +1 -1
@@ -689,7 +689,7 @@ static bool gasket_mmap_has_permissions(struct gasket_dev *gasket_dev,/* Make sure that no wrong flags are set. */ requested_permissions = - (vma->vm_flags & (VM_WRITE |VM_READ |VM_EXEC )); + (vma->vm_flags &VM_ACCESS_FLAGS );if (requested_permissions & ~(bar_permissions)) {dev_dbg (gasket_dev->dev, "Attempting to map a region with requested permissions "
include/linux/mm.h +5 -1
@@ -368,6 +368,10 @@ extern unsigned int kobjsize(const void *objp);#define VM_STACK_FLAGS (VM_STACK | VM_STACK_DEFAULT_FLAGS | VM_ACCOUNT) +/* VMA basic access permission flags */ +#define VM_ACCESS_FLAGS (VM_READ | VM_WRITE | VM_EXEC) + +/* * Special vmas that are non-mergable, non-mlock()able. * Note: mm/huge_memory.c VM_NO_THP depends on this definition.
@@ -557,7 +561,7 @@ static inline bool vma_is_anonymous(struct vm_area_struct *vma)static inline bool vma_is_accessible (struct vm_area_struct *vma) { -return vma->vm_flags & (VM_READ |VM_WRITE |VM_EXEC ); +return vma->vm_flags &VM_ACCESS_FLAGS ; }#ifdef CONFIG_SHMEM
mm/mmap.c +1 -1
@@ -1221,7 +1221,7 @@ static int anon_vma_compatible(struct vm_area_struct *a, struct vm_area_struct *return a->vm_end == b->vm_start &&mpol_equal (vma_policy (a),vma_policy (b)) && a->vm_file == b->vm_file && - !((a->vm_flags ^ b->vm_flags) & ~(VM_READ |VM_WRITE |VM_EXEC |VM_SOFTDIRTY )) && + !((a->vm_flags ^ b->vm_flags) & ~(VM_ACCESS_FLAGS |VM_SOFTDIRTY )) && b->vm_pgoff == a->vm_pgoff + ((b->vm_start - a->vm_start) >>PAGE_SHIFT ); }
mm/mprotect.c +2 -2
@@ -359,7 +359,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,*/ if (arch_has_pfn_modify_check () && (vma->vm_flags & (VM_PFNMAP |VM_MIXEDMAP )) && - (newflags & (VM_READ |VM_WRITE |VM_EXEC )) ==0 ) { + (newflags &VM_ACCESS_FLAGS ) ==0 ) {pgprot_t new_pgprot =vm_get_page_prot (newflags); error = walk_page_range(current->mm, start, end,
@@ -538,7 +538,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len, newflags |= (vma->vm_flags & ~mask_off_old_flags);/* newflags >> 4 shift VM_MAY% in place of VM_% */ -if ((newflags & ~(newflags >>4 )) & (VM_READ |VM_WRITE |VM_EXEC )) { +if ((newflags & ~(newflags >>4 )) &VM_ACCESS_FLAGS ) { error = -EACCES ; goto out; }
Signature · 1 line
2.20.1
Re: [PATCH 2/2] mm/vma: Introduce VM_ACCESS_FLAGS
Quoted 20 lines · Anshuman Khandual
There are many places where all basic VMA access flags (read, write, exec) are initialized or checked against as a group. One such example is during page fault. Existing
vma_is_accessible()wrapper already creates the notion of VMA accessibility as a group access permissions. Hence lets just createVM_ACCESS_FLAGS(VM_READ|VM_WRITE|VM_EXEC) which will not only reduce code duplication but also extend the VMA accessibility concept in general.Cc Russell King <[email protected]>CC Catalin Marinas <[email protected]>CC Mark Salter <[email protected]>Cc Nick Hu <[email protected]>CC Ley Foon Tan <[email protected]>Cc Michael Ellerman <[email protected]>Cc Heiko Carstens <[email protected]>Cc Yoshinori Sato <[email protected]>Cc Guan Xuetao <[email protected]>Cc Dave Hansen <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Rob Springer <[email protected]>Cc Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
Cc Andrew Morton <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>
Thanks.