From: Deepak Gupta <debug@rivosinc.com>
To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, jim.shu@sifive.com,
andy.chiu@sifive.com, jesse.huang@sifive.com,
kito.cheng@sifive.com
Cc: palmer@dabbelt.com, Alistair.Francis@wdc.com, laurent@vivier.eu,
bmeng.cn@gmail.com, liwei1518@gmail.com,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
Deepak Gupta <debug@rivosinc.com>
Subject: [PATCH v2 18/24] linux-user/riscv: setup/teardown zicfiss shadow stack for qemu-user
Date: Mon, 29 Jul 2024 10:53:20 -0700 [thread overview]
Message-ID: <20240729175327.73705-19-debug@rivosinc.com> (raw)
In-Reply-To: <20240729175327.73705-1-debug@rivosinc.com>
Implements shadow stack related prctls for qemu-user on riscv. Allocates
shadow stack from host memory using `target_mmap` and tears down when
user issues prctl to disable using `target_munmap`.
Signed-off-by: Deepak Gupta <debug@rivosinc.com>
Co-developed-by: Jesse Huang <jesse.huang@sifive.com>
Co-developed-by: Jim Shu <jim.shu@sifive.com>
Co-developed-by: Andy Chiu <andy.chiu@sifive.com>
---
linux-user/riscv/cpu_loop.c | 50 +++++++++++++++++++++++++++++++++
linux-user/riscv/target_cpu.h | 7 +++++
linux-user/riscv/target_prctl.h | 27 ++++++++++++++++++
target/riscv/cpu.c | 4 +++
target/riscv/cpu.h | 1 +
5 files changed, 89 insertions(+)
diff --git a/linux-user/riscv/cpu_loop.c b/linux-user/riscv/cpu_loop.c
index 52c49c2e42..22670b68e0 100644
--- a/linux-user/riscv/cpu_loop.c
+++ b/linux-user/riscv/cpu_loop.c
@@ -25,6 +25,7 @@
#include "signal-common.h"
#include "elf.h"
#include "semihosting/common-semi.h"
+#include "user-mmap.h"
void cpu_loop(CPURISCVState *env)
{
@@ -94,6 +95,55 @@ void cpu_loop(CPURISCVState *env)
}
}
+#define ZICFISS_GUARD_SIZE (2UL * TARGET_PAGE_SIZE)
+#define ZICFISS_STACK_SIZE (16UL * TARGET_PAGE_SIZE)
+#define ZICFISS_THREAD_SIZE (ZICFISS_STACK_SIZE + ZICFISS_GUARD_SIZE)
+
+void zicfiss_shadow_stack_alloc(CPUArchState *env)
+{
+ uintptr_t new_base;
+
+ /* SS page should be surrounded by two guard pages */
+ new_base = (uintptr_t) target_mmap(0, ZICFISS_THREAD_SIZE, PROT_NONE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if ((intptr_t)new_base == -1) {
+ perror("shadow stack alloc failure");
+ exit(EXIT_FAILURE);
+ }
+ new_base += TARGET_PAGE_SIZE;
+ int ret = mprotect((void *)new_base, ZICFISS_STACK_SIZE,
+ PROT_READ | PROT_WRITE);
+ if (ret == -1) {
+ perror("shadow stack mprotect failure");
+ exit(EXIT_FAILURE);
+ }
+
+ env->ssp_base = new_base;
+ env->ssp = new_base + ZICFISS_STACK_SIZE;
+}
+
+void zicfiss_shadow_stack_release(CPUArchState *env)
+{
+ abi_ulong mmap_base;
+
+ if (env->ssp == 0) {
+ perror("release empty shadow stack");
+ exit(EXIT_FAILURE);
+ }
+
+ /* It should match shadow stack allocation. */
+ mmap_base = env->ssp_base - TARGET_PAGE_SIZE;
+
+ int ret = target_munmap(mmap_base, ZICFISS_THREAD_SIZE);
+ if (ret == -1) {
+ perror("shadow stack release failure");
+ exit(EXIT_FAILURE);
+ }
+
+ env->ssp_base = 0;
+ env->ssp = 0;
+}
+
void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)
{
CPUState *cpu = env_cpu(env);
diff --git a/linux-user/riscv/target_cpu.h b/linux-user/riscv/target_cpu.h
index 9c642367a3..bba54d93eb 100644
--- a/linux-user/riscv/target_cpu.h
+++ b/linux-user/riscv/target_cpu.h
@@ -1,6 +1,9 @@
#ifndef RISCV_TARGET_CPU_H
#define RISCV_TARGET_CPU_H
+extern void zicfiss_shadow_stack_alloc(CPUArchState *env);
+extern void zicfiss_shadow_stack_release(CPUArchState *env);
+
static inline void cpu_clone_regs_child(CPURISCVState *env, target_ulong newsp,
unsigned flags)
{
@@ -9,6 +12,10 @@ static inline void cpu_clone_regs_child(CPURISCVState *env, target_ulong newsp,
}
env->gpr[xA0] = 0;
+
+ if (flags & CLONE_VM) {
+ zicfiss_shadow_stack_alloc(env);
+ }
}
static inline void cpu_clone_regs_parent(CPURISCVState *env, unsigned flags)
diff --git a/linux-user/riscv/target_prctl.h b/linux-user/riscv/target_prctl.h
index d7f9f954c9..6293d61519 100644
--- a/linux-user/riscv/target_prctl.h
+++ b/linux-user/riscv/target_prctl.h
@@ -13,6 +13,33 @@ static abi_long do_prctl_cfi(CPUArchState *env,
if (env_archcpu(env)->cfg.ext_zicfilp) {
switch (option) {
+ case PR_GET_SHADOW_STACK_STATUS:
+ abi_ulong bcfi_status = 0;
+ /* indirect branch tracking is enabled on the task or not */
+ bcfi_status |= (env->ubcfien ? PR_INDIR_BR_LP_ENABLE : 0);
+ return copy_to_user(flag, &bcfi_status, sizeof(bcfi_status)) ? \
+ -EFAULT : 0;
+
+ case PR_SET_SHADOW_STACK_STATUS:
+ /* if any other bit is set, its invalid param */
+ if (flag & ~PR_SHADOW_STACK_ENABLE) {
+ return -TARGET_EINVAL;
+ }
+
+ if ((flag & PR_SHADOW_STACK_ENABLE)
+ && (env->ssp == 0 && !env->ubcfien)) {
+ zicfiss_shadow_stack_alloc(env);
+ } else {
+ zicfiss_shadow_stack_release(env);
+ }
+ env->ubcfien = (flag & PR_SHADOW_STACK_ENABLE);
+ tb_flush(env_cpu(env));
+ return 0;
+
+ /* locking not implemented (also not needed for qemu-user) yet */
+ case PR_LOCK_SHADOW_STACK_STATUS:
+ return -TARGET_EINVAL;
+
case PR_GET_INDIR_BR_LP_STATUS:
abi_ulong fcfi_status = 0;
/* indirect branch tracking is enabled on the task or not */
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index e1ff246c24..5a34eee10c 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -1001,6 +1001,10 @@ static void riscv_cpu_reset_hold(Object *obj, ResetType type)
/* on reset ssp is set to 0 */
env->ssp = 0;
+#ifdef CONFIG_USER_ONLY
+ env->ssp_base = 0;
+#endif
+
/*
* Bits 10, 6, 2 and 12 of mideleg are read only 1 when the Hypervisor
* extension is enabled.
diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 82475490ab..af89fc1268 100644
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -232,6 +232,7 @@ struct CPUArchState {
uint32_t elf_flags;
bool ufcfien;
bool ubcfien;
+ target_ulong ssp_base;
#endif
#ifndef CONFIG_USER_ONLY
--
2.44.0
next prev parent reply other threads:[~2024-07-29 17:55 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 17:53 [PATCH v2 00/24] riscv support for control flow integrity extensions Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 01/24] target/riscv: Add zicfilp extension Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 02/24] target/riscv: Introduce elp state and enabling controls for zicfilp Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 03/24] target/riscv: save and restore elp state on priv transitions Deepak Gupta
2024-07-29 23:04 ` Richard Henderson
2024-07-29 23:33 ` Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 04/24] target/riscv: additional code information for sw check Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 05/24] target/riscv: tracking indirect branches (fcfi) for zicfilp Deepak Gupta
2024-07-29 23:15 ` Richard Henderson
2024-08-01 6:59 ` Deepak Gupta
2024-08-01 9:12 ` Richard Henderson
2024-08-01 17:05 ` Deepak Gupta
2024-08-01 21:34 ` Richard Henderson
2024-07-29 17:53 ` [PATCH v2 06/24] target/riscv: zicfilp `lpad` impl and branch tracking Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 07/24] disas/riscv: enabled `lpad` disassembly Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 08/24] linux-user/syscall: introduce prctl for indirect branch tracking Deepak Gupta
2024-07-30 6:21 ` Richard Henderson
2024-07-29 17:53 ` [PATCH v2 09/24] linux-user/riscv: implement indirect branch tracking prctls Deepak Gupta
2024-07-30 6:26 ` Richard Henderson
2024-08-01 7:02 ` Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 10/24] target/riscv: Add zicfiss extension Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 11/24] target/riscv: introduce ssp and enabling controls for zicfiss Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 12/24] target/riscv: tb flag for shadow stack instructions Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 13/24] target/riscv: implement zicfiss instructions Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 14/24] target/riscv: compressed encodings for sspush and sspopchk Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 15/24] target/riscv: mmu changes for zicfiss shadow stack protection Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 16/24] target/riscv: shadow stack mmu index for shadow stack instructions Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 17/24] linux-user/syscall: introduce prctl for shadow stack enable/disable Deepak Gupta
2024-07-29 17:53 ` Deepak Gupta [this message]
2024-07-29 17:53 ` [PATCH v2 19/24] disas/riscv: enable disassembly for zicfiss instructions Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 20/24] disas/riscv: enable disassembly for compressed sspush/sspopchk Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 21/24] target/riscv: add trace-hooks for each case of sw-check exception Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 22/24] linux-user: permit RISC-V CFI dynamic entry in VDSO Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 23/24] linux-user: Add RISC-V zicfilp support " Deepak Gupta
2024-07-29 17:53 ` [PATCH v2 24/24] linux-user/riscv: Adding zicfiss/lp extension in hwprobe syscall Deepak Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240729175327.73705-19-debug@rivosinc.com \
--to=debug@rivosinc.com \
--cc=Alistair.Francis@wdc.com \
--cc=andy.chiu@sifive.com \
--cc=bmeng.cn@gmail.com \
--cc=dbarboza@ventanamicro.com \
--cc=jesse.huang@sifive.com \
--cc=jim.shu@sifive.com \
--cc=kito.cheng@sifive.com \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=palmer@dabbelt.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.