arm64: use sanitized feature registers for conditional ZCR_EL1 and SMCR_EL1 reads
PATCH 1/1 arm64: use sanitized feature registers for conditional ZCR_EL1 and SMCR_EL1 reads
With arm64.nosve we would still read ZCR_EL1 in __cpuinfo_store_cpu because the condition for reading it was based on the unsanitized feature register value info->reg_id_aa64pfr0. Fix the problem by moving the reads to init_cpu_features after we have computed the sanitized value. Fix the SMCR_EL1 read for SME similarly.
--- arch/arm64/kernel/cpufeature.c | 11 +++++++---- arch/arm64/kernel/cpuinfo.c | 8 -------- 2 files changed, 7 insertions(+), 12 deletions(-)
arch/arm64/kernel/cpufeature.c +7 -4
@@ -999,15 +999,18 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))init_32bit_cpu_features (&info->aarch32); -if (id_aa64pfr0_sve (info->reg_id_aa64pfr0)) { +if (IS_ENABLED (CONFIG_ARM64_SVE ) && +id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ))) { + info->reg_zcr =read_zcr_features ();init_cpu_ftr_reg (SYS_ZCR_EL1 , info->reg_zcr);vec_init_vq_map (ARM64_VEC_SVE ); } -if (id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { +if (IS_ENABLED (CONFIG_ARM64_SME ) && +id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 ))) { + info->reg_smcr =read_smcr_features ();init_cpu_ftr_reg (SYS_SMCR_EL1 , info->reg_smcr); -if (IS_ENABLED (CONFIG_ARM64_SME )) -vec_init_vq_map (ARM64_VEC_SME ); +vec_init_vq_map (ARM64_VEC_SME ); }if (id_aa64pfr1_mte (info->reg_id_aa64pfr1))
arch/arm64/kernel/cpuinfo.c +0 -8
@@ -418,14 +418,6 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))__cpuinfo_store_cpu_32bit (&info->aarch32); -if (IS_ENABLED (CONFIG_ARM64_SVE ) && -id_aa64pfr0_sve (info->reg_id_aa64pfr0)) - info->reg_zcr =read_zcr_features (); - -if (IS_ENABLED (CONFIG_ARM64_SME ) && -id_aa64pfr1_sme (info->reg_id_aa64pfr1)) - info->reg_smcr =read_smcr_features (); -cpuinfo_detect_icache_policy (info); }
Signature · 7 lines
2.37.0.144.g8ac04bfd2-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 5 lines · Peter Collingbourne
With arm64.nosve we would still read
ZCR_EL1in__cpuinfo_store_cpubecause the condition for reading it was based on the unsanitized feature register valueinfo->reg_id_aa64pfr0. Fix the problem by moving the reads toinit_cpu_featuresafter we have computed the sanitized value. Fix theSMCR_EL1read for SME similarly.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 46 lines · Peter Collingbourne
With arm64.nosve we would still read
ZCR_EL1in__cpuinfo_store_cpubecause the condition for reading it was based on the unsanitized feature register valueinfo->reg_id_aa64pfr0. Fix the problem by moving the reads toinit_cpu_featuresafter we have computed the sanitized value. Fix theSMCR_EL1read for SME similarly.Fixes 504ee23611c4 ("arm64: Add the arm64.nosve command line option")Signed-off-by Peter Collingbourne <[email protected]>--- arch/arm64/kernel/cpufeature.c | 11 +++++++---- arch/arm64/kernel/cpuinfo.c | 8 -------- 2 files changed, 7 insertions(+), 12 deletions(-)arch/arm64/kernel/cpufeature.c +7
-4@@ -999,15 +999,18 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))init_32bit_cpu_features (&info->aarch32); -if (id_aa64pfr0_sve (info->reg_id_aa64pfr0)) { +if (IS_ENABLED (CONFIG_ARM64_SVE ) && +id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ))) { + info->reg_zcr =read_zcr_features ();init_cpu_ftr_reg (SYS_ZCR_EL1 , info->reg_zcr);vec_init_vq_map (ARM64_VEC_SVE ); } -if (id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { +if (IS_ENABLED (CONFIG_ARM64_SME ) && +id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 ))) { + info->reg_smcr =read_smcr_features ();init_cpu_ftr_reg (SYS_SMCR_EL1 , info->reg_smcr); -if (IS_ENABLED (CONFIG_ARM64_SME )) -vec_init_vq_map (ARM64_VEC_SME ); +vec_init_vq_map (ARM64_VEC_SME ); }if (id_aa64pfr1_mte (info->reg_id_aa64pfr1))arch/arm64/kernel/cpuinfo.c +0
-0
arch/arm64/kernel/cpuinfo.c static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) · line 427
Quoted 10 lines
arch/arm64/kernel/cpuinfo.c +0
-7@@ -418,14 +418,6 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))__cpuinfo_store_cpu_32bit (&info->aarch32); -if (IS_ENABLED (CONFIG_ARM64_SVE ) && -id_aa64pfr0_sve (info->reg_id_aa64pfr0)) - info->reg_zcr =read_zcr_features (); - -if (IS_ENABLED (CONFIG_ARM64_SME ) && -id_aa64pfr1_sme (info->reg_id_aa64pfr1)) - info->reg_smcr =read_smcr_features ();
Not sure what this applies on, but that's a kernel that doesn't contain d69d564964872 ("arm64/sme: Expose SMIDR through sysfs").
arch/arm64/kernel/cpuinfo.c static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) · line 423
Quoted 4 lines
arch/arm64/kernel/cpuinfo.c +0
-1-cpuinfo_detect_icache_policy (info); }
This looks wrong to me. With this change, a secondary CPU never initialises its own view of reg_{zcr,smcr}. I came up with the following patch instead, also updating the cpuinfo_arm64 structure when updating the capabilities on secondary CPU boot (on top of arm64/boot):
From ee8d6a3741229336acedf13aa1304e05ed630ff0 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Mon, 11 Jul 2022 16:43:36 +0100
Subject: [PATCH] arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}
Even if we are now able to tell the kernel to avoid exposing SVE/SME from the command line, we still have a couple of places where we unconditionally access the ZCR_EL1 (resp. SMCR_EL1) registers.
On systems with broken firmwares, this results in a crash even if arm64.nosve (resp. arm64.nosme) was passed on the command-line.
To avoid this, only update cpuinfo_arm64::reg_{zcr,smcr} once we have computed the sanitised version for the corresponding feature registers (ID_AA64PFR0 for SVE, and ID_AA64PFR1 for SME). This results in some minor refactoring.
--- arch/arm64/kernel/cpufeature.c | 41 ++++++++++++++++++++++++---------- arch/arm64/kernel/cpuinfo.c | 16 ------------- 2 files changed, 29 insertions(+), 28 deletions(-)
arch/arm64/kernel/cpufeature.c +29 -12
@@ -1000,15 +1000,24 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))init_32bit_cpu_features (&info->aarch32); -if (id_aa64pfr0_sve (info->reg_id_aa64pfr0)) { +if (IS_ENABLED (CONFIG_ARM64_SVE ) && +id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ))) { + info->reg_zcr =read_zcr_features ();init_cpu_ftr_reg (SYS_ZCR_EL1 , info->reg_zcr);vec_init_vq_map (ARM64_VEC_SVE ); } -if (id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { +if (IS_ENABLED (CONFIG_ARM64_SME ) && +id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 ))) { + info->reg_smcr =read_smcr_features (); +/* +* We mask out SMPS since even if the hardware +* supports priorities the kernel does not at present +* and we block access to them. +*/ + info->reg_smidr =read_cpuid (SMIDR_EL1 ) & ~SMIDR_EL1_SMPS ;init_cpu_ftr_reg (SYS_SMCR_EL1 , info->reg_smcr); -if (IS_ENABLED (CONFIG_ARM64_SME )) -vec_init_vq_map (ARM64_VEC_SME ); +vec_init_vq_map (ARM64_VEC_SME ); }if (id_aa64pfr1_mte (info->reg_id_aa64pfr1))
@@ -1240,23 +1249,31 @@ void update_cpu_features(int cpu, taint |=check_update_ftr_reg (SYS_ID_AA64SMFR0_EL1 , cpu, info->reg_id_aa64smfr0, boot->reg_id_aa64smfr0); -if (id_aa64pfr0_sve (info->reg_id_aa64pfr0)) { +if (IS_ENABLED (CONFIG_ARM64_SVE ) && +id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ))) { + info->reg_zcr =read_zcr_features (); taint |=check_update_ftr_reg (SYS_ZCR_EL1 , cpu, info->reg_zcr, boot->reg_zcr); -/* Probe vector lengths, unless we already gave up on SVE */ -if (id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 )) && - !system_capabilities_finalized ()) +/* Probe vector lengths */ +if (!system_capabilities_finalized ())vec_update_vq_map (ARM64_VEC_SVE ); } -if (id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { +if (IS_ENABLED (CONFIG_ARM64_SME ) && +id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 ))) { + info->reg_smcr =read_smcr_features (); +/* +* We mask out SMPS since even if the hardware +* supports priorities the kernel does not at present +* and we block access to them. +*/ + info->reg_smidr =read_cpuid (SMIDR_EL1 ) & ~SMIDR_EL1_SMPS ; taint |=check_update_ftr_reg (SYS_SMCR_EL1 , cpu, info->reg_smcr, boot->reg_smcr); -/* Probe vector lengths, unless we already gave up on SME */ -if (id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 )) && - !system_capabilities_finalized ()) +/* Probe vector lengths */ +if (!system_capabilities_finalized ())vec_update_vq_map (ARM64_VEC_SME ); }
arch/arm64/kernel/cpuinfo.c +0 -16
@@ -438,22 +438,6 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))__cpuinfo_store_cpu_32bit (&info->aarch32); -if (IS_ENABLED (CONFIG_ARM64_SVE ) && -id_aa64pfr0_sve (info->reg_id_aa64pfr0)) - info->reg_zcr =read_zcr_features (); - -if (IS_ENABLED (CONFIG_ARM64_SME ) && -id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { - info->reg_smcr =read_smcr_features (); - -/* -* We mask out SMPS since even if the hardware -* supports priorities the kernel does not at present -* and we block access to them. -*/ - info->reg_smidr =read_cpuid (SMIDR_EL1 ) & ~SMIDR_EL1_SMPS ; - } -cpuinfo_detect_icache_policy (info); }
Signature · 10 lines
2.34.1 -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Mark Brown
Reviewed-byQuoted 11 lines · Marc Zyngier
Quoted 3 lines · Peter Collingbourne
cpuinfo_detect_icache_policy(info);
}This looks wrong to me. With this change, a secondary CPU never initialises its own view of reg_{zcr,smcr}. I came up with the following patch instead, also updating the
cpuinfo_arm64structure when updating the capabilities on secondary CPU boot (on top of arm64/boot):
Ugh, clearly I'm not up to speed enough with how all this stuff bootstraps :/
Quoted 9 lines
From
ee8d6a3741229336acedf13aa1304e05ed630ff0Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Mon, 11 Jul 2022 16:43:36 +0100
Subject: [PATCH] arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}Even if we are now able to tell the kernel to avoid exposing SVE/SME from the command line, we still have a couple of places where we unconditionally access the
ZCR_EL1(resp.SMCR_EL1) registers.
Quoted 7 lines
On systems with broken firmwares, this results in a crash even if arm64.nosve (resp. arm64.nosme) was passed on the command-line.
To avoid this, only update cpuinfo_arm64::reg_{zcr,smcr} once we have computed the sanitised version for the corresponding feature registers (
ID_AA64PFR0for SVE, andID_AA64PFR1for SME). This results in some minor refactoring.
FWIW
but that's more from a SVE/SME point of view than from an ID register point of view.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 52 lines · Marc Zyngier
Quoted 49 lines · Peter Collingbourne
With arm64.nosve we would still read
ZCR_EL1in__cpuinfo_store_cpubecause the condition for reading it was based on the unsanitized feature register valueinfo->reg_id_aa64pfr0. Fix the problem by moving the reads toinit_cpu_featuresafter we have computed the sanitized value. Fix theSMCR_EL1read for SME similarly.Fixes 504ee23611c4 ("arm64: Add the arm64.nosve command line option")Signed-off-by Peter Collingbourne <[email protected]>--- arch/arm64/kernel/cpufeature.c | 11 +++++++---- arch/arm64/kernel/cpuinfo.c | 8 -------- 2 files changed, 7 insertions(+), 12 deletions(-)arch/arm64/kernel/cpufeature.c +7
-4@@ -999,15 +999,18 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))init_32bit_cpu_features (&info->aarch32); -if (id_aa64pfr0_sve (info->reg_id_aa64pfr0)) { +if (IS_ENABLED (CONFIG_ARM64_SVE ) && +id_aa64pfr0_sve (read_sanitised_ftr_reg (SYS_ID_AA64PFR0_EL1 ))) { + info->reg_zcr =read_zcr_features ();init_cpu_ftr_reg (SYS_ZCR_EL1 , info->reg_zcr);vec_init_vq_map (ARM64_VEC_SVE ); } -if (id_aa64pfr1_sme (info->reg_id_aa64pfr1)) { +if (IS_ENABLED (CONFIG_ARM64_SME ) && +id_aa64pfr1_sme (read_sanitised_ftr_reg (SYS_ID_AA64PFR1_EL1 ))) { + info->reg_smcr =read_smcr_features ();init_cpu_ftr_reg (SYS_SMCR_EL1 , info->reg_smcr); -if (IS_ENABLED (CONFIG_ARM64_SME )) -vec_init_vq_map (ARM64_VEC_SME ); +vec_init_vq_map (ARM64_VEC_SME ); }if (id_aa64pfr1_mte (info->reg_id_aa64pfr1))arch/arm64/kernel/cpuinfo.c +0
-0@@ -418,14 +418,6 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0))__cpuinfo_store_cpu_32bit (&info->aarch32);
Quoted 10 lines
arch/arm64/kernel/cpuinfo.c static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) · line 447
Quoted 7 lines
arch/arm64/kernel/cpuinfo.c +0
-7-if (IS_ENABLED (CONFIG_ARM64_SVE ) && -id_aa64pfr0_sve (info->reg_id_aa64pfr0)) - info->reg_zcr =read_zcr_features (); - -if (IS_ENABLED (CONFIG_ARM64_SME ) && -id_aa64pfr1_sme (info->reg_id_aa64pfr1)) - info->reg_smcr =read_smcr_features ();Not sure what this applies on, but that's a kernel that doesn't contain
d69d564964872("arm64/sme: Expose SMIDR through sysfs").
Right, I based this on for-next/boot, which didn't contain that patch.
Quoted 7 lines
arch/arm64/kernel/cpuinfo.c static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info) · line 443
Quoted 4 lines
arch/arm64/kernel/cpuinfo.c +0
-1-cpuinfo_detect_icache_policy (info); }This looks wrong to me. With this change, a secondary CPU never initialises its own view of reg_{zcr,smcr}.
I see. I guess I managed to confuse myself about the flow for secondary CPUs.
Quoted 4 lines
I came up with the
following patch instead, also updating thecpuinfo_arm64structure when updating the capabilities on secondary CPU boot (on top of arm64/boot):
Yes, that looks better.
Quoted 12 lines
From
ee8d6a3741229336acedf13aa1304e05ed630ff0Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Mon, 11 Jul 2022 16:43:36 +0100
Subject: [PATCH] arm64: Delay initialisation of cpuinfo_arm64::reg_{zcr,smcr}Even if we are now able to tell the kernel to avoid exposing SVE/SME from the command line, we still have a couple of places where we unconditionally access the
ZCR_EL1(resp.SMCR_EL1) registers.On systems with broken firmwares, this results in a crash even if arm64.nosve (resp. arm64.nosme) was passed on the command-line.
Quoted 6 lines
To avoid this, only update cpuinfo_arm64::reg_{zcr,smcr} once we have computed the sanitised version for the corresponding feature registers (
ID_AA64PFR0for SVE, andID_AA64PFR1for SME). This results in some minor refactoring.Signed-off-by Marc Zyngier <[email protected]>
Peter
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel