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

xtensa/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-12-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Guo Ren <guoren@kernel.org>
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: "David S. Miller" <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.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: Russell King <linux@armlinux.org.uk>
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 e4e4b99b

arch/xtensa/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config XTENSA 
	select ARCH_HAS_DMA_SET_UNCACHED if MMU

	select ARCH_HAS_STRNCPY_FROM_USER if !KASAN

	select ARCH_HAS_STRNLEN_USER

	select ARCH_HAS_VM_GET_PAGE_PROT

	select ARCH_USE_MEMTEST

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_USE_QUEUED_SPINLOCKS

arch/xtensa/include/asm/pgtable.h

+0 −18
Original line number Diff line number Diff line
@@ -200,24 +200,6 @@ 
 * What follows is the closest we can get by reasonable means..

 * See linux/mm/mmap.c for protection_map[] array that uses these definitions.

 */

#define __P000	PAGE_NONE		/* private --- */

#define __P001	PAGE_READONLY		/* private --r */

#define __P010	PAGE_COPY		/* private -w- */

#define __P011	PAGE_COPY		/* private -wr */

#define __P100	PAGE_READONLY_EXEC	/* private x-- */

#define __P101	PAGE_READONLY_EXEC	/* private x-r */

#define __P110	PAGE_COPY_EXEC		/* private xw- */

#define __P111	PAGE_COPY_EXEC		/* private xwr */



#define __S000	PAGE_NONE		/* shared  --- */

#define __S001	PAGE_READONLY		/* shared  --r */

#define __S010	PAGE_SHARED		/* shared  -w- */

#define __S011	PAGE_SHARED		/* shared  -wr */

#define __S100	PAGE_READONLY_EXEC	/* shared  x-- */

#define __S101	PAGE_READONLY_EXEC	/* shared  x-r */

#define __S110	PAGE_SHARED_EXEC	/* shared  xw- */

#define __S111	PAGE_SHARED_EXEC	/* shared  xwr */



#ifndef __ASSEMBLY__



#define pte_ERROR(e) \

arch/xtensa/mm/init.c

+22 −0
Original line number Diff line number Diff line
@@ -216,3 +216,25 @@ static int __init parse_memmap_opt(char *str) 
	return 0;

}

early_param("memmap", parse_memmap_opt);



#ifdef CONFIG_MMU

static const pgprot_t protection_map[16] = {

	[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

#endif