Commit 634093c5 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Andrew Morton
Browse files

powerpc/mm: enable ARCH_HAS_VM_GET_PAGE_PROT 

This defines and exports a platform specific custom vm_get_page_prot() via
subscribing ARCH_HAS_VM_GET_PAGE_PROT.  While here, this also localizes
arch_vm_get_page_prot() as __vm_get_page_prot() and moves it near
vm_get_page_prot().

Link: https://lkml.kernel.org/r/20220414062125.609297-3-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Khalid Aziz <khalid.aziz@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 67436193

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ config PPC 
	select ARCH_HAS_TICK_BROADCAST		if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UACCESS_FLUSHCACHE

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_HAS_VM_GET_PAGE_PROT	if PPC_BOOK3S_64

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select ARCH_KEEP_MEMBLOCK

	select ARCH_MIGHT_HAVE_PC_PARPORT

arch/powerpc/include/asm/mman.h

+0 −12
Original line number Diff line number Diff line
@@ -24,18 +24,6 @@ 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 pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)

{

#ifdef CONFIG_PPC_MEM_KEYS

	return (vm_flags & VM_SAO) ?

		__pgprot(_PAGE_SAO | vmflag_to_pte_pkey_bits(vm_flags)) :

		__pgprot(0 | vmflag_to_pte_pkey_bits(vm_flags));

#else

	return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);

#endif

}

#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)



static inline bool arch_validate_prot(unsigned long prot, unsigned long addr)

{

	if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_SAO))

arch/powerpc/mm/book3s64/pgtable.c

+17 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/mm_types.h>

#include <linux/memblock.h>

#include <linux/memremap.h>

#include <linux/pkeys.h>

#include <linux/debugfs.h>

#include <misc/cxl-base.h>
@@ -549,3 +550,19 @@ unsigned long memremap_compat_align(void) 
}

EXPORT_SYMBOL_GPL(memremap_compat_align);

#endif



pgprot_t vm_get_page_prot(unsigned long vm_flags)

{

	unsigned long prot = pgprot_val(protection_map[vm_flags &

					(VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]);



	if (vm_flags & VM_SAO)

		prot |= _PAGE_SAO;



#ifdef CONFIG_PPC_MEM_KEYS

	prot |= vmflag_to_pte_pkey_bits(vm_flags);

#endif



	return __pgprot(prot);

}

EXPORT_SYMBOL(vm_get_page_prot);