Skip to content

arm64: Mitigate spectre style branch history side channels

James Morse linux-arm-kernel lkml stable 1 version Applied

Status from this message: This is a note to let you know that I've just added the patch titled

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest27 patches 2 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/27arm64: arch_timer: Add workaround for ARM erratum 1188873arch/arm64/Kconfig arch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/cputype.h +2 more+39 -10 replies
2/27arm64: arch_timer: avoid unused function warningarch/arm64/Kconfig+1 -00 replies
3/27arm64: Add silicon-errata.txt entry for ARM erratum 1188873Documentation/arm64/silicon-errata.txt+1 -00 replies
4/27arm64: Make ARM64_ERRATUM_1188873 depend on COMPATarch/arm64/Kconfig+1 -00 replies
5/27arm64: Add part number for Neoverse N1arch/arm64/include/asm/cputype.h+2 -00 replies
6/27arm64: Add part number for Arm Cortex-A77arch/arm64/include/asm/cputype.h+2 -00 replies
7/27arm64: Add Neoverse-N2, Cortex-A710 CPU part definitionarch/arm64/include/asm/cputype.h+4 -00 replies
8/27arm64: Add Cortex-X2 CPU part definitionarch/arm64/include/asm/cputype.h+2 -01 reply
9/27arm64: entry.S: Add ventry overflow sanity checksarch/arm64/kernel/entry.S+3 -00 replies
10/27arm64: entry: Make the trampoline cleanup optionalarch/arm64/kernel/entry.S+7 -30 replies
11/27arm64: entry: Free up another register on kpti's tramp_exit patharch/arm64/kernel/entry.S+12 -60 replies
12/27arm64: entry: Move the trampoline data page before the text pagearch/arm64/include/asm/fixmap.h arch/arm64/kernel/entry.S+7 -20 replies
13/27arm64: entry: Allow tramp_alias to access symbols after the 4K boundaryarch/arm64/kernel/entry.S+7 -40 replies
14/27arm64: entry: Don't assume tramp_vectors is the start of the vectorsarch/arm64/kernel/entry.S+15 -130 replies
15/27arm64: entry: Move trampoline macros out of ifdef'd sectionarch/arm64/kernel/entry.S+6 -60 replies
16/27arm64: entry: Make the kpti trampoline's kpti sequence optionalarch/arm64/kernel/entry.S+11 -60 replies
17/27arm64: entry: Allow the trampoline text to occupy multiple pagesarch/arm64/include/asm/fixmap.h arch/arm64/include/asm/sections.h arch/arm64/kernel/entry.S +2 more+20 -70 replies
18/27arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigationsarch/arm64/kernel/entry.S+33 -10 replies
19/27arm64: entry: Add vectors that have the bhb mitigation sequencesarch/arm64/include/asm/assembler.h arch/arm64/include/asm/vectors.h arch/arm64/kernel/entry.S +1 more+110 -90 replies
20/27arm64: entry: Add macro for reading symbol addresses from the trampolinearch/arm64/kernel/entry.S+15 -60 replies
21/27arm64: Add percpu vectors for EL1arch/arm64/include/asm/mmu.h arch/arm64/include/asm/vectors.h arch/arm64/kernel/cpufeature.c +2 more+56 -90 replies
22/27arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c+43 -30 replies
23/27KVM: arm64: Add templates for BHB mitigation sequencesarch/arm64/include/asm/cpucaps.h arch/arm64/include/asm/kvm_mmu.h arch/arm64/include/asm/mmu.h +2 more+128 -40 replies
24/27arm64: Mitigate spectre style branch history side channelsarch/arm64/Kconfig arch/arm64/include/asm/assembler.h arch/arm64/include/asm/cpufeature.h +5 more+316 -30 replies
25/27KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migratedarch/arm/include/asm/kvm_host.h arch/arm64/include/asm/kvm_host.h virt/kvm/arm/psci.c+23 -00 replies
26/27arm64: add ID_AA64ISAR2_EL1 sys registerarch/arm64/include/asm/cpu.h arch/arm64/include/asm/sysreg.h arch/arm64/kernel/cpufeature.c +1 more+12 -00 replies
27/27arm64: Use the clearbhb instruction in mitigationsarch/arm64/include/asm/assembler.h arch/arm64/include/asm/cpufeature.h arch/arm64/include/asm/sysreg.h +5 more+58 -00 replies

Reviews trailers per patch

23 of 27 patches have a Reviewed-by or Acked-by.

PatchMark RutlandMarc ZyngierCatalin MarinasAnshuman KhandualSuzuki K PouloseRussell King (Oracle)
1/27A-b
2/27A-b
3/27
4/27
5/27
6/27A-b
7/27A-b R-b
8/27R-b R-b
9/27R-b R-b
10/27R-b R-b
11/27R-b R-b
12/27R-b R-b
13/27R-b R-b
14/27R-b R-b
15/27R-b R-b
16/27R-b R-b
17/27R-b
18/27R-b R-b
19/27R-b
20/27R-b
21/27R-b
22/27R-b
23/27
24/27R-b
25/27R-b R-b
26/27A-b
27/27R-b R-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 6 reviewers.

Read the v1 thread

Cover letter [stable:PATCH v4.14.274 00/27] arm64: Mitigate spectre style branch history side channels

Hello!

This is the spectre-bhb backport for v4.14.
This comes with an A76 timer workaround. v4.14 doesn't have a compat vdso, so doesn't need all the patches for that workaround. In particular, it doesn't need Marc's series:
https://lore.kernel.org/linux-arm-kernel/[email protected]/

I included the Kconfig change that restricts this to COMPAT, but not commit 0f80cad3124f ("arm64: Restrict ARM64_ERRATUM_1188873 mitigation to AArch32"), which is an invasive performance optimisation that wasn't marked as being for stable.

Thanks,

James

Anshuman Khandual (1):
arm64: Add Cortex-X2 CPU part definition

Arnd Bergmann (1):
arm64: arch_timer: avoid unused function warning

James Morse (19):
arm64: entry.S: Add ventry overflow sanity checks
arm64: entry: Make the trampoline cleanup optional
arm64: entry: Free up another register on kpti's tramp_exit path
arm64: entry: Move the trampoline data page before the text page
arm64: entry: Allow tramp_alias to access symbols after the 4K
boundary
arm64: entry: Don't assume tramp_vectors is the start of the vectors
arm64: entry: Move trampoline macros out of ifdef'd section
arm64: entry: Make the kpti trampoline's kpti sequence optional
arm64: entry: Allow the trampoline text to occupy multiple pages
arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
arm64: entry: Add vectors that have the bhb mitigation sequences
arm64: entry: Add macro for reading symbol addresses from the
trampoline
arm64: Add percpu vectors for EL1
arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of
Spectre-v2
KVM: arm64: Add templates for BHB mitigation sequences
arm64: Mitigate spectre style branch history side channels
KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and
migrated
arm64: add ID_AA64ISAR2_EL1 sys register
arm64: Use the clearbhb instruction in mitigations

Marc Zyngier (4):
arm64: arch_timer: Add workaround for ARM erratum 1188873
arm64: Add silicon-errata.txt entry for ARM erratum 1188873
arm64: Make ARM64_ERRATUM_1188873 depend on COMPAT
arm64: Add part number for Neoverse N1

Rob Herring (1):
arm64: Add part number for Arm Cortex-A77

Suzuki K Poulose (1):
arm64: Add Neoverse-N2, Cortex-A710 CPU part definition

 Documentation/arm64/silicon-errata.txt |   1 +
 arch/arm/include/asm/kvm_host.h        |   6 +
 arch/arm64/Kconfig                     |  24 ++
 arch/arm64/include/asm/assembler.h     |  34 +++
 arch/arm64/include/asm/cpu.h           |   1 +
 arch/arm64/include/asm/cpucaps.h       |   4 +-
 arch/arm64/include/asm/cpufeature.h    |  39 +++
 arch/arm64/include/asm/cputype.h       |  20 ++
 arch/arm64/include/asm/fixmap.h        |   6 +-
 arch/arm64/include/asm/kvm_host.h      |   5 +
 arch/arm64/include/asm/kvm_mmu.h       |   2 +-
 arch/arm64/include/asm/mmu.h           |   8 +-
 arch/arm64/include/asm/sections.h      |   6 +
 arch/arm64/include/asm/sysreg.h        |   5 +
 arch/arm64/include/asm/vectors.h       |  74 +++++
 arch/arm64/kernel/bpi.S                |  55 ++++
 arch/arm64/kernel/cpu_errata.c         | 395 ++++++++++++++++++++++++-
 arch/arm64/kernel/cpufeature.c         |  21 ++
 arch/arm64/kernel/cpuinfo.c            |   1 +
 arch/arm64/kernel/entry.S              | 198 ++++++++++---
 arch/arm64/kernel/vmlinux.lds.S        |   2 +-
 arch/arm64/kvm/hyp/hyp-entry.S         |   4 +
 arch/arm64/kvm/hyp/switch.c            |   9 +-
 arch/arm64/mm/mmu.c                    |  11 +-
 drivers/clocksource/arm_arch_timer.c   |  15 +
 include/linux/arm-smccc.h              |   7 +
 virt/kvm/arm/psci.c                    |  12 +
 27 files changed, 908 insertions(+), 57 deletions(-)
 create mode 100644 arch/arm64/include/asm/vectors.h
Signature · 1 line
2.30.2