Skip to content

arm64: Mitigate spectre style branch history side channels

James Morse linux-arm-kernel stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest22 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22arm64: Add part number for Arm Cortex-A77arch/arm64/include/asm/cputype.h+2 -00 replies
2/22arm64: Add Neoverse-N2, Cortex-A710 CPU part definitionarch/arm64/include/asm/cputype.h+4 -00 replies
3/22arm64: add ID_AA64ISAR2_EL1 sys registerarch/arm64/include/asm/cpu.h arch/arm64/include/asm/sysreg.h arch/arm64/kernel/cpufeature.c +2 more+27 -10 replies
4/22arm64: Add Cortex-X2 CPU part definitionarch/arm64/include/asm/cputype.h+2 -00 replies
5/22arm64: entry.S: Add ventry overflow sanity checksarch/arm64/kernel/entry.S+3 -00 replies
6/22arm64: entry: Make the trampoline cleanup optionalarch/arm64/kernel/entry.S+7 -30 replies
7/22arm64: entry: Free up another register on kpti's tramp_exit patharch/arm64/kernel/entry.S+12 -60 replies
8/22arm64: entry: Move the trampoline data page before the text pagearch/arm64/include/asm/fixmap.h arch/arm64/kernel/entry.S+8 -30 replies
9/22arm64: entry: Allow tramp_alias to access symbols after the 4K boundaryarch/arm64/kernel/entry.S+8 -50 replies
10/22arm64: entry: Don't assume tramp_vectors is the start of the vectorsarch/arm64/kernel/entry.S+15 -130 replies
11/22arm64: entry: Move trampoline macros out of ifdef'd sectionarch/arm64/kernel/entry.S+5 -60 replies
12/22arm64: entry: Make the kpti trampoline's kpti sequence optionalarch/arm64/kernel/entry.S+12 -60 replies
13/22arm64: 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
14/22arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigationsarch/arm64/kernel/entry.S+34 -10 replies
15/22arm64: 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+107 -90 replies
16/22arm64: entry: Add macro for reading symbol addresses from the trampolinearch/arm64/kernel/entry.S+16 -190 replies
17/22arm64: Add percpu vectors for EL1arch/arm64/include/asm/mmu.h arch/arm64/include/asm/vectors.h arch/arm64/kernel/cpufeature.c +2 more+55 -90 replies
18/22arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2arch/arm64/include/asm/cpufeature.h arch/arm64/kernel/cpu_errata.c+46 -40 replies
19/22KVM: 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+130 -40 replies
20/22arm64: Mitigate spectre style branch history side channelsarch/arm64/Kconfig arch/arm64/include/asm/assembler.h arch/arm64/include/asm/cpufeature.h +5 more+316 -40 replies
21/22KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migratedarch/arm/include/asm/kvm_host.h arch/arm/include/uapi/asm/kvm.h arch/arm64/include/asm/kvm_host.h +2 more+54 -30 replies
22/22arm64: 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+57 -00 replies

Reviews trailers per patch

21 of 22 patches have a Reviewed-by or Acked-by.

PatchCatalin MarinasAnshuman KhandualMarc ZyngierRussell King (Oracle)Suzuki K Poulose
1/22A-b
2/22A-b R-b
3/22A-b
4/22R-b
5/22R-b R-b
6/22R-b R-b
7/22R-b R-b
8/22R-b R-b
9/22R-b R-b
10/22R-b R-b
11/22R-b R-b
12/22R-b R-b
13/22R-b
14/22R-b R-b
15/22R-b
16/22R-b
17/22R-b
18/22R-b
19/22
20/22R-b
21/22R-b R-b
22/22R-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 5 reviewers.

Read the v1 thread

Cover letter [stable:PATCH v5.4.184 00/22] arm64: Mitigate spectre style branch history side channels

Hi Greg,

Here is the state of the current v5.4 backport. Now that the 32bit code has been merged, it doesn't conflict when KVM's shared 32bit/64bit code needs to use these constants.

I've fixed the two issues that were reported against the v5.10 backport.

I had a go at bringing all the pre-requisites in to add proton-pack.c
to v5.4. Its currently 39 patches:
https://git.gitlab.arm.com/linux-arm/linux-jm.git /bhb/alternative_backport/UNTESTED/v5.4.183 (or for web browsers:
https://gitlab.arm.com/linux-arm/linux-jm/-/commits/bhb/alternative_backport/UNTESTED/v5.4.183/
)

I've not managed to bring b881cdce77b4 "KVM: arm64: Allocate hyp vectors statically" in, as that depends on the hypervisor's per-cpu support. Its this patch that means those 'smccc_wa' templates are needed. I estimate it would be 60 patches in total if we go this way, I don't think its a good idea:
All this still has to work around 541ad0150ca4 ("arm: Remove 32bit KVM host support") and 9ed24f4b712b ("KVM: arm64: Move virt/kvm/arm to arch/arm64") being missing.
I think this approach creates more problems than it solves as the files have to be in different places because of 32bit. It also creates a significantly larger testing problem: I'm not looking forward to working out how to test KVM guest migration over the variant-4 KVM ABI changes in 29e8910a566a.

This version of the backport still adds the mitigation management code to cpu_errata.c, because that is where this stuff lived in v5.4.

If you prefer, I can try adding proton-pack.c as a new empty file. I think this would only confuse matters as the line-numbers would never match, and there is an interaction with the spectre-v2 mitigations that live in cpu_errata.c.

There is one patch not present in mainline 'KVM: arm64: Add templtes for BHB mitigation sequences'.

Thanks,

James

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

James Morse (18):
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: Use the clearbhb instruction in mitigations

Joey Gouly (1):
arm64: add ID_AA64ISAR2_EL1 sys register

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

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

 arch/arm/include/asm/kvm_host.h     |   7 +
 arch/arm/include/uapi/asm/kvm.h     |   6 +
 arch/arm64/Kconfig                  |   9 +
 arch/arm64/include/asm/assembler.h  |  33 +++
 arch/arm64/include/asm/cpu.h        |   1 +
 arch/arm64/include/asm/cpucaps.h    |   3 +-
 arch/arm64/include/asm/cpufeature.h |  40 +++
 arch/arm64/include/asm/cputype.h    |  16 ++
 arch/arm64/include/asm/fixmap.h     |   6 +-
 arch/arm64/include/asm/kvm_host.h   |   5 +
 arch/arm64/include/asm/kvm_mmu.h    |   6 +-
 arch/arm64/include/asm/mmu.h        |   8 +-
 arch/arm64/include/asm/sections.h   |   5 +
 arch/arm64/include/asm/sysreg.h     |  17 ++
 arch/arm64/include/asm/vectors.h    |  73 ++++++
 arch/arm64/include/uapi/asm/kvm.h   |   5 +
 arch/arm64/kernel/cpu_errata.c      | 385 +++++++++++++++++++++++++++-
 arch/arm64/kernel/cpufeature.c      |  21 ++
 arch/arm64/kernel/cpuinfo.c         |   1 +
 arch/arm64/kernel/entry.S           | 213 +++++++++++----
 arch/arm64/kernel/vmlinux.lds.S     |   2 +-
 arch/arm64/kvm/hyp/hyp-entry.S      |  64 +++++
 arch/arm64/kvm/hyp/switch.c         |   8 +-
 arch/arm64/kvm/sys_regs.c           |   2 +-
 arch/arm64/mm/mmu.c                 |  12 +-
 include/linux/arm-smccc.h           |   5 +
 virt/kvm/arm/psci.c                 |  34 ++-
 27 files changed, 912 insertions(+), 75 deletions(-)
 create mode 100644 arch/arm64/include/asm/vectors.h
Signature · 1 line
2.30.2