ARM/arm64: errata: Remove AES hwcap for 32bit tasks on A57/A72
Subsystems (3)
v2 cover ARM/arm64: errata: Remove AES hwcap for 32bit tasks on A57/A72
Hello,
These patches remove the AES HWCAP on A57 and A72 for aarch32 user-space processes due to erratum #1742098 and #1655431. An interrupt between two instructions will cause these parts to get the wrong result. These extensions are optional, so software should have a fallback implementation.
The 32bit patch is new for v2, as Ard points out the behaviour should be the same here.
Operating on the HWCAP bitmap directly avoids affecting KVM, which was the problem with v1. But it does mean HWCAP_PMULL is still visible to aarch32 processes. This isn't affected by the erratum, but is detected from the same field in the ID register. PMULL is value '2', AES is value '1'. User-space would be crazy to let PMULL imply AES, right ...
There is no dependency between the two patches.
[v1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
[A57] https://developer.arm.com/documentation/epm049219/2300 #1742098
[A72 https://developer.arm.com/documentation/epm012079/11 #1655431
Thanks,
James Morse (2):
arm64: errata: Remove AES hwcap for COMPAT tasks
ARM: Remove AES hwcap for parts affected by errata
Documentation/arm64/silicon-errata.rst | 4 ++++ arch/arm/kernel/setup.c | 9 +++++++++ arch/arm64/Kconfig | 16 ++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 16 ++++++++++++++++ arch/arm64/kernel/cpufeature.c | 11 ++++++++++- arch/arm64/tools/cpucaps | 1 + 6 files changed, 56 insertions(+), 1 deletion(-)
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/2 arm64: errata: Remove AES hwcap for COMPAT tasks
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
--- Documentation/arm64/silicon-errata.rst | 4 ++++ arch/arm64/Kconfig | 16 ++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 16 ++++++++++++++++ arch/arm64/kernel/cpufeature.c | 11 ++++++++++- arch/arm64/tools/cpucaps | 1 + 5 files changed, 47 insertions(+), 1 deletion(-)
Documentation/arm64/silicon-errata.rst +4 -0
@@ -82,10 +82,14 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A57 | #1319537 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A57 | #1742098 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #853709 | N/A | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #1319367 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A72 | #1655431 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A73 | #858921 | ARM64_ERRATUM_858921 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A76 | #1188873,1418040| ARM64_ERRATUM_1418040 |
arch/arm64/Kconfig +16 -0
@@ -491,6 +491,22 @@ config ARM64_ERRATUM_834220 If unsure, say Y. +config ARM64_ERRATUM_1742098 + bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence" + depends on COMPAT + default y + help + This option removes the AES hwcap for aarch32 user-space to + workaround erratum 1742098 on Cortex-A57 and Cortex-A72. + + Affected parts may corrupt the AES state if an interrupt is + taken between a pair of AES instructions. These instructions + are only present if the cryptography extensions are present. + All software should have a fallback implementation for CPUs + that don't implement the cryptography extensions. + + If unsure, say Y. + config ARM64_ERRATUM_845719 bool "Cortex-A53: 845719: a load might read incorrect data" depends on COMPAT
arch/arm64/kernel/cpu_errata.c +16 -0
@@ -393,6 +393,14 @@ static struct midr_range trbe_write_out_of_range_cpus[] = { };#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */ +#ifdef CONFIG_ARM64_ERRATUM_1742098 +static struct midr_range broken_aarch32_aes[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_A57 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A72 ), + {}, +}; +#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */ + const struct arm64_cpu_capabilities arm64_errata[] = {#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE {
@@ -655,6 +663,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = {/* Cortex-A510 r0p0 - r0p1 */ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 1) }, +#endif +#ifdef CONFIG_ARM64_ERRATUM_1742098 + { + .desc = "ARM erratum 1742098", + .capability = ARM64_WORKAROUND_1742098, + CAP_MIDR_RANGE_LIST(broken_aarch32_aes), + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + }, #endif { }
arch/arm64/kernel/cpufeature.c +10 -1
@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */ +static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +} +#ifdef CONFIG_KVM static bool is_kvm_protected_mode (const struct arm64_cpu_capabilities *entry,int __unused) {
@@ -3034,8 +3040,10 @@ void __init setup_cpu_features(void)setup_system_capabilities ();setup_elf_hwcaps (arm64_elf_hwcaps); -if (system_supports_32bit_el0 ()) +if (system_supports_32bit_el0 ()) {setup_elf_hwcaps (compat_elf_hwcaps); +elf_hwcap_fixup (); + }if (system_uses_ttbr0_pan ())pr_info ("emulated: Privileged Access Never (PAN) using TTBR0_EL1 switching\n" );
@@ -3087,6 +3095,7 @@ static int enable_mismatched_32bit_el0(unsigned int cpu) cpu_active_mask);get_cpu_device (lucky_winner)->offline_disabled = true;setup_elf_hwcaps (compat_elf_hwcaps); +elf_hwcap_fixup ();pr_info ("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n" , cpu, lucky_winner);return 0 ;
arch/arm64/tools/cpucaps +1 -0
@@ -58,6 +58,7 @@ WORKAROUND_1418040 WORKAROUND_1463225 WORKAROUND_1508412 WORKAROUND_1542419 +WORKAROUND_1742098 WORKAROUND_1902691 WORKAROUND_2038923 WORKAROUND_2064142
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
Hi James,
Quoted 10 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Quoted 4 lines
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
Signed-off-by James Morse <[email protected]>
One nit/question below,
Quoted 59 lines
--- Documentation/arm64/silicon-errata.rst | 4 ++++ arch/arm64/Kconfig | 16 ++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 16 ++++++++++++++++ arch/arm64/kernel/cpufeature.c | 11 ++++++++++- arch/arm64/tools/cpucaps | 1 + 5 files changed, 47 insertions(+), 1 deletion(-)Documentation/arm64/silicon-errata.rst +4
-0@@ -82,10 +82,14 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A57 | #1319537 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A57 | #1742098 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #853709 | N/A | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #1319367 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A72 | #1655431 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A73 | #858921 | ARM64_ERRATUM_858921 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A76 | #1188873,1418040| ARM64_ERRATUM_1418040 |arch/arm64/Kconfig +16
-0@@ -491,6 +491,22 @@ config ARM64_ERRATUM_834220 If unsure, say Y. +config ARM64_ERRATUM_1742098 + bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence" + depends on COMPAT + default y + help + This option removes the AES hwcap for aarch32 user-space to + workaround erratum 1742098 on Cortex-A57 and Cortex-A72. + + Affected parts may corrupt the AES state if an interrupt is + taken between a pair of AES instructions. These instructions + are only present if the cryptography extensions are present. + All software should have a fallback implementation for CPUs + that don't implement the cryptography extensions. + + If unsure, say Y. + config ARM64_ERRATUM_845719 bool "Cortex-A53: 845719: a load might read incorrect data" depends on COMPATarch/arm64/kernel/cpu_errata.c +0
-0
arch/arm64/kernel/cpu_errata.c static struct midr_range trbe_write_out_of_range_cpus[] = { · line 398
Quoted 6 lines
arch/arm64/kernel/cpu_errata.c +3
-0@@ -393,6 +393,14 @@ static struct midr_range trbe_write_out_of_range_cpus[] = { };#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */ +#ifdef CONFIG_ARM64_ERRATUM_1742098 +static struct midr_range broken_aarch32_aes[] = { + MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),
Not sure it matters, but are you sure early A57 is affected as well?
Quoted 73 lines
arch/arm64/kernel/cpu_errata.c +13
-0+ MIDR_ALL_VERSIONS(MIDR_CORTEX_A72), + {}, +}; +#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */ + const struct arm64_cpu_capabilities arm64_errata[] = {#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE {@@ -655,6 +663,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = {/* Cortex-A510 r0p0 - r0p1 */ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 1) }, +#endif +#ifdef CONFIG_ARM64_ERRATUM_1742098 + { + .desc = "ARM erratum 1742098", + .capability = ARM64_WORKAROUND_1742098, + CAP_MIDR_RANGE_LIST(broken_aarch32_aes), + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + }, #endif { }arch/arm64/kernel/cpufeature.c +10
-1@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */ +static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +} +#ifdef CONFIG_KVM static bool is_kvm_protected_mode (const struct arm64_cpu_capabilities *entry,int __unused) {@@ -3034,8 +3040,10 @@ void __init setup_cpu_features(void)setup_system_capabilities ();setup_elf_hwcaps (arm64_elf_hwcaps); -if (system_supports_32bit_el0 ()) +if (system_supports_32bit_el0 ()) {setup_elf_hwcaps (compat_elf_hwcaps); +elf_hwcap_fixup (); + }if (system_uses_ttbr0_pan ())pr_info ("emulated: Privileged Access Never (PAN) using TTBR0_EL1 switching\n" );@@ -3087,6 +3095,7 @@ static int enable_mismatched_32bit_el0(unsigned int cpu) cpu_active_mask);get_cpu_device (lucky_winner)->offline_disabled = true;setup_elf_hwcaps (compat_elf_hwcaps); +elf_hwcap_fixup ();pr_info ("Asymmetric 32-bit EL0 support detected on CPU %u; CPU hot-unplug disabled on CPU %u\n" , cpu, lucky_winner);return 0 ;arch/arm64/tools/cpucaps +1
-1@@ -58,6 +58,7 @@ WORKAROUND_1418040 WORKAROUND_1463225 WORKAROUND_1508412 WORKAROUND_1542419 +WORKAROUND_1742098 WORKAROUND_1902691 WORKAROUND_2038923 WORKAROUND_2064142 --
Quoted 2 lines
2.30.2
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
Hi Ard,
Quoted 11 lines · Ard Biesheuvel
Quoted 10 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Quoted 6 lines
Quoted 4 lines
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
Signed-off-by James Morse <[email protected]>Acked-by Ard Biesheuvel <[email protected]>
Thanks!
Quoted 11 lines
One nit/question below,
Quoted 8 lines
arch/arm64/kernel/cpu_errata.c +0
-0@@ -393,6 +393,14 @@ static struct midr_range trbe_write_out_of_range_cpus[] = { };#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */
Quoted 5 lines
arch/arm64/kernel/cpu_errata.c static struct midr_range trbe_write_out_of_range_cpus[] = { · line 398
Quoted 3 lines
arch/arm64/kernel/cpu_errata.c +3
-0+#ifdef CONFIG_ARM64_ERRATUM_1742098 +static struct midr_range broken_aarch32_aes[] = { + MIDR_ALL_VERSIONS(MIDR_CORTEX_A57),Not sure it matters, but are you sure early A57 is affected as well?
That's what I remember reading last time too - but this is what the errata document on developer.arm.com says. It's something I'm chasing up...
Thanks,
James
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerRe: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
In reply to James MorseQuoted 72 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
Signed-off-by James Morse <[email protected]>--- Documentation/arm64/silicon-errata.rst | 4 ++++ arch/arm64/Kconfig | 16 ++++++++++++++++ arch/arm64/kernel/cpu_errata.c | 16 ++++++++++++++++ arch/arm64/kernel/cpufeature.c | 11 ++++++++++- arch/arm64/tools/cpucaps | 1 + 5 files changed, 47 insertions(+), 1 deletion(-)Documentation/arm64/silicon-errata.rst +4
-0@@ -82,10 +82,14 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A57 | #1319537 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A57 | #1742098 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #853709 | N/A | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #1319367 | ARM64_ERRATUM_1319367 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A72 | #1655431 | ARM64_ERRATUM_1742098 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A73 | #858921 | ARM64_ERRATUM_858921 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A76 | #1188873,1418040| ARM64_ERRATUM_1418040 |arch/arm64/Kconfig +16
-0@@ -491,6 +491,22 @@ config ARM64_ERRATUM_834220 If unsure, say Y. +config ARM64_ERRATUM_1742098 + bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence" + depends on COMPAT + default y + help + This option removes the AES hwcap for aarch32 user-space to + workaround erratum 1742098 on Cortex-A57 and Cortex-A72. + + Affected parts may corrupt the AES state if an interrupt is + taken between a pair of AES instructions. These instructions + are only present if the cryptography extensions are present. + All software should have a fallback implementation for CPUs + that don't implement the cryptography extensions. + + If unsure, say Y. + config ARM64_ERRATUM_845719 bool "Cortex-A53: 845719: a load might read incorrect data" depends on COMPATarch/arm64/kernel/cpu_errata.c +0
-0
arch/arm64/kernel/cpu_errata.c static struct midr_range trbe_write_out_of_range_cpus[] = { · line 402
Quoted 10 lines
arch/arm64/kernel/cpu_errata.c +7
-0@@ -393,6 +393,14 @@ static struct midr_range trbe_write_out_of_range_cpus[] = { };#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */ +#ifdef CONFIG_ARM64_ERRATUM_1742098 +static struct midr_range broken_aarch32_aes[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_A57 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A72 ), + {}, +}; +#endif /* CONFIG_ARM64_WORKAROUND_TRBE_WRITE_OUT_OF_RANGE */
Comment here is wrong ^^^
Quoted 24 lines
arch/arm64/kernel/cpu_errata.c +9
-0+ const struct arm64_cpu_capabilities arm64_errata[] = { #ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE {@@ -655,6 +663,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = {/* Cortex-A510 r0p0 - r0p1 */ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 1) }, +#endif +#ifdef CONFIG_ARM64_ERRATUM_1742098 + { + .desc = "ARM erratum 1742098", + .capability = ARM64_WORKAROUND_1742098, + CAP_MIDR_RANGE_LIST(broken_aarch32_aes), + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + }, #endif { }arch/arm64/kernel/cpufeature.c +0
-0
arch/arm64/kernel/cpufeature.c static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) · line 1929
Quoted 8 lines
arch/arm64/kernel/cpufeature.c +5
-0@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */ +static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +}
How does this deal with big/little if we late online an affected CPU? It would probably be easier if we treated these CPUs as not having the 32-bit AES instructions at all (rather than removing the hwcap later), then the early cap check would prevent late onlining.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
Hi Will,
(CC: +Suzuki)
Quoted 21 lines · Will Deacon
Quoted 20 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
arch/arm64/kernel/cpufeature.c +0
-0@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */
Quoted 10 lines
arch/arm64/kernel/cpufeature.c static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) · line 1929
Quoted 5 lines
arch/arm64/kernel/cpufeature.c +5
-0+static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +}How does this deal with big/little if we late online an affected CPU? It would probably be easier if we treated these CPUs as not having the 32-bit AES instructions at all (rather than removing the hwcap later), then the early cap check would prevent late onlining.
I thought any new CPU to online late with a new errata was rejected by the type == ARM64_CPUCAP_LOCAL_CPU_ERRATUM. Suzuki's documentation in cpufeature.h has:
| However, it is not safe if a "late" CPU requires a workaround and the system hasn't | enabled it already.
In this case verify_local_cpu_caps() would take the else for 'system_has_cap', and because the cpu matches, but ARM64_CPUCAP_LOCAL_CPU_ERRATUM doesn't have the 'late cpu permitted' bit set, it should call cpu_die_early().
That said - I haven't tested this configuration. (I'll give it a go with the model)
v1 did as you suggest - but the HWCAPs are built from the id registers, and touching the id registers will regress KVM guest migration as the id registers are both visible to Qemu, and invariant.
Thanks,
James
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerRe: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
Quoted 38 lines · James Morse
Quoted 21 lines · Will Deacon
Quoted 20 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
arch/arm64/kernel/cpufeature.c +0
-0@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */ Quoted 10 lines
arch/arm64/kernel/cpufeature.c static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) · line 1929
Quoted 5 lines
arch/arm64/kernel/cpufeature.c +5
-0+static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +}How does this deal with big/little if we late online an affected CPU? It would probably be easier if we treated these CPUs as not having the 32-bit AES instructions at all (rather than removing the hwcap later), then the early cap check would prevent late onlining.
I thought any new CPU to online late with a new errata was rejected by the type ==
ARM64_CPUCAP_LOCAL_CPU_ERRATUM. Suzuki's documentation incpufeature.hhas:
| However, it is not safe if a "late" CPU requires a workaround and the system hasn't | enabled it already.
Quoted 5 lines
In this case
verify_local_cpu_caps()would take the else for 'system_has_cap', and because the cpu matches, butARM64_CPUCAP_LOCAL_CPU_ERRATUMdoesn't have the 'late cpu permitted' bit set, it should callcpu_die_early().That said - I haven't tested this configuration. (I'll give it a go with the model)
Ah yes, that probably works, but please do test it to confirm.
Quoted 3 lines
v1 did as you suggest - but the HWCAPs are built from the id registers, and touching the id registers will regress KVM guest migration as the id registers are both visible to Qemu, and invariant.
Hmm, is that really something we expect to work in general? It seems to me that any erratum workaround which effectively removes functionality is going to be a blocker for migration.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 1/2] arm64: errata: Remove AES hwcap for COMPAT tasks
Hi Will,
Quoted 47 lines · Will Deacon
Quoted 38 lines · James Morse
Quoted 21 lines · Will Deacon
Quoted 20 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
arch/arm64/kernel/cpufeature.c +0
-0@@ -1922,6 +1922,12 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) }#endif /* CONFIG_ARM64_MTE */ Quoted 10 lines
arch/arm64/kernel/cpufeature.c static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) · line 1929
Quoted 5 lines
arch/arm64/kernel/cpufeature.c +5
-0+static void elf_hwcap_fixup (void ) +{ +if (cpus_have_const_cap (ARM64_WORKAROUND_1742098 )) + compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES ; +}How does this deal with big/little if we late online an affected CPU? It would probably be easier if we treated these CPUs as not having the 32-bit AES instructions at all (rather than removing the hwcap later), then the early cap check would prevent late onlining.
I thought any new CPU to online late with a new errata was rejected by the type ==
ARM64_CPUCAP_LOCAL_CPU_ERRATUM. Suzuki's documentation incpufeature.hhas:
| However, it is not safe if a "late" CPU requires a workaround and the system hasn't | enabled it already.Quoted 5 lines
In this case
verify_local_cpu_caps()would take the else for 'system_has_cap', and because the cpu matches, butARM64_CPUCAP_LOCAL_CPU_ERRATUMdoesn't have the 'late cpu permitted' bit set, it should callcpu_die_early().That said - I haven't tested this configuration. (I'll give it a go with the model)
Ah yes, that probably works, but please do test it to confirm.
Quoted 7 lines
Quoted 3 lines
v1 did as you suggest - but the HWCAPs are built from the id registers, and touching the id registers will regress KVM guest migration as the id registers are both visible to Qemu, and invariant.
Hmm, is that really something we expect to work in general? It seems to me that any erratum workaround which effectively removes functionality is going to be a blocker for migration.
The workaround is only for the host. The guest may already have the workaround. I think these things should be kept separate unless the guest would be broken by the workaround.
We don't normally apply workaround for EL1 from EL2 unless its needed by the host. Its up to the guest to have its own workaround.
Thanks,
James
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/2 ARM: Remove AES hwcap for parts affected by errata
In reply to James MorseCortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
--- arch/arm/kernel/setup.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/kernel/setup.c +9 -0
@@ -501,6 +501,15 @@ static void __init elf_hwcap_fixup(void)return ; } +/* +* HWCAP2_AES can get the wrong result due to A57's erratum #1742098 or +* A72's #1655431. +*/ +if (read_cpuid_part () ==ARM_CPU_PART_CORTEX_A57 || +read_cpuid_part () ==ARM_CPU_PART_CORTEX_A72 ) { + elf_hwcap2 &= ~HWCAP2_AES ; + } +/* Verify if CPUID scheme is implemented */ if ((id &0x000f0000 ) !=0x000f0000 )return ;
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 2/2] ARM: Remove AES hwcap for parts affected by errata
Quoted 10 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Quoted 4 lines
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
Signed-off-by James Morse <[email protected]>
Quoted 25 lines
--- arch/arm/kernel/setup.c | 9 +++++++++ 1 file changed, 9 insertions(+)arch/arm/kernel/setup.c +9
-1@@ -501,6 +501,15 @@ static void __init elf_hwcap_fixup(void)return ; } +/* +* HWCAP2_AES can get the wrong result due to A57's erratum #1742098 or +* A72's #1655431. +*/ +if (read_cpuid_part () ==ARM_CPU_PART_CORTEX_A57 || +read_cpuid_part () ==ARM_CPU_PART_CORTEX_A72 ) { + elf_hwcap2 &= ~HWCAP2_AES ; + } +/* Verify if CPUID scheme is implemented */ if ((id &0x000f0000 ) !=0x000f0000 )return ; --
Quoted 2 lines
2.30.2
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Russell King (Oracle)
maintainerRe: [PATCH v2 2/2] ARM: Remove AES hwcap for parts affected by errata
In reply to James MorseQuoted 9 lines · James Morse
Cortex-A57 and Cortex-A72 have an erratum where an interrupt that occurs between a pair of AES instructions in aarch32 mode may corrupt the ELR. The task will subsequently produce the wrong AES result.
The AES instructions are part of the cryptographic extensions, which are optional. User-space software will detect the support for these instructions from the hwcaps. If the platform doesn't support these instructions a software implementation should be used.
Quoted 4 lines
Remove the hwcap bits on affected parts to indicate user-space should not use the AES instructions.
Signed-off-by James Morse <[email protected]>
Thanks James. LGTM. In time, can you drop this in the patch system please? I'm guessing we're only going to have Ard's ack on this.
Thanks.
Signature · 7 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last! _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 8 lines · James Morse
Hello,
These patches remove the AES HWCAP on A57 and A72 for aarch32 user-space processes due to erratum #1742098 and #1655431. An interrupt between two instructions will cause these parts to get the wrong result. These extensions are optional, so software should have a fallback implementation.
Quoted 8 lines
The 32bit patch is new for v2, as Ard points out the behaviour should be the same here.
Operating on the HWCAP bitmap directly avoids affecting KVM, which was the problem with v1. But it does mean
HWCAP_PMULLis still visible to aarch32 processes. This isn't affected by the erratum, but is detected from the same field in the ID register. PMULL is value '2', AES is value '1'. User-space would be crazy to let PMULL imply AES, right ...
That seems like a completely sensible thing for userspace to do :/
The Arm ARM states:
AES, bits [7:4]
Indicates support for AES instructions in AArch64 state. Defined values are:
0b0000 No AES instructions implemented.
0b0001 AESE, AESD, AESMC, and AESIMC instructions implemented.
0b0010 As for 0b0001 , plus PMULL/PMULL2 instructions operating on 64-bit data quantities.
So PMULL is defined to include AES.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel