V4.4 backport of arm64 Spectre patches
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest44 patches 19 repliesIn review
- v2 posting 2/247 patches 2 repliesSuperseded
- v2 posting 1/243 patches 24 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 45 patches | 11 replies | Superseded |
Changes in v3 from the cover letter
- Included an extra patch and used the helper introduced by it:
arm64: Add a helper for parking CPUs in a loop
- Droped few extra blank lines added by mistake
- Avoid overlapping with SVE2 bits
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/44 | arm64: barrier: Add CSDB macros to control data-value predictionarch/ arch/ | +9 | 1 reply | |
| 2/44 | arm64: Implement array_index_mask_nospec()arch/ | +21 | 1 reply | |
| 3/44 | arm64: move TASK_* definitions to <asm/processor.h>arch/ arch/ arch/ | +22 | 1 reply | |
| 4/44 | arm64: Make USER_DS an inclusive limitarch/ arch/ arch/ | +31 | 1 reply | |
| 5/44 | arm64: Use pointer masking to limit uaccess speculationarch/ | +23 | 1 reply | |
| 6/44 | arm64: entry: Ensure branch through syscall table is bounded under speculationarch/ arch/ | +12 | 1 reply | |
| 7/44 | arm64: uaccess: Prevent speculative use of the current addr_limitarch/ | +7 | 1 reply | |
| 8/44 | arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_userarch/ | +36 | 1 reply | |
| 9/44 | mm/kasan: add API to check memory regionsMAINTAINERS include/ mm/ | +38 | 1 reply | |
| 10/44 | arm64: kasan: instrument user memory access APIarch/ arch/ arch/ +1 more | +27 | 1 reply | |
| 11/44 | arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_userarch/ arch/ arch/ +1 more | +17 | 1 reply | |
| 12/44 | arm64: cpufeature: Test 'matches' pointer to find the end of the listarch/ | +6 | 5 replies | |
| 13/44 | arm64: cpufeature: Add scope for capability checkarch/ arch/ arch/ | +70 | 0 replies | |
| 14/44 | arm64: Introduce cpu_die_earlyarch/ | +15 | 0 replies | |
| 15/44 | arm64: Add a helper for parking CPUs in a looparch/ arch/ | +9 | 0 replies | |
| 16/44 | arm64: Move cpu_die_early to smp.carch/ arch/ arch/ | +23 | 0 replies | |
| 17/44 | arm64: Verify CPU errata work arounds on hotplugged CPUarch/ arch/ arch/ | +24 | 0 replies | |
| 18/44 | arm64: errata: Calling enable functions for CPU errata tooarch/ arch/ arch/ | +9 | 0 replies | |
| 19/44 | arm64: Rearrange CPU errata workaround checksarch/ arch/ arch/ +1 more | +23 | 0 replies | |
| 20/44 | arm64: Run enable method for errata work arounds on late CPUsarch/ | +6 | 0 replies | |
| 21/44 | arm64: cpufeature: Pass capability structure to ->enable callbackarch/ | +2 | 0 replies | |
| 22/44 | drivers/firmware: Expose psci_get_version through psci_ops structuredrivers/ include/ | +3 | 0 replies | |
| 23/44 | arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macroarch/ arch/ | +19 | 0 replies | |
| 24/44 | arm64: Move post_ttbr_update_workaround to C codearch/ arch/ arch/ | +11 | 0 replies | |
| 25/44 | arm64: Add skeleton to harden the branch predictor against aliasing attacksarch/ arch/ arch/ +8 more | +219 | 0 replies | |
| 26/44 | arm64: Move BP hardening to check_and_switch_contextarch/ | +2 | 0 replies | |
| 27/44 | arm64: entry: Apply BP hardening for high-priority synchronous exceptionsarch/ arch/ | +13 | 0 replies | |
| 28/44 | arm64: entry: Apply BP hardening for suspicious interrupts from EL0arch/ arch/ | +11 | 0 replies | |
| 29/44 | arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75arch/ | +6 | 0 replies | |
| 30/44 | arm64: cpu_errata: Allow an erratum to be match for all revisions of a corearch/ | +7 | 0 replies | |
| 31/44 | arm64: Implement branch predictor hardening for affected Cortex-A CPUsarch/ arch/ | +66 | 0 replies | |
| 32/44 | arm64: cputype info for Broadcom Vulcanarch/ | +3 | 0 replies | |
| 33/44 | arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUsarch/ | +3 | 0 replies | |
| 34/44 | arm64: Branch predictor hardening for Cavium ThunderX2arch/ | +10 | 0 replies | |
| 35/44 | ARM: 8478/2: arm/arm64: add arm-smcccdrivers/ include/ | +110 | 0 replies | |
| 36/44 | arm/arm64: KVM: Advertise SMCCC v1.1include/ | +13 | 0 replies | |
| 37/44 | arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening supportinclude/ | +5 | 0 replies | |
| 38/44 | firmware/psci: Expose PSCI conduitdrivers/ include/ | +30 | 0 replies | |
| 39/44 | firmware/psci: Expose SMCCC version through psci_opsdrivers/ include/ | +34 | 0 replies | |
| 40/44 | arm/arm64: smccc: Make function identifiers an unsigned quantityinclude/ | +3 | 0 replies | |
| 41/44 | arm/arm64: smccc: Implement SMCCC v1.1 inline primitiveinclude/ | +141 | 0 replies | |
| 42/44 | arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening supportarch/ arch/ | +87 | 0 replies | |
| 43/44 | arm64: Kill PSCI_GET_VERSION as a variant-2 workaroundarch/ arch/ | +13 | 0 replies | |
| 44/44 | arm64: futex: Mask __user pointers prior to dereferencearch/ | +6 | 2 replies |
Reviews trailers per patch
35 of 44 patches have a Reviewed-by or Acked-by.
| Patch | Mark Rutland | Robin Murphy | Alexander Potapenko | Andrey Ryabinin | Suzuki K Poulose | Catalin Marinas | Will Deacon | Lorenzo Pieralisi | Marc Zyngier | Thomas Gleixner | Daniel Lezcano | Ard Biesheuvel | Christoffer Dall |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 1/44 | R-b R-b | ||||||||||||
| 2/44 | R-b R-b | ||||||||||||
| 3/44 | R-b | ||||||||||||
| 4/44 | R-b | ||||||||||||
| 5/44 | R-b | ||||||||||||
| 6/44 | R-b R-b | ||||||||||||
| 7/44 | R-b R-b | ||||||||||||
| 8/44 | R-b | R-b | |||||||||||
| 9/44 | R-b | A-b | |||||||||||
| 10/44 | R-b T-b R-b | A-b | |||||||||||
| 11/44 | R-b | ||||||||||||
| 12/44 | R-b | ||||||||||||
| 13/44 | R-b | ||||||||||||
| 14/44 | A-b | ||||||||||||
| 15/44 | A-b | ||||||||||||
| 16/44 | A-b | ||||||||||||
| 17/44 | R-b | ||||||||||||
| 18/44 | R-b | ||||||||||||
| 19/44 | |||||||||||||
| 20/44 | |||||||||||||
| 21/44 | R-b | ||||||||||||
| 22/44 | A-b | ||||||||||||
| 23/44 | R-b | ||||||||||||
| 24/44 | |||||||||||||
| 25/44 | |||||||||||||
| 26/44 | A-b | ||||||||||||
| 27/44 | R-b | ||||||||||||
| 28/44 | R-b | ||||||||||||
| 29/44 | |||||||||||||
| 30/44 | A-b | R-b | A-b | A-b | |||||||||
| 31/44 | |||||||||||||
| 32/44 | A-b | A-b | |||||||||||
| 33/44 | |||||||||||||
| 34/44 | A-b | ||||||||||||
| 35/44 | R-b | ||||||||||||
| 36/44 | T-b | R-b | |||||||||||
| 37/44 | T-b | R-b | |||||||||||
| 38/44 | R-b | A-b | T-b | ||||||||||
| 39/44 | R-b | A-b | T-b | ||||||||||
| 40/44 | R-b | A-b T-b | |||||||||||
| 41/44 | R-b | T-b | |||||||||||
| 42/44 | T-b | ||||||||||||
| 43/44 | T-b | ||||||||||||
| 44/44 | 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 13 reviewers.
Cover letter [PATCH ARM64 v4.4 V3 00/44] V4.4 backport of arm64 Spectre patches
Hello,
This series backports arm64 spectre patches to v4.4 stable kernel. I have started this backport with Mark Rutland's backport of Spectre to 4.9 [1] and tried applying the upstream version of them over 4.4 and resolved conflicts by checking how they have been resolved in 4.9.
The KVM changes are mostly dropped as the KVM code in v4.4 is quite different and it makes backport more complex. This was suggested by the ARM team.
I had to pick few extra upstream patches to avoid conflicts and to make things work:
mm/kasan: add API to check memory regions
arm64: kasan: instrument user memory access API
arm64: cpufeature: Add scope for capability check
arm64: cputype info for Broadcom Vulcan
arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs
ARM: 8478/2: arm/arm64: add arm-smccc
arm64: cpufeature: Test 'matches' pointer to find the end of the list
arm64: Introduce cpu_die_early
arm64: Move cpu_die_early to smp.c
arm64: Verify CPU errata work arounds on hotplugged CPU
arm64: errata: Calling enable functions for CPU errata too
arm64: Rearrange CPU errata workaround checks
arm64: Add a helper for parking CPUs in a loop
I also had to drop few patches as they weren't getting applied properly due to missing files/features or they were KVM related:
arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early
arm64: KVM: Use per-CPU vector when BP hardening is enabled
arm64: KVM: Make PSCI_VERSION a fast path
mm: Introduce lm_alias
arm64: KVM: Increment PC after handling an SMC trap arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper
arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Turn kvm_psci_version into a static inline
arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling
The patches in this series are pushed here [2].
This is tested on Hikey board (octa A53) and I verified that BP hardening code is getting hit for CPUs (had to hack a bit and enable BP hardening support for A53 for this).
V2->V3:
- Included an extra patch and used the helper introduced by it:
arm64: Add a helper for parking CPUs in a loop
- Droped few extra blank lines added by mistake
- Avoid overlapping with SVE2 bits
V1->V2:
- Rebased over 4.4.184 (was 4.4.180 earlier).
- Fixed an build issue with CONFIG_KASAN (Julien).
- Dropped few patches, mostly KVM stuff (Julien):
arm64: remove duplicate macro __KERNEL__ check
mm: Introduce lm_alias
arm64: KVM: Increment PC after handling an SMC trap arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Turn kvm_psci_version into a static inline
arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling
- Added few patches to fix issues reported by Julien:
arm64: cpufeature: Test 'matches' pointer to find the end of the list
arm64: Introduce cpu_die_early
arm64: Move cpu_die_early to smp.c
arm64: Verify CPU errata work arounds on hotplugged CPU
arm64: errata: Calling enable functions for CPU errata too
arm64: Rearrange CPU errata workaround checks
--
viresh
[1] https://patches.linaro.org/cover/133195/ with top commit in 4.9 stable tree:
a3b292fe0560 arm64: futex: Mask __user pointers prior to dereference
[2] https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git stable/arm64/v4.4.y/spectre
-------------------------8<-------------------------
Andre Przywara (1):
arm64: errata: Calling enable functions for CPU errata too
Andrey Ryabinin (1):
mm/kasan: add API to check memory regions
Catalin Marinas (1):
arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm
macro
James Morse (1):
arm64: cpufeature: Test 'matches' pointer to find the end of the list
Jayachandran C (3):
arm64: cputype info for Broadcom Vulcan
arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs
arm64: Branch predictor hardening for Cavium ThunderX2
Jens Wiklander (1):
ARM: 8478/2: arm/arm64: add arm-smccc
Marc Zyngier (11):
arm64: Move post_ttbr_update_workaround to C code
arm64: Move BP hardening to check_and_switch_context
arm64: cpu_errata: Allow an erratum to be match for all revisions of a
core
arm/arm64: KVM: Advertise SMCCC v1.1
arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support firmware/psci: Expose PSCI conduit
firmware/psci: Expose SMCCC version through psci_ops arm/arm64: smccc: Make function identifiers an unsigned quantity arm/arm64: smccc: Implement SMCCC v1.1 inline primitive
arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support
arm64: Kill PSCI_GET_VERSION as a variant-2 workaround
Robin Murphy (3):
arm64: Implement array_index_mask_nospec()
arm64: Make USER_DS an inclusive limit
arm64: Use pointer masking to limit uaccess speculation
Suzuki K Poulose (7):
arm64: cpufeature: Add scope for capability check
arm64: Introduce cpu_die_early
arm64: Add a helper for parking CPUs in a loop
arm64: Move cpu_die_early to smp.c
arm64: Verify CPU errata work arounds on hotplugged CPU
arm64: Rearrange CPU errata workaround checks
arm64: Run enable method for errata work arounds on late CPUs
Will Deacon (13):
arm64: barrier: Add CSDB macros to control data-value prediction
arm64: entry: Ensure branch through syscall table is bounded under
speculation
arm64: uaccess: Prevent speculative use of the current addr_limit
arm64: uaccess: Don't bother eliding access_ok checks in __{get,
put}_user
arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user
arm64: cpufeature: Pass capability structure to ->enable callback drivers/firmware: Expose psci_get_version through psci_ops structure
arm64: Add skeleton to harden the branch predictor against aliasing
attacks
arm64: entry: Apply BP hardening for high-priority synchronous
exceptions
arm64: entry: Apply BP hardening for suspicious interrupts from EL0
arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75
arm64: Implement branch predictor hardening for affected Cortex-A CPUs
arm64: futex: Mask __user pointers prior to dereference
Yang Shi (1):
arm64: kasan: instrument user memory access API
Yury Norov (1):
arm64: move TASK_* definitions to <asm/processor.h>
MAINTAINERS | 14 ++ arch/arm64/Kconfig | 17 ++ arch/arm64/include/asm/assembler.h | 18 ++ arch/arm64/include/asm/barrier.h | 23 +++ arch/arm64/include/asm/cpufeature.h | 24 ++- arch/arm64/include/asm/cputype.h | 12 ++ arch/arm64/include/asm/futex.h | 9 +- arch/arm64/include/asm/memory.h | 15 -- arch/arm64/include/asm/mmu.h | 39 ++++ arch/arm64/include/asm/processor.h | 24 +++ arch/arm64/include/asm/smp.h | 9 + arch/arm64/include/asm/sysreg.h | 2 + arch/arm64/include/asm/uaccess.h | 173 ++++++++++++------ arch/arm64/kernel/Makefile | 5 + arch/arm64/kernel/arm64ksyms.c | 8 +- arch/arm64/kernel/bpi.S | 75 ++++++++ arch/arm64/kernel/cpu_errata.c | 213 +++++++++++++++++++++- arch/arm64/kernel/cpufeature.c | 186 +++++++++---------- arch/arm64/kernel/cpuinfo.c | 2 - arch/arm64/kernel/entry.S | 26 ++- arch/arm64/kernel/smp.c | 30 +++- arch/arm64/lib/clear_user.S | 6 +- arch/arm64/lib/copy_from_user.S | 4 +- arch/arm64/lib/copy_in_user.S | 4 +- arch/arm64/lib/copy_to_user.S | 4 +- arch/arm64/mm/context.c | 12 ++ arch/arm64/mm/fault.c | 31 ++++ arch/arm64/mm/proc.S | 12 +- drivers/firmware/Kconfig | 3 + drivers/firmware/psci.c | 58 +++++- include/linux/arm-smccc.h | 267 ++++++++++++++++++++++++++++ include/linux/kasan-checks.h | 12 ++ include/linux/psci.h | 14 ++ mm/kasan/kasan.c | 12 ++ 34 files changed, 1150 insertions(+), 213 deletions(-) create mode 100644 arch/arm64/kernel/bpi.S create mode 100644 include/linux/arm-smccc.h create mode 100644 include/linux/kasan-checks.h
Signature · 1 line
2.21.0.rc0.269.g1a574e7a288b