Commit d5b810b5 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/book3s64/kuap: Rename MMU_FTR_RADIX_KUAP and MMU_FTR_KUEP 



This is in preparation to adding support for kuap with hash translation.
In preparation for that rename/move kuap related functions to
non radix names. Also move the feature bit closer to MMU_FTR_KUEP.

MMU_FTR_KUEP is renamed to MMU_FTR_BOOK3S_KUEP to indicate the feature
is only relevant to BOOK3S_64

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201127044424.40686-8-aneesh.kumar@linux.ibm.com
parent 57b7505a

arch/powerpc/include/asm/book3s/64/kup.h

+9 −9
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
	mtspr	SPRN_AMR, \gpr2

	/* No isync required, see kuap_restore_amr() */

998:

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67)

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_BOOK3S_KUAP, 67)

#endif

.endm
@@ -37,7 +37,7 @@ 
	sldi	\gpr2, \gpr2, AMR_KUAP_SHIFT

999:	tdne	\gpr1, \gpr2

	EMIT_BUG_ENTRY 999b, __FILE__, __LINE__, (BUGFLAG_WARNING | BUGFLAG_ONCE)

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67)

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_BOOK3S_KUAP, 67)

#endif

.endm

#endif
@@ -58,7 +58,7 @@ 
	mtspr	SPRN_AMR, \gpr2

	isync

99:

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_RADIX_KUAP, 67)

	END_MMU_FTR_SECTION_NESTED_IFSET(MMU_FTR_BOOK3S_KUAP, 67)

#endif

.endm
@@ -75,7 +75,7 @@ DECLARE_STATIC_KEY_FALSE(uaccess_flush_key); 


static inline void kuap_restore_amr(struct pt_regs *regs, unsigned long amr)

{

	if (mmu_has_feature(MMU_FTR_RADIX_KUAP) && unlikely(regs->kuap != amr)) {

	if (mmu_has_feature(MMU_FTR_BOOK3S_KUAP) && unlikely(regs->kuap != amr)) {

		isync();

		mtspr(SPRN_AMR, regs->kuap);

		/*
@@ -88,7 +88,7 @@ static inline void kuap_restore_amr(struct pt_regs *regs, unsigned long amr) 


static inline unsigned long kuap_get_and_check_amr(void)

{

	if (mmu_has_feature(MMU_FTR_RADIX_KUAP)) {

	if (mmu_has_feature(MMU_FTR_BOOK3S_KUAP)) {

		unsigned long amr = mfspr(SPRN_AMR);

		if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG)) /* kuap_check_amr() */

			WARN_ON_ONCE(amr != AMR_KUAP_BLOCKED);
@@ -99,7 +99,7 @@ static inline unsigned long kuap_get_and_check_amr(void) 


static inline void kuap_check_amr(void)

{

	if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG) && mmu_has_feature(MMU_FTR_RADIX_KUAP))

	if (IS_ENABLED(CONFIG_PPC_KUAP_DEBUG) && mmu_has_feature(MMU_FTR_BOOK3S_KUAP))

		WARN_ON_ONCE(mfspr(SPRN_AMR) != AMR_KUAP_BLOCKED);

}
@@ -118,7 +118,7 @@ static inline unsigned long get_kuap(void) 
	 * This has no effect in terms of actually blocking things on hash,

	 * so it doesn't break anything.

	 */

	if (!early_mmu_has_feature(MMU_FTR_RADIX_KUAP))

	if (!early_mmu_has_feature(MMU_FTR_BOOK3S_KUAP))

		return AMR_KUAP_BLOCKED;



	return mfspr(SPRN_AMR);
@@ -126,7 +126,7 @@ static inline unsigned long get_kuap(void) 


static inline void set_kuap(unsigned long value)

{

	if (!early_mmu_has_feature(MMU_FTR_RADIX_KUAP))

	if (!early_mmu_has_feature(MMU_FTR_BOOK3S_KUAP))

		return;



	/*
@@ -141,7 +141,7 @@ static inline void set_kuap(unsigned long value) 
static inline bool

bad_kuap_fault(struct pt_regs *regs, unsigned long address, bool is_write)

{

	return WARN(mmu_has_feature(MMU_FTR_RADIX_KUAP) &&

	return WARN(mmu_has_feature(MMU_FTR_BOOK3S_KUAP) &&

		    (regs->kuap & (is_write ? AMR_KUAP_BLOCK_WRITE : AMR_KUAP_BLOCK_READ)),

		    "Bug: %s fault blocked by AMR!", is_write ? "Write" : "Read");

}

arch/powerpc/include/asm/mmu.h

+14 −10
Original line number Diff line number Diff line
@@ -29,9 +29,18 @@ 
 */



/*

 * Support for KUEP feature.

 * Supports KUAP feature

 * key 0 controlling userspace addresses on radix

 * Key 3 on hash

 */

#define MMU_FTR_KUEP			ASM_CONST(0x00000400)

#define MMU_FTR_BOOK3S_KUAP		ASM_CONST(0x00000200)



/*

 * Supports KUEP feature

 * key 0 controlling userspace addresses on radix

 * Key 3 on hash

 */

#define MMU_FTR_BOOK3S_KUEP		ASM_CONST(0x00000400)



/*

 * Support for memory protection keys.
@@ -120,11 +129,6 @@ 
 */

#define MMU_FTR_1T_SEGMENT		ASM_CONST(0x40000000)



/*

 * Supports KUAP (key 0 controlling userspace addresses) on radix

 */

#define MMU_FTR_RADIX_KUAP		ASM_CONST(0x80000000)



/* MMU feature bit sets for various CPUs */

#define MMU_FTRS_DEFAULT_HPTE_ARCH_V2	\

	MMU_FTR_HPTE_TABLE | MMU_FTR_PPCAS_ARCH_V2
@@ -187,15 +191,15 @@ enum { 
#ifdef CONFIG_PPC_RADIX_MMU

		MMU_FTR_TYPE_RADIX |

		MMU_FTR_GTSE |

#endif /* CONFIG_PPC_RADIX_MMU */

#ifdef CONFIG_PPC_KUAP

		MMU_FTR_RADIX_KUAP |

	MMU_FTR_BOOK3S_KUAP |

#endif /* CONFIG_PPC_KUAP */

#endif /* CONFIG_PPC_RADIX_MMU */

#ifdef CONFIG_PPC_MEM_KEYS

	MMU_FTR_PKEY |

#endif

#ifdef CONFIG_PPC_KUEP

	MMU_FTR_KUEP |

	MMU_FTR_BOOK3S_KUEP |

#endif /* CONFIG_PPC_KUAP */



		0,

arch/powerpc/mm/book3s64/pkeys.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void __init setup_kuep(bool disabled) 


	if (smp_processor_id() == boot_cpuid) {

		pr_info("Activating Kernel Userspace Execution Prevention\n");

		cur_cpu_spec->mmu_features |= MMU_FTR_KUEP;

		cur_cpu_spec->mmu_features |= MMU_FTR_BOOK3S_KUEP;

	}



	/*
@@ -258,7 +258,7 @@ void __init setup_kuap(bool disabled) 


	if (smp_processor_id() == boot_cpuid) {

		pr_info("Activating Kernel Userspace Access Prevention\n");

		cur_cpu_spec->mmu_features |= MMU_FTR_RADIX_KUAP;

		cur_cpu_spec->mmu_features |= MMU_FTR_BOOK3S_KUAP;

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE