Skip to content

arm64: errata: Speculative SSBS workaround

Mark Rutland stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest13 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13arm64: Add Neoverse-V2 partarch/arm64/include/asm/cputype.h+2 -00 replies
2/13arm64: barrier: Restore spec_bar() macroarch/arm64/include/asm/barrier.h+4 -00 replies
3/13arm64: cputype: Add Cortex-X4 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
4/13arm64: cputype: Add Neoverse-V3 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
5/13arm64: errata: Add workaround for Arm errata 3194386 and 3312417Documentation/arch/arm64/silicon-errata.rst arch/arm64/Kconfig arch/arm64/kernel/cpu_errata.c +3 more+90 -00 replies
6/13arm64: cputype: Add Cortex-X3 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
7/13arm64: cputype: Add Cortex-A720 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
8/13arm64: cputype: Add Cortex-X925 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
9/13arm64: errata: Unify speculative SSBS errata logicDocumentation/arch/arm64/silicon-errata.rst arch/arm64/Kconfig arch/arm64/kernel/cpu_errata.c +1 more+8 -330 replies
10/13arm64: errata: Expand speculative SSBS workaroundDocumentation/arch/arm64/silicon-errata.rst arch/arm64/Kconfig arch/arm64/kernel/cpu_errata.c+30 -20 replies
11/13arm64: cputype: Add Cortex-X1C definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
12/13arm64: cputype: Add Cortex-A725 definitionsarch/arm64/include/asm/cputype.h+2 -00 replies
13/13arm64: errata: Expand speculative SSBS workaround (again)Documentation/arch/arm64/silicon-errata.rst arch/arm64/Kconfig arch/arm64/kernel/cpu_errata.c+44 -73 replies

Reviews trailers per patch

4 of 13 patches have a Reviewed-by or Acked-by.

PatchJames ClarkAnshuman KhandualWill Deacon
1/13R-b
2/13
3/13
4/13
5/13
6/13
7/13
8/13
9/13
10/13
11/13R-b
12/13R-b
13/13R-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [PATCH 6.6.y 0/13] arm64: errata: Speculative SSBS workaround

Hi,

This series is a v6.6-only backport (based on v6.6.44) of the upstream workaround for SSBS errata on Arm Ltd CPUs, as affected parts are likely to be used with stable kernels. This does not apply to earlier stable trees, which will receive a separate backport.

The errata mean that an MSR to the SSBS special-purpose register does not affect subsequent speculative instructions, permitting speculative store bypassing for a window of time.

The upstream support was original posted as:

* https://lore.kernel.org/linux-arm-kernel/[email protected]/
"arm64: errata: Add workaround for Arm errata 3194386 and 3312417" Present in v6.10

* https://lore.kernel.org/linux-arm-kernel/[email protected]/
"arm64: errata: Expand speculative SSBS workaround"
Present in v6.11-rc1

* https://lore.kernel.org/linux-arm-kernel/[email protected]/
"arm64: errata: Expand speculative SSBS workaround (again)"
Present in v6.11-rc2

This backport applies the patches which are not present in v6.6.y, and as prerequisites backports the addition of the Neoverse-V2 MIDR values and the restoration of the spec_bar() macro.

I have tested the backport (when applied to v6.6.44), ensuring that the detection logic works and that the HWCAP and string in /proc/cpuinfo are both hidden when the relevant errata are detected.

Mark.Besar Wicaksono (1):
arm64: Add Neoverse-V2 part

Mark Rutland (12):
arm64: barrier: Restore spec_bar() macro
arm64: cputype: Add Cortex-X4 definitions
arm64: cputype: Add Neoverse-V3 definitions
arm64: errata: Add workaround for Arm errata 3194386 and 3312417
arm64: cputype: Add Cortex-X3 definitions
arm64: cputype: Add Cortex-A720 definitions
arm64: cputype: Add Cortex-X925 definitions
arm64: errata: Unify speculative SSBS errata logic
arm64: errata: Expand speculative SSBS workaround
arm64: cputype: Add Cortex-X1C definitions
arm64: cputype: Add Cortex-A725 definitions
arm64: errata: Expand speculative SSBS workaround (again)

 Documentation/arch/arm64/silicon-errata.rst | 36 +++++++++++++++++++
 arch/arm64/Kconfig                          | 38 +++++++++++++++++++++
 arch/arm64/include/asm/barrier.h            |  4 +++
 arch/arm64/include/asm/cputype.h            | 16 +++++++++
 arch/arm64/kernel/cpu_errata.c              | 31 +++++++++++++++++
 arch/arm64/kernel/cpufeature.c              | 12 +++++++
 arch/arm64/kernel/proton-pack.c             | 12 +++++++
 arch/arm64/tools/cpucaps                    |  1 +
 8 files changed, 150 insertions(+)
Signature · 1 line
2.30.2