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

arm/mm: enable ARCH_HAS_VM_GET_PAGE_PROT 

This enables ARCH_HAS_VM_GET_PAGE_PROT on the platform and exports
standard vm_get_page_prot() implementation via DECLARE_VM_GET_PAGE_PROT,
which looks up a private and static protection_map[] array.  Subsequently
all __SXXX and __PXXX macros can be dropped which are no longer needed.

Link: https://lkml.kernel.org/r/20220711070600.2378316-24-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brian Cain <bcain@quicinc.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Rich Felker <dalias@libc.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: WANG Xuerui <kernel@xen0n.name>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5d260625

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ config ARM 
	select ARCH_HAS_SYNC_DMA_FOR_CPU if SWIOTLB || !MMU

	select ARCH_HAS_TEARDOWN_DMA_OPS if MMU

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_VM_GET_PAGE_PROT

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if CPU_V7 || CPU_V7M || CPU_V6K

	select ARCH_HAS_GCOV_PROFILE_ALL

arch/arm/include/asm/pgtable.h

+0 −17
Original line number Diff line number Diff line
@@ -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__

/*

arch/arm/lib/uaccess_with_memcpy.c

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

arch/arm/mm/mmu.c

+20 −0
Original line number Diff line number Diff line
@@ -405,6 +405,26 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot) 
	local_flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);

}



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

};

DECLARE_VM_GET_PAGE_PROT



/*

 * Adjust the PMD section entries according to the CPU in use.

 */