Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2511253 authored by Will Deacon's avatar Will Deacon Committed by Channagoud Kadabi
Browse files

arm64: Take into account ID_AA64PFR0_EL1.CSV3 



For non-KASLR kernels where the KPTI behaviour has not been overridden
on the command line we can use ID_AA64PFR0_EL1.CSV3 to determine whether
or not we should unmap the kernel whilst running at EL0.

Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
[ckadabi@codeaurora.org: Resolve minor merge conflcits]

Change-Id: I49e80ebf4a5daca912758529aaff4d9cd2c178e9
Patch-mainline: linux-arm-kernel @ 05/01/18, 5:12
[ckadabi@codeaurora.org: Use read_system_reg api for reading PFR0_EL1
register and change the arguments to macro ARM64_FTR_BITS as 4.9 kernel
does not support visible field]
Signed-off-by: default avatarChannagoud Kadabi <ckadabi@codeaurora.org>
parent af4ea937

arch/arm64/include/asm/sysreg.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -117,6 +117,8 @@ 
#define ID_AA64ISAR0_AES_SHIFT		4

#define ID_AA64ISAR0_AES_SHIFT		4





/* id_aa64pfr0 */

/* id_aa64pfr0 */

#define ID_AA64PFR0_CSV3_SHIFT		60

#define ID_AA64PFR0_SVE_SHIFT		32

#define ID_AA64PFR0_GIC_SHIFT		24

#define ID_AA64PFR0_GIC_SHIFT		24

#define ID_AA64PFR0_ASIMD_SHIFT		20

#define ID_AA64PFR0_ASIMD_SHIFT		20

#define ID_AA64PFR0_FP_SHIFT		16

#define ID_AA64PFR0_FP_SHIFT		16

arch/arm64/kernel/cpufeature.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { 
	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_GIC_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_GIC_SHIFT, 4, 0),

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI),

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, 4, ID_AA64PFR0_ASIMD_NI),

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI),

	S_ARM64_FTR_BITS(FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, 4, ID_AA64PFR0_FP_NI),

	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64PFR0_CSV3_SHIFT, 4, 0),

	/* Linux doesn't care about the EL3 */

	/* Linux doesn't care about the EL3 */

	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64PFR0_EL3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_NONSTRICT, FTR_EXACT, ID_AA64PFR0_EL3_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL2_SHIFT, 4, 0),

	ARM64_FTR_BITS(FTR_STRICT, FTR_EXACT, ID_AA64PFR0_EL2_SHIFT, 4, 0),
@@ -754,6 +755,8 @@ static int __kpti_forced; /* 0: not forced, >0: forced on, <0: forced off */ 
static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,

static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,

				int __unused)

				int __unused)

{

{

	u64 pfr0 = read_system_reg(SYS_ID_AA64PFR0_EL1);



	/* Forced on command line? */

	/* Forced on command line? */

	if (__kpti_forced) {

	if (__kpti_forced) {

		pr_info_once("kernel page table isolation forced %s by command line option\n",

		pr_info_once("kernel page table isolation forced %s by command line option\n",
@@ -765,7 +768,9 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry, 
	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))

	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))

		return true;

		return true;





	return false;

	/* Defer to CPU feature registers */

	return !cpuid_feature_extract_unsigned_field(pfr0,

						     ID_AA64PFR0_CSV3_SHIFT);

}

}





static int __init parse_kpti(char *str)

static int __init parse_kpti(char *str)
@@ -867,6 +872,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { 
	},

	},

#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

	{

	{

		.desc = "Kernel page table isolation (KPTI)",

		.capability = ARM64_UNMAP_KERNEL_AT_EL0,

		.capability = ARM64_UNMAP_KERNEL_AT_EL0,

		.def_scope = SCOPE_SYSTEM,

		.def_scope = SCOPE_SYSTEM,

		.matches = unmap_kernel_at_el0,

		.matches = unmap_kernel_at_el0,