riscv: SCS support
Status from this message: This series was applied to riscv/linux.git (for-next)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest6 patches 0 repliesApplied 6/6
- v36 patches 1 replySuperseded
- v26 patches 4 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 5 patches | 8 replies | Superseded |
Changes in v4 from the cover letter
- Fixed the C environment setup in head.S to use scs_load_current (patch 4).
- Rebased to -rc3 to fix merge conflicts.
Patches in v4 All 6 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | riscv: VMAP_STACK overflow detection thread-safearch/ arch/ arch/ +3 more | +34 | 0 replies | Applied |
| 2/6 | riscv: Deduplicate IRQ stack switchingarch/ arch/ arch/ +3 more | +55 | 0 replies | Applied |
| 3/6 | riscv: Move global pointer loading to a macroarch/ arch/ arch/ +1 more | +14 | 0 replies | Applied |
| 4/6 | riscv: Implement Shadow Call Stackarch/ arch/ arch/ +7 more | +99 | 0 replies | Applied |
| 5/6 | riscv: Use separate IRQ shadow call stacksarch/ arch/ arch/ | +35 | 0 replies | Applied |
| 6/6 | lkdtm: Fix CFI_BACKWARD on RISC-Vdrivers/ | +11 | 0 replies | Applied |
Reviews trailers per patch
3 of 6 patches have a Reviewed-by or Acked-by.
| Patch | Guo Ren | Nathan Chancellor | Kees Cook |
|---|---|---|---|
| 1/6 | A-b | T-b | |
| 2/6 | R-b | T-b | |
| 3/6 | T-b | ||
| 4/6 | T-b | ||
| 5/6 | T-b | ||
| 6/6 | T-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.
Cover letter [PATCH v4 0/6] riscv: SCS support
Hi folks,
This series adds Shadow Call Stack (SCS) support for RISC-V. SCS uses compiler instrumentation to store return addresses in a separate shadow stack to protect them against accidental or malicious overwrites. More information about SCS can be found here:
https://clang.llvm.org/docs/ShadowCallStack.html
Patch 1 is from Deepak, and it simplifies VMAP_STACK overflow handling by adding support for accessing per-CPU variables directly in assembly. The patch is included in this series to make IRQ stack switching cleaner with SCS, and I've simply rebased it and fixed a couple of minor issues. Patch 2 uses this functionality to clean up the stack switching by moving duplicate code into a single function. On RISC-V, the compiler uses the gp register for storing the current shadow call stack pointer, which is incompatible with global pointer relaxation. Patch 3 moves global pointer loading into a macro that can be easily disabled with SCS. Patch 4 implements SCS register loading and switching, and allows the feature to be enabled, and patch 5 adds separate per-CPU IRQ shadow call stacks when CONFIG_IRQ_STACKS is enabled. Patch 6 fixes the backward-edge CFI test in lkdtm for RISC-V.
Note that this series requires Clang 17. Earlier Clang versions support SCS on RISC-V, but use the x18 register instead of gp, which isn't ideal. gcc has SCS support for arm64, but I'm not aware of plans to support RISC-V. Once the Zicfiss extension is ratified, it's probably preferable to use hardware-backed shadow stacks instead of SCS on hardware that supports the extension, and we may want to consider implementing CONFIG_DYNAMIC_SCS to patch between the implementation at runtime (similarly to the arm64 implementation, which switches to SCS when hardware PAC support isn't available).
Sami
---
Changes in v4:
- Fixed the C environment setup in head.S to use scs_load_current (patch 4).
- Rebased to -rc3 to fix merge conflicts.
Changes in v3:
- Dropped a now unneeded function declaration (patch 1).
- Refactored call_on_irq_stack to use stack frame offsets based on Clément's suggestion (patch 2).
- Rebased on top of v6.5.
Changes in v2:
- Fixed asm_per_cpu with !CONFIG_SMP (patch 1).
- Added a fix to the CFI_BACKWARD lkdtm test (patch 6).
- Rebased on top of -rc6.
---
Deepak Gupta (1):
riscv: VMAP_STACK overflow detection thread-safe
Sami Tolvanen (5):
riscv: Deduplicate IRQ stack switching
riscv: Move global pointer loading to a macro
riscv: Implement Shadow Call Stack
riscv: Use separate IRQ shadow call stacks
lkdtm: Fix CFI_BACKWARD on RISC-V
arch/riscv/Kconfig | 6 ++ arch/riscv/Makefile | 4 + arch/riscv/include/asm/asm-prototypes.h | 1 - arch/riscv/include/asm/asm.h | 41 ++++++++ arch/riscv/include/asm/irq_stack.h | 3 + arch/riscv/include/asm/scs.h | 54 +++++++++++ arch/riscv/include/asm/thread_info.h | 16 ++- arch/riscv/kernel/asm-offsets.c | 9 ++ arch/riscv/kernel/entry.S | 124 ++++++++++++------------ arch/riscv/kernel/head.S | 19 ++-- arch/riscv/kernel/irq.c | 56 +++++------ arch/riscv/kernel/suspend_entry.S | 5 +- arch/riscv/kernel/traps.c | 68 +------------ arch/riscv/kernel/vdso/Makefile | 2 +- arch/riscv/purgatory/Makefile | 4 + drivers/misc/lkdtm/cfi.c | 13 ++- 16 files changed, 248 insertions(+), 177 deletions(-) create mode 100644 arch/riscv/include/asm/scs.h
base-commit: 6465e260f48790807eef06b583b38ca9789b6072
Signature · 1 line
2.42.0.515.g380fc7ccd1-goog