arm64: Allow erratum 1418040 for late CPUs
v3 cover arm64: Allow erratum 1418040 for late CPUs
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Note that CPUs affected by 1418040 also tend to miss AArch32-EL1, meaning they cannot be used as late CPUs when KVM is enabled and that their sibblings have AArch32-EL1.
* From v1:
- Dropped check for kernel threads
- Added comment describing the switching logic
- Made the errata handling function __always_inline
* From v2:
- Dropped __always_inline again
- Simplified logic
Marc Zyngier (2):
arm64: Move handling of erratum 1418040 into C code
arm64: Allow booting of late CPUs affected by erratum 1418040
arch/arm64/kernel/cpu_errata.c | 2 ++ arch/arm64/kernel/entry.S | 21 -------------------- arch/arm64/kernel/process.c | 35 ++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 21 deletions(-)
Signature · 21 lines
2.27.0 *** BLURB HERE *** Marc Zyngier (2): arm64: Move handling of erratum 1418040 into C code arm64: Allow booting of late CPUs affected by erratum 1418040 arch/arm64/kernel/cpu_errata.c | 2 ++ arch/arm64/kernel/entry.S | 21 --------------------- arch/arm64/kernel/process.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 21 deletions(-) -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 1/2 arm64: Move handling of erratum 1418040 into C code
Instead of dealing with erratum 1418040 on each entry and exit, let's move the handling to __switch_to() instead, which has several advantages:
- It can be applied when it matters (switching between 32 and 64 bit tasks).
- It is written in C (yay!)
- It can rely on static keys rather than alternatives
--- arch/arm64/kernel/entry.S | 21 --------------------- arch/arm64/kernel/process.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 21 deletions(-)
arch/arm64/kernel/entry.S +0 -21
@@ -169,19 +169,6 @@ alternative_cb_end stp x28, x29, [sp, #16 * 14] .if \el == 0 - .if \regsize == 32 - /* - * If we're returning from a 32-bit task on a system affected by - * 1418040 then re-enable userspace access to the virtual counter. - */ -#ifdef CONFIG_ARM64_ERRATUM_1418040 -alternative_if ARM64_WORKAROUND_1418040 - mrs x0, cntkctl_el1 - orr x0, x0, #2 // ARCH_TIMER_USR_VCT_ACCESS_EN - msr cntkctl_el1, x0 -alternative_else_nop_endif -#endif - .endif clear_gp_regs mrs x21, sp_el0 ldr_this_cpu tsk, __entry_task, x20
@@ -337,14 +324,6 @@ alternative_else_nop_endif tst x22, #PSR_MODE32_BIT // native task? b.eq 3f -#ifdef CONFIG_ARM64_ERRATUM_1418040 -alternative_if ARM64_WORKAROUND_1418040 - mrs x0, cntkctl_el1 - bic x0, x0, #2 // ARCH_TIMER_USR_VCT_ACCESS_EN - msr cntkctl_el1, x0 -alternative_else_nop_endif -#endif - #ifdef CONFIG_ARM64_ERRATUM_845719 alternative_if ARM64_WORKAROUND_845719 #ifdef CONFIG_PID_IN_CONTEXTIDR
arch/arm64/kernel/process.c +34 -0
@@ -515,6 +515,39 @@ static void entry_task_switch(struct task_struct *next)__this_cpu_write (__entry_task, next); } +/* +* ARM erratum 1418040 handling, affecting the 32bit view of CNTVCT. +* Assuming the virtual counter is enabled at the beginning of times: +* +* - disable access when switching from a 64bit task to a 32bit task +* - enable access when switching from a 32bit task to a 64bit task +*/ +static void erratum_1418040_thread_switch (struct task_struct *prev, +struct task_struct *next) +{ +bool prev32, next32; +u64 val; + +if (!(IS_ENABLED (CONFIG_ARM64_ERRATUM_1418040 ) && +cpus_have_const_cap (ARM64_WORKAROUND_1418040 ))) +return ; + + prev32 =is_compat_thread (task_thread_info (prev)); + next32 =is_compat_thread (task_thread_info (next)); + +if (prev32 == next32) +return ; + + val =read_sysreg (cntkctl_el1); + +if (!next32) + val |=ARCH_TIMER_USR_VCT_ACCESS_EN ; +else + val &= ~ARCH_TIMER_USR_VCT_ACCESS_EN ; + +write_sysreg (val, cntkctl_el1); +} +/* * Thread switching. */
@@ -530,6 +563,7 @@ __notrace_funcgraph struct task_struct *__switch_to(struct task_struct *prev,entry_task_switch (next);uao_thread_switch (next);ssbs_thread_switch (next); +erratum_1418040_thread_switch (prev, next);/* * Complete any pending TLB or cache maintenance on this CPU in case
Signature · 7 lines
2.27.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v3 1/2] arm64: Move handling of erratum 1418040 into C code
Quoting Marc Zyngier (2020-07-31 10:38:23)
Quoted 9 lines
Instead of dealing with erratum 1418040 on each entry and exit, let's move the handling to
__switch_to()instead, which has several advantages:- It can be applied when it matters (switching between 32 and 64 bit tasks).
- It is written in C (yay!)
- It can rely on static keys rather than alternatives
Quoted 4 lines
Tested-by Sai Prakash Ranjan <[email protected]>Acked-by Will Deacon <[email protected]>Signed-off-by Marc Zyngier <[email protected]>---
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v3 2/2 arm64: Allow booting of late CPUs affected by erratum 1418040
In reply to Marc ZyngierAs we can now switch from a system that isn't affected by 1418040 to a system that globally is affected, let's allow affected CPUs to come in at a later time.
--- arch/arm64/kernel/cpu_errata.c | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/kernel/cpu_errata.c +2 -0
@@ -910,6 +910,8 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .desc = "ARM erratum 1418040", .capability =ARM64_WORKAROUND_1418040 ,ERRATA_MIDR_RANGE_LIST (erratum_1418040_list), + .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU ), }, #endif #ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT
Signature · 7 lines
2.27.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0
NOTE: patch 2 seems to have come in through a stable merge onto Chrome OS 5.4 and is causing a regression when resuming from suspend. In the short term we've got a revert going into our tree:
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
-Doug
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 28 lines · Doug Anderson
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0NOTE: patch 2 seems to have come in through a stable merge onto Chrome OS 5.4 and is causing a regression when resuming from suspend. In the short term we've got a revert going into our tree:
Quoted 8 lines
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
The rootcause is pretty straightforward however I'm afraid the solution isn't so but I may be mistaken, so this happens on big.LITTLE systems with CPUs differing in erratum 1418040 which was applicable only for big cores and not little cores. So when trying to bringup little cores during resume, there is a conflict as below (messages snipped from the internal bug for more visibility).
Enabling non-boot CPUs ...
CPU features: CPU1: Detected conflict for capability 35 (ARM erratum 1418040), System: 1, CPU: 0
CPU1: will not boot
CPU1: will not boot
CPU1: failed to come online
psci: CPU1 killed (polled 0 ms)
CPU1: died during early boot
Error taking CPU1 up: -5
Thanks,
Sai
Signature · 7 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 46 lines · Sai Prakash Ranjan
Quoted 28 lines · Doug Anderson
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0NOTE: patch 2 seems to have come in through a stable merge onto Chrome OS 5.4 and is causing a regression when resuming from suspend. In the short term we've got a revert going into our tree:
Quoted 8 lines
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
The rootcause is pretty straightforward however I'm afraid the solution isn't so but I may be mistaken, so this happens on big.LITTLE systems with CPUs differing in erratum 1418040 which was applicable only for big cores and not little cores. So when trying to bringup little cores during resume, there is a conflict as below (messages snipped from the internal bug for more visibility).
Quoted 9 lines
Enabling non-boot CPUs ...
CPU features: CPU1: Detected conflict for capability 35 (ARM erratum 1418040), System: 1, CPU: 0
CPU1: will not boot
CPU1: will not boot
CPU1: failed to come online
psci: CPU1 killed (polled 0 ms)
CPU1: died during early boot
Error taking CPU1 up: -5
This is becoming very annoying... By allowing the buggy CPUs to come in late, we have made it impossible for the good ones to work correctly.
Can you try this (untested yet, I'm dealing with another bucket of errata at the moment):
arch/arm64/kernel/cpu_errata.c +1 -0
@@ -477,6 +477,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .capability = ARM64_WORKAROUND_1418040, ERRATA_MIDR_RANGE_LIST(erratum_1418040_list), .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | + ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU | ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU), },#endif
Thanks,
M.
Signature · 6 lines
Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 75 lines · Marc Zyngier
Quoted 46 lines · Sai Prakash Ranjan
Quoted 28 lines · Doug Anderson
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0NOTE: patch 2 seems to have come in through a stable merge onto Chrome OS 5.4 and is causing a regression when resuming from suspend. In the short term we've got a revert going into our tree:
Quoted 8 lines
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
The rootcause is pretty straightforward however I'm afraid the solution isn't so but I may be mistaken, so this happens on big.LITTLE systems with CPUs differing in erratum 1418040 which was applicable only for big cores and not little cores. So when trying to bringup little cores during resume, there is a conflict as below (messages snipped from the internal bug for more visibility).
Quoted 9 lines
Enabling non-boot CPUs ...
CPU features: CPU1: Detected conflict for capability 35 (ARM erratum 1418040), System: 1, CPU: 0
CPU1: will not boot
CPU1: will not boot
CPU1: failed to come online
psci: CPU1 killed (polled 0 ms)
CPU1: died during early boot
Error taking CPU1 up: -5This is becoming very annoying... By allowing the buggy CPUs to come in late, we have made it impossible for the good ones to work correctly.
Can you try this (untested yet, I'm dealing with another bucket of errata at the moment):
arch/arm64/kernel/cpu_errata.c +1
-0@@ -477,6 +477,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .capability = ARM64_WORKAROUND_1418040,ERRATA_MIDR_RANGE_LIST (erratum_1418040_list), .type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU | ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU), },
Quoted 2 lines
#endif
Yes, this works.
Thanks,
Sai
Signature · 7 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Will Deacon
maintainerQuoted 75 lines · Sai Prakash Ranjan
Quoted 74 lines · Marc Zyngier
Quoted 48 lines · Sai Prakash Ranjan
Quoted 30 lines · Doug Anderson
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0NOTE: patch 2 seems to have come in through a stable merge onto Chrome
OS 5.4 and is causing a regression when resuming from suspend. In the
short term we've got a revert going into our tree:Quoted 8 lines
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
The rootcause is pretty straightforward however I'm afraid the solution isn't so but I may be mistaken, so this happens on big.LITTLE systems with CPUs differing in erratum 1418040 which was applicable only for big cores and not little cores. So when trying to bringup little cores during resume, there is a conflict as below (messages snipped from the internal bug for more visibility).
Quoted 9 lines
Enabling non-boot CPUs ...
CPU features: CPU1: Detected conflict for capability 35 (ARM erratum 1418040), System: 1, CPU: 0
CPU1: will not boot
CPU1: will not boot
CPU1: failed to come online
psci: CPU1 killed (polled 0 ms)
CPU1: died during early boot
Error taking CPU1 up: -5This is becoming very annoying... By allowing the buggy CPUs to come in late, we have made it impossible for the good ones to work correctly.
Can you try this (untested yet, I'm dealing with another bucket of errata at the moment):
arch/arm64/kernel/cpu_errata.c +0
-0@@ -477,6 +477,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .capability = ARM64_WORKAROUND_1418040, ERRATA_MIDR_RANGE_LIST(erratum_1418040_list),
Quoted 8 lines
Quoted 6 lines
arch/arm64/kernel/cpu_errata.c +1
-0.type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU | ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU), },#endif
Yes, this works.
Maybe we should spell it "ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE" and add a comment about the "feature"?
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 85 lines · Will Deacon
Quoted 75 lines · Sai Prakash Ranjan
Quoted 74 lines · Marc Zyngier
Quoted 48 lines · Sai Prakash Ranjan
Quoted 30 lines · Doug Anderson
Hi,
Quoted 11 lines · Catalin Marinas
Quoted 9 lines · Marc Zyngier
Erratum 1418040 currently prevents a late CPU from booting if none of the early CPUs are affected by it. This is because the handling is implemented as alternatives, and we have already got rid of them by the time userspace onlines a new CPU.
A solution to this is to move everything into C code, and rely on static keys instead. Once this is done, the feature can be allowed for late CPUs.
Quoted 8 lines
Quoted 1 line
[...]
Applied to arm64 (for-next/fixes), thanks!
[1/2] arm64: Move handling of erratum 1418040 into C code
https://git.kernel.org/arm64/c/d49f7d7376d0 [2/2] arm64: Allow booting of late CPUs affected by erratum 1418040 https://git.kernel.org/arm64/c/bf87bb0881d0NOTE: patch 2 seems to have come in through a stable merge onto Chrome
OS 5.4 and is causing a regression when resuming from suspend. In the
short term we've got a revert going into our tree:Quoted 8 lines
...but that's obviously not a long term fix. I haven't done any debugging of this myself, though I can if there's nobody more qualified to do it and/or nobody else has time. I'm just trying to make sure that the problem is reported somewhere where others might notice it rather than in an obscure Chrome OS tree. ;-)
The rootcause is pretty straightforward however I'm afraid the solution isn't so but I may be mistaken, so this happens on big.LITTLE systems with CPUs differing in erratum 1418040 which was applicable only for big cores and not little cores. So when trying to bringup little cores during resume, there is a conflict as below (messages snipped from the internal bug for more visibility).
Quoted 9 lines
Enabling non-boot CPUs ...
CPU features: CPU1: Detected conflict for capability 35 (ARM erratum 1418040), System: 1, CPU: 0
CPU1: will not boot
CPU1: will not boot
CPU1: failed to come online
psci: CPU1 killed (polled 0 ms)
CPU1: died during early boot
Error taking CPU1 up: -5This is becoming very annoying... By allowing the buggy CPUs to come in late, we have made it impossible for the good ones to work correctly.
Can you try this (untested yet, I'm dealing with another bucket of errata at the moment):
arch/arm64/kernel/cpu_errata.c +0
-0@@ -477,6 +477,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .capability = ARM64_WORKAROUND_1418040, ERRATA_MIDR_RANGE_LIST(erratum_1418040_list),Quoted 8 lines
Quoted 6 lines
arch/arm64/kernel/cpu_errata.c +1
-0.type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU | +ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU | ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU), },#endif
Yes, this works.
Quoted 2 lines
Maybe we should spell it "
ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE" and add a comment about the "feature"?
Yeah, that's exactly what it amounts to. Patch incoming.
M.
Signature · 6 lines
Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel