Commit cf43d3b2 authored by Ram Pai's avatar Ram Pai Committed by Michael Ellerman
Browse files

powerpc: Enable pkey subsystem 



PAPR defines 'ibm,processor-storage-keys' property. It exports two
values. The first value holds the number of data-access keys and the
second holds the number of instruction-access keys. Due to a bug in
the firmware, instruction-access keys is always reported as zero.
However any key can be configured to disable data-access and/or
disable execution-access. The inavailablity of the second value is not
a big handicap, though it could have been used to determine if the
platform supported disable-execution-access.

Non-PAPR platforms do not define this property in the device tree yet.
Fortunately power8 is the only released Non-PAPR platform that is
supported. Here, we hardcode the number of supported pkey to 32, by
consulting the PowerISA3.0

This patch calculates the number of keys supported by the platform.
Also it determines the platform support for read/write/execution
access support for pkeys.

Signed-off-by: default avatarRam Pai <linuxram@us.ibm.com>
[mpe: Use a PVR check instead of CPU_FTR for execute. Restrict to
 Power7/8/9 for now until older CPUs are tested.]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c5cc1f4d

arch/powerpc/include/asm/cputable.h

+5 −4
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static inline void cpu_feature_keys_init(void) { } 
#define CPU_FTR_STCX_CHECKS_ADDRESS	LONG_ASM_CONST(0x0004000000000000)

#define CPU_FTR_POPCNTB			LONG_ASM_CONST(0x0008000000000000)

#define CPU_FTR_POPCNTD			LONG_ASM_CONST(0x0010000000000000)

/* Free					LONG_ASM_CONST(0x0020000000000000) */

#define CPU_FTR_PKEY			LONG_ASM_CONST(0x0020000000000000)

#define CPU_FTR_VMX_COPY		LONG_ASM_CONST(0x0040000000000000)

#define CPU_FTR_TM			LONG_ASM_CONST(0x0080000000000000)

#define CPU_FTR_CFAR			LONG_ASM_CONST(0x0100000000000000)
@@ -442,7 +442,7 @@ static inline void cpu_feature_keys_init(void) { } 
	    CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT | \

	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_CFAR | CPU_FTR_HVMODE | \

	    CPU_FTR_VMX_COPY | CPU_FTR_HAS_PPR | CPU_FTR_DABRX)

	    CPU_FTR_VMX_COPY | CPU_FTR_HAS_PPR | CPU_FTR_DABRX | CPU_FTR_PKEY)

#define CPU_FTRS_POWER8 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_ARCH_206 |\

	    CPU_FTR_MMCRA | CPU_FTR_SMT | \
@@ -452,7 +452,7 @@ static inline void cpu_feature_keys_init(void) { } 
	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \

	    CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP)

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_PKEY)

#define CPU_FTRS_POWER8E (CPU_FTRS_POWER8 | CPU_FTR_PMAO_BUG)

#define CPU_FTRS_POWER8_DD1 (CPU_FTRS_POWER8 & ~CPU_FTR_DBELL)

#define CPU_FTRS_POWER9 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
@@ -464,7 +464,8 @@ static inline void cpu_feature_keys_init(void) { } 
	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \

	    CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_DAWR | \

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300)

	    CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300 | \

	    CPU_FTR_PKEY)

#define CPU_FTRS_POWER9_DD1 ((CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) & \

			     (~CPU_FTR_SAO))

#define CPU_FTRS_POWER9_DD2_0 CPU_FTRS_POWER9

arch/powerpc/include/asm/pkeys.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define _ASM_POWERPC_KEYS_H



#include <linux/jump_label.h>

#include <asm/firmware.h>



DECLARE_STATIC_KEY_TRUE(pkey_disabled);

extern int pkeys_total; /* total pkeys as per device tree */
@@ -208,6 +209,8 @@ static inline bool arch_pkeys_enabled(void) 
}



extern void pkey_mm_init(struct mm_struct *mm);

extern bool arch_supports_pkeys(int cap);

extern unsigned int arch_usable_pkeys(void);

extern void thread_pkey_regs_save(struct thread_struct *thread);

extern void thread_pkey_regs_restore(struct thread_struct *new_thread,

				     struct thread_struct *old_thread);

arch/powerpc/mm/pkeys.c

+55 −9
Original line number Diff line number Diff line
@@ -6,11 +6,14 @@ 
 */



#include <asm/mman.h>

#include <asm/setup.h>

#include <linux/pkeys.h>

#include <linux/of_device.h>



DEFINE_STATIC_KEY_TRUE(pkey_disabled);

bool pkey_execute_disable_supported;

int  pkeys_total;		/* Total pkeys as per device tree */

bool pkeys_devtree_defined;	/* pkey property exported by device tree */

u32  initial_allocation_mask;	/* Bits set for reserved keys */

u64  pkey_amr_uamor_mask;	/* Bits in AMR/UMOR not to be touched */

u64  pkey_iamr_mask;		/* Bits in AMR not to be touched */
@@ -22,6 +25,35 @@ u64 pkey_iamr_mask; /* Bits in AMR not to be touched */ 
#define PKEY_REG_BITS (sizeof(u64)*8)

#define pkeyshift(pkey) (PKEY_REG_BITS - ((pkey+1) * AMR_BITS_PER_PKEY))



static void scan_pkey_feature(void)

{

	u32 vals[2];

	struct device_node *cpu;



	cpu = of_find_node_by_type(NULL, "cpu");

	if (!cpu)

		return;



	if (of_property_read_u32_array(cpu,

			"ibm,processor-storage-keys", vals, 2))

		return;



	/*

	 * Since any pkey can be used for data or execute, we will just treat

	 * all keys as equal and track them as one entity.

	 */

	pkeys_total = be32_to_cpu(vals[0]);

	pkeys_devtree_defined = true;

}



static inline bool pkey_mmu_enabled(void)

{

	if (firmware_has_feature(FW_FEATURE_LPAR))

		return pkeys_total;

	else

		return cpu_has_feature(CPU_FTR_PKEY);

}



int pkey_initialize(void)

{

	int os_reserved, i;
@@ -42,13 +74,16 @@ int pkey_initialize(void) 
		     __builtin_popcountl(ARCH_VM_PKEY_FLAGS >> VM_PKEY_SHIFT)

				!= (sizeof(u64) * BITS_PER_BYTE));



	/* scan the device tree for pkey feature */

	scan_pkey_feature();



	/*

	 * Disable the pkey system till everything is in place. A subsequent

	 * patch will enable it.

	 * Let's assume 32 pkeys on P8 bare metal, if its not defined by device

	 * tree. We make this exception since skiboot forgot to expose this

	 * property on power8.

	 */

	static_branch_enable(&pkey_disabled);



	/* Lets assume 32 keys */

	if (!pkeys_devtree_defined && !firmware_has_feature(FW_FEATURE_LPAR) &&

			cpu_has_feature(CPU_FTRS_POWER8))

		pkeys_total = 32;



	/*
@@ -58,11 +93,22 @@ int pkey_initialize(void) 
	pkeys_total = min_t(int, pkeys_total,

			(ARCH_VM_PKEY_FLAGS >> VM_PKEY_SHIFT));



	if (!pkey_mmu_enabled() || radix_enabled() || !pkeys_total)

		static_branch_enable(&pkey_disabled);

	else

		static_branch_disable(&pkey_disabled);



	if (static_branch_likely(&pkey_disabled))

		return 0;



	/*

	 * Disable execute_disable support for now. A subsequent patch will

	 * enable it.

	 * The device tree cannot be relied to indicate support for

	 * execute_disable support. Instead we use a PVR check.

	 */

	if (pvr_version_is(PVR_POWER7) || pvr_version_is(PVR_POWER7p))

		pkey_execute_disable_supported = false;

	else

		pkey_execute_disable_supported = true;



#ifdef CONFIG_PPC_4K_PAGES

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE