OSDN Git Service

arm64: Turn on KPTI only on CPUs that need it
authorJayachandran C <jnair@caviumnetworks.com>
Fri, 19 Jan 2018 12:22:48 +0000 (04:22 -0800)
committerCatalin Marinas <catalin.marinas@arm.com>
Tue, 23 Jan 2018 19:59:49 +0000 (19:59 +0000)
Whitelist Broadcom Vulcan/Cavium ThunderX2 processors in
unmap_kernel_at_el0(). These CPUs are not vulnerable to
CVE-2017-5754 and do not need KPTI when KASLR is off.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/cpufeature.c

index 5612d6f..4b6f905 100644 (file)
@@ -868,6 +868,13 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
        if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))
                return true;
 
+       /* Don't force KPTI for CPUs that are not vulnerable */
+       switch (read_cpuid_id() & MIDR_CPU_MODEL_MASK) {
+       case MIDR_CAVIUM_THUNDERX2:
+       case MIDR_BRCM_VULCAN:
+               return false;
+       }
+
        /* Defer to CPU feature registers */
        return !cpuid_feature_extract_unsigned_field(pfr0,
                                                     ID_AA64PFR0_CSV3_SHIFT);