Commit 6cb4d9a2 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm/vma: introduce VM_ACCESS_FLAGS 



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 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.

Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rob Springer <rspringer@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/1583391014-8170-3-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c62da0c3

arch/arm/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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_DEFAULT;



	if (kprobe_page_fault(regs, esr))

arch/nds32/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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_DEFAULT;



	error_code = error_code & (ITYPE_mskINST | ITYPE_mskETYPE);

arch/powerpc/mm/book3s64/pkeys.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -580,7 +580,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE