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

x86/mm: move protection_map[] inside the platform 

This moves protection_map[] inside the platform and makes it a static. 
This also defines a helper function add_encrypt_protection_map() that can
update the protection_map[] array with pgprot_encrypted().

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


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
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: 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: "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: 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 42251045

arch/x86/include/asm/mem_encrypt.h

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ static inline void mem_encrypt_free_decrypted_mem(void) { } 
/* Architecture __weak replacement functions */

void __init mem_encrypt_init(void);



void add_encrypt_protection_map(void);



/*

 * The __sme_pa() and __sme_pa_nodebug() macros are meant for use when

 * writing to or comparing values from the cr3 register.  Having the

arch/x86/include/asm/pgtable_types.h

+0 −19
Original line number Diff line number Diff line
@@ -230,25 +230,6 @@ enum page_cache_mode { 


#endif	/* __ASSEMBLY__ */



/*         xwr */

#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



/*

 * early identity mapping  pte attrib macros.

 */

arch/x86/mm/mem_encrypt_amd.c

+2 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/tlbflush.h>

#include <asm/fixmap.h>

#include <asm/setup.h>

#include <asm/mem_encrypt.h>

#include <asm/bootparam.h>

#include <asm/set_memory.h>

#include <asm/cacheflush.h>
@@ -486,8 +487,6 @@ void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, boo 


void __init sme_early_init(void)

{

	unsigned int i;



	if (!sme_me_mask)

		return;
@@ -496,8 +495,7 @@ void __init sme_early_init(void) 
	__supported_pte_mask = __sme_set(__supported_pte_mask);



	/* Update the protection map with memory encryption mask */

	for (i = 0; i < ARRAY_SIZE(protection_map); i++)

		protection_map[i] = pgprot_encrypted(protection_map[i]);

	add_encrypt_protection_map();



	x86_platform.guest.enc_status_change_prepare = amd_enc_status_change_prepare;

	x86_platform.guest.enc_status_change_finish  = amd_enc_status_change_finish;

arch/x86/mm/pgprot.c

+28 −0
Original line number Diff line number Diff line
@@ -3,6 +3,34 @@ 
#include <linux/export.h>

#include <linux/mm.h>

#include <asm/pgtable.h>

#include <asm/mem_encrypt.h>



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

};



void add_encrypt_protection_map(void)

{

	unsigned int i;



	for (i = 0; i < ARRAY_SIZE(protection_map); i++)

		protection_map[i] = pgprot_encrypted(protection_map[i]);

}



pgprot_t vm_get_page_prot(unsigned long vm_flags)

{