Skip to content

ARM: spectre v1/v2 mitigations

Ard Biesheuvel stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest50 patches 8 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/50ARM: 8051/1: put_user: fix possible data corruption in put_userarch/arm/include/asm/uaccess.h+1 -10 replies
2/50ARM: 8478/2: arm/arm64: add arm-smcccdrivers/firmware/Kconfig include/linux/arm-smccc.h+107 -00 replies
3/50ARM: 8479/2: add implementation for arm-smcccarch/arm/Kconfig arch/arm/kernel/Makefile arch/arm/kernel/armksyms.c +1 more+71 -00 replies
4/50ARM: 8480/2: arm64: add implementation for arm-smcccarch/arm64/Kconfig arch/arm64/kernel/Makefile arch/arm64/kernel/arm64ksyms.c +2 more+53 -10 replies
5/50ARM: 8481/2: drivers: psci: replace psci firmware callsarch/arm/Kconfig arch/arm/kernel/Makefile arch/arm/kernel/psci-call.S +3 more+23 -640 replies
6/50ARM: uaccess: remove put_user() code duplicationarch/arm/include/asm/uaccess.h+49 -570 replies
7/50ARM: Move system register accessors to asm/cp15.harch/arm/include/asm/arch_gicv3.h arch/arm/include/asm/cp15.h+26 -160 replies
8/50arm/arm64: KVM: Advertise SMCCC v1.1include/linux/arm-smccc.h+19 -35 replies
9/50arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening supportinclude/linux/arm-smccc.h+5 -00 replies
10/50firmware/psci: Expose PSCI conduitdrivers/firmware/psci.c include/linux/psci.h+30 -50 replies
11/50firmware/psci: Expose SMCCC version through psci_opsdrivers/firmware/psci.c include/linux/psci.h+33 -00 replies
12/50arm/arm64: smccc: Make function identifiers an unsigned quantityinclude/linux/arm-smccc.h+4 -20 replies
13/50arm/arm64: smccc: Implement SMCCC v1.1 inline primitiveinclude/linux/arm-smccc.h+141 -00 replies
14/50arm/arm64: smccc: Add SMCCC-specific return codesinclude/linux/arm-smccc.h+5 -00 replies
15/50arm/arm64: smccc-1.1: Make return values unsigned longinclude/linux/arm-smccc.h+10 -100 replies
16/50arm/arm64: smccc-1.1: Handle function result as parametersinclude/linux/arm-smccc.h+20 -100 replies
17/50ARM: add more CPU part numbers for Cortex and Brahma B15 CPUsarch/arm/include/asm/cputype.h+8 -00 replies
18/50ARM: bugs: prepare processor bug infrastructurearch/arm/include/asm/bugs.h arch/arm/kernel/Makefile arch/arm/kernel/bugs.c+12 -20 replies
19/50ARM: bugs: hook processor bug checking into SMP and suspend pathsarch/arm/include/asm/bugs.h arch/arm/kernel/bugs.c arch/arm/kernel/smp.c +1 more+13 -00 replies
20/50ARM: bugs: add support for per-processor bug checkingarch/arm/include/asm/proc-fns.h arch/arm/kernel/bugs.c arch/arm/mm/proc-macros.S+10 -10 replies
21/50ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectrearch/arm/mm/Kconfig+4 -00 replies
22/50ARM: spectre-v2: harden branch predictor on context switchesarch/arm/mm/Kconfig arch/arm/mm/proc-v7-2level.S arch/arm/mm/proc-v7.S+115 -350 replies
23/50ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bitarch/arm/mm/Makefile arch/arm/mm/proc-v7-bugs.c arch/arm/mm/proc-v7.S+39 -30 replies
24/50ARM: spectre-v2: harden user aborts in kernel spacearch/arm/include/asm/cp15.h arch/arm/include/asm/system_misc.h arch/arm/mm/fault.c +2 more+94 -80 replies
25/50ARM: spectre-v2: add firmware based hardeningarch/arm/mm/proc-v7-bugs.c arch/arm/mm/proc-v7.S+81 -01 reply
26/50ARM: spectre-v2: warn about incorrect context switching functionsarch/arm/mm/proc-v7-bugs.c+15 -00 replies
27/50ARM: spectre-v1: add speculation barrier (csdb) macrosarch/arm/include/asm/assembler.h arch/arm/include/asm/barrier.h+21 -00 replies
28/50ARM: spectre-v1: add array_index_mask_nospec() implementationarch/arm/include/asm/barrier.h+21 -00 replies
29/50ARM: spectre-v1: fix syscall entryarch/arm/kernel/entry-common.S arch/arm/kernel/entry-header.S+32 -110 replies
30/50ARM: signal: copy registers using __copy_from_user()arch/arm/kernel/signal.c+21 -170 replies
31/50ARM: vfp: use __copy_from_user() when restoring VFP statearch/arm/include/asm/thread_info.h arch/arm/kernel/signal.c arch/arm/vfp/vfpmodule.c+17 -210 replies
32/50ARM: oabi-compat: copy semops using __copy_from_user()arch/arm/kernel/sys_oabi-compat.c+5 -30 replies
33/50ARM: use __inttype() in get_user()arch/arm/include/asm/uaccess.h+8 -10 replies
34/50ARM: spectre-v1: use get_user() for __get_user()arch/arm/include/asm/uaccess.h+11 -60 replies
35/50ARM: spectre-v1: mitigate user accessesarch/arm/include/asm/assembler.h arch/arm/lib/copy_from_user.S+13 -00 replies
36/50ARM: 8789/1: signal: copy registers using __copy_to_user()arch/arm/kernel/signal.c+27 -220 replies
37/50ARM: 8791/1: vfp: use __copy_to_user() when saving VFP statearch/arm/include/asm/thread_info.h arch/arm/kernel/signal.c arch/arm/vfp/vfpmodule.c+17 -200 replies
38/50ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()arch/arm/kernel/sys_oabi-compat.c+6 -20 replies
39/50ARM: 8793/1: signal: replace __put_user_error with __put_userarch/arm/kernel/signal.c+4 -40 replies
40/50ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limitarch/arm/include/asm/uaccess.h+8 -00 replies
41/50ARM: 8795/1: spectre-v1.1: use put_user() for __put_user()arch/arm/include/asm/uaccess.h+9 -60 replies
42/50ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitizationarch/arm/include/asm/assembler.h arch/arm/include/asm/uaccess.h arch/arm/lib/copy_from_user.S+38 -50 replies
43/50ARM: 8810/1: vfp: Fix wrong assignement to ufp_excarch/arm/vfp/vfpmodule.c+1 -10 replies
44/50ARM: make lookup_processor_type() non-__initarch/arm/kernel/head-common.S+3 -30 replies
45/50ARM: split out processor lookuparch/arm/include/asm/cputype.h arch/arm/kernel/setup.c+20 -120 replies
46/50ARM: clean up per-processor check_bugs method callarch/arm/include/asm/proc-fns.h arch/arm/kernel/bugs.c+3 -20 replies
47/50ARM: add PROC_VTABLE and PROC_TABLE macrosarch/arm/include/asm/proc-fns.h arch/arm/kernel/setup.c+27 -160 replies
48/50ARM: spectre-v2: per-CPU vtables to work around big.Little systemsarch/arm/include/asm/proc-fns.h arch/arm/kernel/setup.c arch/arm/kernel/smp.c +1 more+62 -150 replies
49/50ARM: ensure that processor vtables is not lost after bootarch/arm/mm/proc-macros.S+10 -00 replies
50/50ARM: fix the cockup in the previous patcharch/arm/mm/proc-macros.S+2 -20 replies

Reviews trailers per patch

47 of 50 patches have a Reviewed-by or Acked-by.

PatchNicolas PitreLorenzo PieralisiLars PerssonWill DeaconMark RutlandMarc ZyngierArd BiesheuvelChristoffer DallGreg HackmannRobin MurphyFlorian FainelliTony LindgrenJulien ThierryKrzysztof KozlowskiLinus Walleij
SeriesT-b
1/50R-b
2/50R-b
3/50R-b
4/50A-b
5/50A-b T-b A-b R-b T-b
6/50
7/50A-b
8/50T-b R-b T-b
9/50T-b R-b T-b
10/50A-b T-b T-b R-b
11/50A-b T-b T-b R-b
12/50A-b T-b T-b R-b
13/50T-b T-b R-b
14/50A-b R-b
15/50
16/50
17/50A-b A-b Boot-tested-by R-b
18/50A-b R-b Boot-tested-by R-b
19/50A-b R-b Boot-tested-by R-b
20/50A-b R-b Boot-tested-by R-b
21/50A-b R-b Boot-tested-by R-b
22/50A-b Boot-tested-by R-b
23/50R-b Boot-tested-by R-b
24/50Boot-tested-by R-b
25/50R-b Boot-tested-by R-b
26/50A-b Boot-tested-by R-b
27/50A-b Boot-tested-by R-b
28/50A-b Boot-tested-by R-b
29/50A-b Boot-tested-by R-b
30/50A-b
31/50A-b
32/50A-b
33/50A-b
34/50A-b
35/50A-b
36/50R-b
37/50R-b
38/50R-b
39/50R-b
40/50R-b
41/50R-b
42/50R-b
43/50R-b
44/50R-b R-b
45/50R-b R-b
46/50R-b R-b
47/50R-b R-b
48/50R-b R-b
49/50R-b T-b
50/50R-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 15 reviewers.

Read the v1 thread

Cover letter [PATCH for-stable-4.4 00/50] ARM: spectre v1/v2 mitigations

This is a backport to v4.4 of the Spectre v1 and v2 mitigations for 32-bit ARM that have already been backported to v4.9.

Patches #17 and up were cherry-picked from the v4.9 tree, and applied cleanly. The first 16 patches are prerequisites that were introduced between v4.4 and v4.9, and some needed minor massaging to apply. Some notable issues:
- the 32-bit KVM host parts were omitted, given the lack of demand and the fact that those pieces saw significantly more churn during the v4.4-v4.9 timeframe due to the fact that the code is shared with arm64
- some other changes are shared between ARM and arm64 (notably, the ARM SMCCCC changes), so the backport affects both architectures.

Patches can be found at [0]. They were build and boot tested using a variety of ARM and arm64 configs and platforms, both locally and on KernelCI.

An RFC of this series was sent out to the linux-arm-kernel mailing list and cc'ed to the maintainer, and no objections were raised. (The only difference between the RFC and this submission is that I have dropped a couple of mostly unrelated patches that were only there to make patch #8 match its context more closely in the file include/linux/arm-smccc.h)

Cc Russell King <[email protected]>
Cc Linus Walleij <[email protected]>

[0] https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=arm32-v4.4-backport
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/

Andrey Ryabinin (1):
ARM: 8051/1: put_user: fix possible data corruption in put_user

Jens Wiklander (4):
ARM: 8478/2: arm/arm64: add arm-smccc
ARM: 8479/2: add implementation for arm-smccc
ARM: 8480/2: arm64: add implementation for arm-smccc
ARM: 8481/2: drivers: psci: replace psci firmware calls

Julien Thierry (8):
ARM: 8789/1: signal: copy registers using __copy_to_user()
ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state
ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()
ARM: 8793/1: signal: replace __put_user_error with __put_user
ARM: 8794/1: uaccess: Prevent speculative use of the current
addr_limit
ARM: 8795/1: spectre-v1.1: use put_user() for __put_user()
ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization
ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc

Marc Zyngier (3):
arm/arm64: smccc: Add SMCCC-specific return codes arm/arm64: smccc-1.1: Make return values unsigned long arm/arm64: smccc-1.1: Handle function result as parameters

Mark Rutland (6):
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

Russell King (27):
ARM: uaccess: remove put_user() code duplication
ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs
ARM: bugs: prepare processor bug infrastructure
ARM: bugs: hook processor bug checking into SMP and suspend paths
ARM: bugs: add support for per-processor bug checking
ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre
ARM: spectre-v2: harden branch predictor on context switches
ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit
ARM: spectre-v2: harden user aborts in kernel space
ARM: spectre-v2: add firmware based hardening
ARM: spectre-v2: warn about incorrect context switching functions
ARM: spectre-v1: add speculation barrier (csdb) macros
ARM: spectre-v1: add array_index_mask_nospec() implementation
ARM: spectre-v1: fix syscall entry
ARM: signal: copy registers using __copy_from_user()
ARM: vfp: use __copy_from_user() when restoring VFP state
ARM: oabi-compat: copy semops using __copy_from_user()
ARM: use __inttype() in get_user()
ARM: spectre-v1: use get_user() for __get_user()
ARM: spectre-v1: mitigate user accesses
ARM: make lookup_processor_type() non-__init
ARM: split out processor lookup
ARM: clean up per-processor check_bugs method call
ARM: add PROC_VTABLE and PROC_TABLE macros
ARM: spectre-v2: per-CPU vtables to work around big.Little systems
ARM: ensure that processor vtables is not lost after boot
ARM: fix the cockup in the previous patch

Vladimir Murzin (1):
ARM: Move system register accessors to asm/cp15.h

 arch/arm/Kconfig                   |   3 +-
 arch/arm/include/asm/arch_gicv3.h  |  27 +-
 arch/arm/include/asm/assembler.h   |  23 ++
 arch/arm/include/asm/barrier.h     |  34 +++
 arch/arm/include/asm/bugs.h        |   6 +-
 arch/arm/include/asm/cp15.h        |  18 ++
 arch/arm/include/asm/cputype.h     |   9 +
 arch/arm/include/asm/proc-fns.h    |  65 ++++-
 arch/arm/include/asm/system_misc.h |  15 ++
 arch/arm/include/asm/thread_info.h |   8 +-
 arch/arm/include/asm/uaccess.h     | 177 +++++++-----
 arch/arm/kernel/Makefile           |   4 +-
 arch/arm/kernel/armksyms.c         |   6 +
 arch/arm/kernel/bugs.c             |  18 ++
 arch/arm/kernel/entry-common.S     |  18 +-
 arch/arm/kernel/entry-header.S     |  25 ++
 arch/arm/kernel/head-common.S      |   6 +-
 arch/arm/kernel/psci-call.S        |  31 ---
 arch/arm/kernel/setup.c            |  40 +--
 arch/arm/kernel/signal.c           | 125 +++++----
 arch/arm/kernel/smccc-call.S       |  62 +++++
 arch/arm/kernel/smp.c              |  36 +++
 arch/arm/kernel/suspend.c          |   2 +
 arch/arm/kernel/sys_oabi-compat.c  |  16 +-
 arch/arm/lib/copy_from_user.S      |   5 +
 arch/arm/mm/Kconfig                |  23 ++
 arch/arm/mm/Makefile               |   2 +-
 arch/arm/mm/fault.c                |   3 +
 arch/arm/mm/proc-macros.S          |  13 +-
 arch/arm/mm/proc-v7-2level.S       |   6 -
 arch/arm/mm/proc-v7-bugs.c         | 161 +++++++++++
 arch/arm/mm/proc-v7.S              | 154 ++++++++---
 arch/arm/vfp/vfpmodule.c           |  37 ++-
 arch/arm64/Kconfig                 |   1 +
 arch/arm64/kernel/Makefile         |   4 +-
 arch/arm64/kernel/arm64ksyms.c     |   5 +
 arch/arm64/kernel/asm-offsets.c    |   3 +
 arch/arm64/kernel/psci-call.S      |  28 --
 arch/arm64/kernel/smccc-call.S     |  43 +++
 drivers/firmware/Kconfig           |   3 +
 drivers/firmware/psci.c            |  78 +++++-
 include/linux/arm-smccc.h          | 283 ++++++++++++++++++++
 include/linux/psci.h               |  13 +
 43 files changed, 1313 insertions(+), 326 deletions(-)
 create mode 100644 arch/arm/kernel/bugs.c
 delete mode 100644 arch/arm/kernel/psci-call.S
 create mode 100644 arch/arm/kernel/smccc-call.S
 create mode 100644 arch/arm/mm/proc-v7-bugs.c
 delete mode 100644 arch/arm64/kernel/psci-call.S
 create mode 100644 arch/arm64/kernel/smccc-call.S
 create mode 100644 include/linux/arm-smccc.h
Signature · 1 line
2.20.1