From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64AC2C54ED0 for ; Fri, 23 May 2025 05:32:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 039366B0083; Fri, 23 May 2025 01:32:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F26E56B00B4; Fri, 23 May 2025 01:32:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEE736B00B5; Fri, 23 May 2025 01:32:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BFA3B6B0083 for ; Fri, 23 May 2025 01:32:18 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8BA0B1D4A19 for ; Fri, 23 May 2025 05:32:18 +0000 (UTC) X-FDA: 83473051956.27.4726502 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf30.hostedemail.com (Postfix) with ESMTP id 9871F8000E for ; Fri, 23 May 2025 05:32:16 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1GSYe7oO; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747978336; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Ju4eTa3aeO/W78J21C+hNLwsAKoKH1MKseai5GOrm10=; b=vc+nVR/8pFs7Ru1zaTfWDGNt5+oIsSDYKAoL85/5f4nmKFfDTQI/FLHkjBfk65KEfGQmCT kh++hzsVdErkqlm8blwlg7lW+AaZr4l+S5MFYkgXS2TaAe/eoYMIpvS6WKuaenOHlJI6J6 kNwPe8/BLLtBB5Z3fXGXI0+GBeCa9DI= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=1GSYe7oO; spf=pass (imf30.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978336; a=rsa-sha256; cv=none; b=REQcYB6bf3YHW/YY2IMSb5YIG/kJkR2VZnSeKwtKd/tQIrzyK/0CvZWsi74c4ftL1QFssB o+EZBiSnUtzyPUOTreRC0PjpQWqJisWDty9Jk9TxPJmeT2fXUOILQSDw66sE2wliYrxMgS cARTywRScSInTvXfAhU9N8+CipjPbj0= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-742c9563fafso4924371b3a.0 for ; Thu, 22 May 2025 22:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978335; x=1748583135; darn=kvack.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Ju4eTa3aeO/W78J21C+hNLwsAKoKH1MKseai5GOrm10=; b=1GSYe7oOPZDFej6CyzLzzh0/jjDaE/3f0/fEcCWYJ4AFMHORa7ra2WH0pDg0+HR7Wd VU9NYNpSnftgzOyCJGUmGf8iOLQokThZF4SlPkePY7SL+jXFHgvquS8ifJy2Z9uUQIQH hh6k1sSxsvbzK3B6MnFSpm2V75cUGaaDZT1WeYaONdYbIuOcKgDftUA9NE8YIU6fyoHB tEgSwnJaGpBHihekAZVl+2htx2DlvxFaRUXBm1kaUqJ+RWO7RRaAm6f785UK1okQgglN UvXMhv4xFQa+BYu50JWviHeu1muuFPLuOhbIQ+MUA9p1fjsNrHOELKj5Nv8bRCnxX41I iH8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978335; x=1748583135; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ju4eTa3aeO/W78J21C+hNLwsAKoKH1MKseai5GOrm10=; b=Suj8IHFIs/kyuiHFtyOvB2tSXQ6O5NJvUbXQcxlAupJYHlZ+gDtjwvKOsSpWlSYaf+ ps5smyiOLmp4IvnUbaIqz77eaESjmGK+8/uPX5lKRGaxmcBI82E0vU3pkNJmlAby3m/V GmbIVjCQP5DPQWjP7d8pyO9CsZ7T8uhZ9ausJrbteScTPp1LtFmrzsJND1Kut68O+VEW io//Ua7EWajtJ4ebM6HnORxEmC8tkh8uI+1LatYATG4v67Lq8fm2fepIfCwuMEOCUN3A 2LYMSx9sBqlv97SkdrlIFsZPaAzmqayFt5IPJaU1/mRtyZu2i/xA8GRUrymCx2bU+Nv/ BIsQ== X-Forwarded-Encrypted: i=1; AJvYcCXZhHef971YHow4AwYof73YIZWBRswokNQuCNGynskD+Av7WnUh6+k95kadIU0NVMkDim4fE+Dj+Q==@kvack.org X-Gm-Message-State: AOJu0YzCwnsf9ReVZqHy2w3ubGe9Ebe+mZlmdu57/zA/hnjxiDY/4cqI LUbxRFc+vuiCJjdHUa5u21AUEPiab8zoXt2Zun32RG7Fm7lUtq7/rDbeoZBYGUrBIK4= X-Gm-Gg: ASbGncvOslxbt968qR9vs+bB7HTLOI5GYLdQ31NL0JF64mtrH4mtc1bSyV715vtYrqa dn28hVsP8KGNDAv0rYUwZa91Z1HSrNViQt4c6xAB4S/mc8PjGsWGHaH13gR8vVG+bD2+Qq60NKU Pzy9AJ4VXXZvx8BFpuEVokMhyA3ewZy4g0CXbFUUpgMd/WQRcGqQYSn7XfPTsOv71S8j5LBubpR 9LBYAOKt1ghHmufu8FV2/FFvcmtQoagNb4lvB16FA57bnwTaC9vnzLB0w5tUqEPAgohIzUih7pO BX1wRAVz/oXB2dXLiwW9/QfkEpOgGBbMcUoIxZfXQPrlssGhTWF7QvjbOcsNllDlD7KifhCe X-Google-Smtp-Source: AGHT+IE000fQWXWmWMAa0rH3LUz2se5UtSEW5eGDpYuRyyjvFrjNa0KXQZ55LMkVsuYySkfDylE9ig== X-Received: by 2002:a05:6a00:91e0:b0:740:b394:3ebd with SMTP id d2e1a72fcca58-742a97ad507mr38686662b3a.7.1747978335439; Thu, 22 May 2025 22:32:15 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:32:14 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:22 -0700 Subject: [PATCH v16 19/27] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250522-v5_user_cfi_series-v16-19-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org, Deepak Gupta X-Mailer: b4 0.13.0 X-Rspam-User: X-Rspamd-Queue-Id: 9871F8000E X-Rspamd-Server: rspam09 X-Stat-Signature: toe65swpsa9madk97adjp7j3h47ostem X-HE-Tag: 1747978336-764352 X-HE-Meta: U2FsdGVkX1/iiQocyWhY5uT+k/3tlmfPdAbw+JS3ZyiAURmPRhIYloLmqsIdvjuj9+KzmAmiY2tTsRec7EDXSuNmLkFQRTFXi0+uKVRY0kmDFJC08eO0rgyenTsGzyAoL1jCFNLL4JO2I6f0NLKt4bpz5TmySg/Y9sc42eB33RnlcSOD7wgRyt3htEXywBXsWGbJoOJ9aJKvje+8dZZfEcwroHeJzKDD2BgyG59lHDS4M2NS78CkePHkslumJJvvkHJOjXYecf0pusptUtj4leaf647PDG1f7837b1Fw1b1BZrdq6XS/PVrdLOqPJCIih1mm4Wk/gmjCTPIJjyP8IbxFjAFolEkjzPNWdD9JSSkOnm9QcaMQP/iEOZ+uWoXSvwtfsu1aAaTWgYu6ERuo+JG6WO4nMCT2sE1oZUqct3XCxZZFJMApeFGiTuE6Qu6HrjLyCzMFwuXdJfgoz6lsT7JRMGlXFcF8QYrjvhvMEfP2Yz47PBwMjscHI6swNBm75UGU+DNENwEofcs5Ky0cHS+QkUnodqbFcPr40G6S7puTSzIH08ZZAilQZhCjySLQNpMTDsGbJqrm2dytXnwtwHZGd8/JmIZPFezd0jOrXFg7952qNb9Enxb+Y0ac5gqg0FTgeIOXNJIm89/fXDH4bmNbxvaWdzo+JWo4E2qNq9I2FI2zA8c+NinnRlcJrYILOIgTuphnlSl3s3GDvsyyXAuPbnMoJaj1syUJhjJMDiJOszOslJr0A/O352CuDl4E4Ey689g9l81EawPBcCBipLRWdkrtHL9YKKErEjo8wydF77l3aIpGoWCpHf1bKQ/bleDuPr848MKjeE+pUKvYfif4KlP4tQ2xX0vccA+StVmSXIhAZqMA2kJ43jiuQxbVxt59Ok5a/YAeC1BbRw4/MhF+ij8EHFEb4iD/fW0PAYJOvbFI5ZEGT9bRR8joD3VvlbwELaEawy+6vSQU2rx ivf7akcR WHzxRQ8/NZdk0QeO1j/LJf3EpBNL29S3DtfIl5aMDGJXQjE4z7GgEEOXvN0q+nkE+bUGncvCUOppPaVpS9P4ZAkXZxMRrnXJFVaWqnHYFPq/N8uzbRfCT/dH+9rWqRx+DVpMDjzhCfdjRo3WJFazfNP4lznhYYPsOY7eSnj5PWgYYuvFpA+2dTmXWxON4hoUzg5pqSu4rEoT7+XXdipw5Gs8JPe4UBaGUz+XrazYG/av1B7ED1sH3CJ1rImhFCVTokvDjz9+IhQPcjc5NXdQ1mjR0lIsDSYe3qqHJDDAE4WseS9bOgY8GO11RZMjP05pJ9ycJhXw8IcjDLb+PQCgXhrglo7zF7NVUhR03HEof8Ze74aPKkuhJHQDyNJ9dn5dna9WdDV58P01MHAagZ0xfr/yZ8TAcWcjAEgdoQQ0IwaTCPmqp2tkHU6Z+TqKcM6ugq02GmvGqGJva66o= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Expose a new register type NT_RISCV_USER_CFI for risc-v cfi status and state. Intentionally both landing pad and shadow stack status and state are rolled into cfi state. Creating two different NT_RISCV_USER_XXX would not be useful and wastage of a note type. Enabling, disabling and locking of feature is not allowed via ptrace set interface. However setting `elp` state or setting shadow stack pointer are allowed via ptrace set interface . It is expected `gdb` might have use to fixup `elp` state or `shadow stack` pointer. Signed-off-by: Deepak Gupta --- arch/riscv/include/uapi/asm/ptrace.h | 30 ++++++++++++ arch/riscv/kernel/ptrace.c | 95 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 2 + 3 files changed, 127 insertions(+) diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 659ea3af5680..42c3fc8bd513 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -131,6 +131,36 @@ struct __sc_riscv_cfi_state { unsigned long ss_ptr; /* shadow stack pointer */ }; +#define PTRACE_CFI_LP_EN_BIT 0 +#define PTRACE_CFI_LP_LOCK_BIT 1 +#define PTRACE_CFI_ELP_BIT 2 +#define PTRACE_CFI_SS_EN_BIT 3 +#define PTRACE_CFI_SS_LOCK_BIT 4 +#define PTRACE_CFI_SS_PTR_BIT 5 + +#define PTRACE_CFI_LP_EN_STATE (1 << PTRACE_CFI_LP_EN_BIT) +#define PTRACE_CFI_LP_LOCK_STATE (1 << PTRACE_CFI_LP_LOCK_BIT) +#define PTRACE_CFI_ELP_STATE (1 << PTRACE_CFI_ELP_BIT) +#define PTRACE_CFI_SS_EN_STATE (1 << PTRACE_CFI_SS_EN_BIT) +#define PTRACE_CFI_SS_LOCK_STATE (1 << PTRACE_CFI_SS_LOCK_BIT) +#define PTRACE_CFI_SS_PTR_STATE (1 << PTRACE_CFI_SS_PTR_BIT) + +#define PRACE_CFI_STATE_INVALID_MASK ~(PTRACE_CFI_LP_EN_STATE | \ + PTRACE_CFI_LP_LOCK_STATE | \ + PTRACE_CFI_ELP_STATE | \ + PTRACE_CFI_SS_EN_STATE | \ + PTRACE_CFI_SS_LOCK_STATE | \ + PTRACE_CFI_SS_PTR_STATE) + +struct __cfi_status { + __u64 cfi_state; +}; + +struct user_cfi_state { + struct __cfi_status cfi_status; + __u64 shstk_ptr; +}; + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index ea67e9fb7a58..933a3d26d33c 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -19,6 +19,7 @@ #include #include #include +#include enum riscv_regset { REGSET_X, @@ -31,6 +32,9 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif +#ifdef CONFIG_RISCV_USER_CFI + REGSET_CFI, +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -184,6 +188,87 @@ static int tagged_addr_ctrl_set(struct task_struct *target, } #endif +#ifdef CONFIG_RISCV_USER_CFI +static int riscv_cfi_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + memset(&user_cfi, 0, sizeof(user_cfi)); + regs = task_pt_regs(target); + + if (is_indir_lp_enabled(target)) { + user_cfi.cfi_status.cfi_state |= PTRACE_CFI_LP_EN_STATE; + user_cfi.cfi_status.cfi_state |= is_indir_lp_locked(target) ? + PTRACE_CFI_LP_LOCK_STATE : 0; + user_cfi.cfi_status.cfi_state |= (regs->status & SR_ELP) ? + PTRACE_CFI_ELP_STATE : 0; + } + + if (is_shstk_enabled(target)) { + user_cfi.cfi_status.cfi_state |= (PTRACE_CFI_SS_EN_STATE | + PTRACE_CFI_SS_PTR_STATE); + user_cfi.cfi_status.cfi_state |= is_shstk_locked(target) ? + PTRACE_CFI_SS_LOCK_STATE : 0; + user_cfi.shstk_ptr = get_active_shstk(target); + } + + return membuf_write(&to, &user_cfi, sizeof(user_cfi)); +} + +/* + * Does it make sense to allowing enable / disable of cfi via ptrace? + * Not allowing enable / disable / locking control via ptrace for now. + * Setting shadow stack pointer is allowed. GDB might use it to unwind or + * some other fixup. Similarly gdb might want to suppress elp and may want + * to reset elp state. + */ +static int riscv_cfi_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + int ret; + struct user_cfi_state user_cfi; + struct pt_regs *regs; + + regs = task_pt_regs(target); + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &user_cfi, 0, -1); + if (ret) + return ret; + + /* + * Not allowing enabling or locking shadow stack or landing pad + * There is no disabling of shadow stack or landing pad via ptrace + * rsvd field should be set to zero so that if those fields are needed in future + */ + if ((user_cfi.cfi_status.cfi_state & + (PTRACE_CFI_LP_EN_STATE | PTRACE_CFI_LP_LOCK_STATE | + PTRACE_CFI_SS_EN_STATE | PTRACE_CFI_SS_LOCK_STATE)) || + (user_cfi.cfi_status.cfi_state & PRACE_CFI_STATE_INVALID_MASK)) + return -EINVAL; + + /* If lpad is enabled on target and ptrace requests to set / clear elp, do that */ + if (is_indir_lp_enabled(target)) { + if (user_cfi.cfi_status.cfi_state & + PTRACE_CFI_ELP_STATE) /* set elp state */ + regs->status |= SR_ELP; + else + regs->status &= ~SR_ELP; /* clear elp state */ + } + + /* If shadow stack enabled on target, set new shadow stack pointer */ + if (is_shstk_enabled(target) && + (user_cfi.cfi_status.cfi_state & PTRACE_CFI_SS_PTR_STATE)) + set_active_shstk(target, user_cfi.shstk_ptr); + + return 0; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -224,6 +309,16 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif +#ifdef CONFIG_RISCV_USER_CFI + [REGSET_CFI] = { + .core_note_type = NT_RISCV_USER_CFI, + .align = sizeof(__u64), + .n = sizeof(struct user_cfi_state) / sizeof(__u64), + .size = sizeof(__u64), + .regset_get = riscv_cfi_get, + .set = riscv_cfi_set, + }, +#endif }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 819ded2d39de..ee30dcd80901 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -545,6 +545,8 @@ typedef struct elf64_shdr { #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NN_RISCV_TAGGED_ADDR_CTRL "LINUX" #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NN_RISCV_USER_CFI "LINUX" +#define NT_RISCV_USER_CFI 0x903 /* RISC-V shadow stack state */ #define NN_LOONGARCH_CPUCFG "LINUX" #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NN_LOONGARCH_CSR "LINUX" -- 2.43.0