From: Palmer Dabbelt <palmer@rivosinc.com>
Date: Mon, 12 Dec 2022 17:30:37 +0000 (-0800)
Subject: Merge patch series "RISC-V: Align the shadow stack"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c3ec1e8964fb0ca00c79936160a027bd8b47e140;p=linux.git

Merge patch series "RISC-V: Align the shadow stack"

Palmer Dabbelt <palmer@rivosinc.com> says:

This contains a pair of cleanups that depend on a fix that has already
landed upstream.

* b4-shazam-merge:
  RISC-V: Add some comments about the shadow and overflow stacks
  RISC-V: Align the shadow stack
  riscv: fix race when vmap stack overflow

Link: https://lore.kernel.org/r/20221130023515.20217-1-palmer@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

c3ec1e8964fb0ca00c79936160a027bd8b47e140
diff --cc arch/riscv/kernel/traps.c
index f3e96d60a2ff3,336d4aadadb1c..549bde5c970a1
--- a/arch/riscv/kernel/traps.c
+++ b/arch/riscv/kernel/traps.c
@@@ -207,7 -194,16 +207,11 @@@ int is_valid_bugaddr(unsigned long pc
  }
  #endif /* CONFIG_GENERIC_BUG */
  
 -/* stvec & scratch is already set from head.S */
 -void __init trap_init(void)
 -{
 -}
 -
  #ifdef CONFIG_VMAP_STACK
+ /*
+  * Extra stack space that allows us to provide panic messages when the kernel
+  * has overflowed its stack.
+  */
  static DEFINE_PER_CPU(unsigned long [OVERFLOW_STACK_SIZE/sizeof(long)],
  		overflow_stack)__aligned(16);
  /*