On Thu, Apr 10, 2025 at 11:45:58AM +0200, Radim Krčmář wrote:
2025-03-14T14:39:31-07:00, Deepak Gupta <de...@rivosinc.com>:
diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h
@@ -14,7 +15,8 @@ struct kernel_clone_args;
struct cfi_status {
unsigned long ubcfi_en : 1; /* Enable for backward cfi. */
- unsigned long rsvd : ((sizeof(unsigned long) * 8) - 1);
+ unsigned long ubcfi_locked : 1;
+ unsigned long rsvd : ((sizeof(unsigned long) * 8) - 2);
The rsvd field shouldn't be necessary as the container for the bitfield
is 'unsigned long' sized.
Why don't we use bools here, though?
It might produce a better binary and we're not hurting for struct size.
If you remember one of the previous patch discussion, this goes into
`thread_info` Don't want to bloat it. Even if we end shoving into task_struct,
don't want to bloat that either. I can just convert it into bitmask if
bitfields are an eyesore here.
diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c
@@ -24,6 +24,16 @@ bool is_shstk_enabled(struct task_struct *task)
+bool is_shstk_allocated(struct task_struct *task)
+{
+ return task->thread_info.user_cfi_state.shdw_stk_base ? true : false;
I think that the following is clearer:
return task->thread_info.user_cfi_state.shdw_stk_base
(Similar for all other implicit conversion ternaries.)
Hmm... noted.
@@ -42,6 +52,26 @@ void set_active_shstk(struct task_struct *task, unsigned
long shstk_addr)
+void set_shstk_status(struct task_struct *task, bool enable)
+{
+ if (!cpu_supports_shadow_stack())
+ return;
+
+ task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0;
+
+ if (enable)
+ task->thread.envcfg |= ENVCFG_SSE;
+ else
+ task->thread.envcfg &= ~ENVCFG_SSE;
+
+ csr_write(CSR_ENVCFG, task->thread.envcfg);
There is a new helper we could reuse for this:
envcfg_update_bits(task, ENVCFG_SSE, enable ? ENVCFG_SSE : 0);
Yeah it's in switch_to.h header. I'll think about it.
+}
@@ -262,3 +292,83 @@ void shstk_release(struct task_struct *tsk)
+int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status)
+{
+ /* Request is to enable shadow stack and shadow stack is not enabled
already */
+ if (enable_shstk && !is_shstk_enabled(t)) {
+ /* shadow stack was allocated and enable request again
+ * no need to support such usecase and return EINVAL.
+ */
+ if (is_shstk_allocated(t))
+ return -EINVAL;
+
+ size = calc_shstk_size(0);
+ addr = allocate_shadow_stack(0, size, 0, false);
Why don't we use the userspace-allocated stack?
I'm completely missing the design idea here... Userspace has absolute
over the shadow stack pointer CSR, so we don't need to do much in Linux:
1. interface to set up page tables with -W- PTE and
2. interface to control senvcfg.SSE.
Userspace can do the rest.
Design is like following:
When a user task wants to enable shadow stack for itself, it has to issue
a syscall to kernel (like this prctl). Now it can be done independently by
user task by first issuing `map_shadow_stack`, then asking kernel to light
up envcfg bit and eventually when return to usermode happens, it can write
to CSR. It is no different from doing all of the above together in single
`prctl` call. They are equivalent in that nature.
Background is that x86 followed this because x86 had workloads/binaries/
functions with (deep)recursive functions and thus by default were forced
to always allocate shadow stack to be of the same size as data stack. To
reduce burden on userspace for determining and then allocating same size
(size of data stack) shadow stack, prctl would do the job of calculating
default shadow stack size (and reduce programming error in usermode). arm64
followed the suite. I don't want to find out what's the compatiblity issues
we will see and thus just following the suite (given that both approaches
are equivalent). Take a look at static `calc_shstk_size(unsigned long size)`.
Coming back to your question of why not allowing userspace to manage its
own shadow stack. Answer is that it can manage its own shadow stack. If it
does, it just have to be aware of size its allocating for shadow stack.
There is already a patch series going on to manage this using clone3.
https://lore.kernel.org/all/20250408-clone3-shadow-stack-v15-4-3fa245c6e...@kernel.org/
I fully expect green thread implementations in rust/go or swapcontext
based thread management doing this on their own.
Current design is to ensure existing apps dont have to change a lot in
userspace and by default kernel gives compatibility. Anyone else wanting
to optimize the usage of shadow stack can do so with current design.
-
+int arch_lock_shadow_stack_status(struct task_struct *task,
+ unsigned long arg)
+{
+ /* If shtstk not supported or not enabled on task, nothing to lock here
*/
+ if (!cpu_supports_shadow_stack() ||
+ !is_shstk_enabled(task) || arg != 0)
+ return -EINVAL;
The task might want to prevent shadow stack from being enabled?
But Why would it want to do that? Task can simply not issue the prctl. There
are glibc tunables as well using which it can be disabled.
Thanks.
