Commit d75fa3c9 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Andrew Morton
Browse files

mm: update architecture and driver code to use vm_flags_t 

In future we intend to change the vm_flags_t type, so it isn't correct for
architecture and driver code to assume it is unsigned long.  Correct this
assumption across the board.

Overall, this patch does not introduce any functional change.

Link: https://lkml.kernel.org/r/b6eb1894abc5555ece80bb08af5c022ef780c8bc.1750274467.git.lorenzo.stoakes@oracle.com


Signed-off-by: default avatarLorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarOscar Salvador <osalvador@suse.de>
Reviewed-by: default avatarPedro Falcato <pfalcato@suse.de>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>	[arm64]
Acked-by: default avatarZi Yan <ziy@nvidia.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Reviewed-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Jann Horn <jannh@google.com>
Cc: Kees Cook <kees@kernel.org>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bfbe7110

arch/arm/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	int sig, code;

	vm_fault_t fault;

	unsigned int flags = FAULT_FLAG_DEFAULT;

	unsigned long vm_flags = VM_ACCESS_FLAGS;

	vm_flags_t vm_flags = VM_ACCESS_FLAGS;



	if (kprobe_page_fault(regs, fsr))

		return 0;

arch/arm64/include/asm/mman.h

+5 −5
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#include <linux/shmem_fs.h>

#include <linux/types.h>



static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot,

static inline vm_flags_t arch_calc_vm_prot_bits(unsigned long prot,

	unsigned long pkey)

{

	unsigned long ret = 0;

	vm_flags_t ret = 0;



	if (system_supports_bti() && (prot & PROT_BTI))

		ret |= VM_ARM64_BTI;
@@ -34,7 +34,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, 
}

#define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey)



static inline unsigned long arch_calc_vm_flag_bits(struct file *file,

static inline vm_flags_t arch_calc_vm_flag_bits(struct file *file,

						unsigned long flags)

{

	/*
@@ -68,7 +68,7 @@ static inline bool arch_validate_prot(unsigned long prot, 
}

#define arch_validate_prot(prot, addr) arch_validate_prot(prot, addr)



static inline bool arch_validate_flags(unsigned long vm_flags)

static inline bool arch_validate_flags(vm_flags_t vm_flags)

{

	if (system_supports_mte()) {

		/*

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static int __kprobes do_page_fault(unsigned long far, unsigned long esr, 
	const struct fault_info *inf;

	struct mm_struct *mm = current->mm;

	vm_fault_t fault;

	unsigned long vm_flags;

	vm_flags_t vm_flags;

	unsigned int mm_flags = FAULT_FLAG_DEFAULT;

	unsigned long addr = untagged_addr(far);

	struct vm_area_struct *vma;

arch/arm64/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ void mark_rodata_ro(void) 


static void __init declare_vma(struct vm_struct *vma,

			       void *va_start, void *va_end,

			       unsigned long vm_flags)

			       vm_flags_t vm_flags)

{

	phys_addr_t pa_start = __pa_symbol(va_start);

	unsigned long size = va_end - va_start;

arch/powerpc/include/asm/mman.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm/cpu_has_feature.h>

#include <asm/firmware.h>



static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot,

static inline vm_flags_t arch_calc_vm_prot_bits(unsigned long prot,

		unsigned long pkey)

{

#ifdef CONFIG_PPC_MEM_KEYS