From patchwork Fri Mar 14 21:39:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14017506 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 647D3C282EC for ; Fri, 14 Mar 2025 21:40:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2F6F2280024; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2841228001D; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D2A2280024; Fri, 14 Mar 2025 17:40:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D85D028001D for ; Fri, 14 Mar 2025 17:40:18 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 220EE1CB68B for ; Fri, 14 Mar 2025 21:40:20 +0000 (UTC) X-FDA: 83221475400.10.B9752A9 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf25.hostedemail.com (Postfix) with ESMTP id 2EB04A0006 for ; Fri, 14 Mar 2025 21:40:17 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=g74ubeVR; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741988418; a=rsa-sha256; cv=none; b=Dm1gkSpHTyRbO2Y+f7RhYx1X37ZEa7gXzhlz8pJ7+wl9kOuD7/lJ1HVoTc48AGK9xi2wy+ 9P1OFnCmTbubokyyV26BuimBn9XsKJtKzARKD9JKPsG+We7x6o4Bbor6HBD5ShWA9YTE74 WEA/UjF1vYStXdL0OQgUIpwfHjPXtvE= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=g74ubeVR; dmarc=none; spf=pass (imf25.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741988418; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=ETMuPXY01wvMtWrz61R0YnrEbOlcCozn8uLkqR6dKYDc4IdyDoU9ImmmDKUn0SBbtJvzcJ 27Dp8Q8OgiiWp2oquL5ZTirPqoP32PC0SplB4P3zaksIAzzoPLtp6gR4silBn6TaKc+D+9 h6sFjcsE9MFI/5xfgqVhIJeOGz3qFL8= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-22349bb8605so56812335ad.0 for ; Fri, 14 Mar 2025 14:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741988417; x=1742593217; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=g74ubeVRB5LjyZqe3N5TfK51MoUdO0JIhDqqNLSEa6n3Mo9ukxL1IrF39ki6h8kx3d DgcfRUHNoydvSSrzSJeqwa9iKQ1XELChOcksh90tn1ZdCkVaeNawzLzvvEbL/PBZtQjC dVlZpbyGnEo+nG/ygyobPYTnupAEJ86V7IOM9ltpxfWC1oJBtVIrJUmrvzCqBCcjs6bp m95+/Y2AkEhCyKxh04F8NgzueHldOAlyqXapP1Ndep6i/km2ex1KQQBdPHlTof0DLf/x xi21fsokPVWaNn2nB5eO9HUb0Q3s87SH7BWS1VRE0bxaxqcV7JT2wTG7dTTrDUxLejk6 m8Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741988417; x=1742593217; 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=qihiC//CQppmEvCBgeNt37whYo0mSsmsLXBW9eHBYhI=; b=Dy6hvXjOzStzh9jRg70+fvBZ+l+sIIbE/P8cRZHALU6oWOKGC/0IFX3PExrlikbewF Vp1iRL5Y6IFQYLzmsuZp6152f/LVkKGRFrLJvBJ8epQRPh03W/PUdv+TYi4Z23HWosbC DIGGrRSQ2Ohm7bs83kIa8fjJVhwPnR982p82PYoeixET+zNgGZ0zdGyPLNb+43fjMF0p lAbueO03JJuQvKNnS1Iv9+fqyotKkhaHWEbWTop00CHVKv2rqOzHsGkS/4POcV6ng3bm CnY/9zHEyfKTTrRBcveQ14EuJNbCAAoU0FmTIYVvSKmJAdrHPsyWDcP8lB66lyqk/2rk XfkA== X-Forwarded-Encrypted: i=1; AJvYcCXTlnwZcwtax0pS0rJF6B9fQgDaeoY41uGxqR+5Bl2EXl57uJiRTmrEOXn8bIhK7aWhVdO8Tu2gBg==@kvack.org X-Gm-Message-State: AOJu0YzDjyK/LaD7hPKsmz6/dCcFergkW2GoU+S1R8Dc7OqmhqrYzZ+E hz0+0XMmcH5NypILye+CJawVLgIr6IgFfwRJjO6iWz/BYTLSo3jCzya+eXolSkE= X-Gm-Gg: ASbGncsuRs2q2NxrNbfUPP3tzqTAEW15tjga9uvbr/TyOajhkSPcP9fL3NfPCD8LUKj lZX81z0SsPdXWqfgymrqyB6RpiFhdVwZXql0361yJ2hAHmzYi8F7ecpBAZEvygFkVssCzTB9B4c OGrtX+LyewSbWFqwbfWyxI02vz9vKag2CqFBcm5ws9jjjFw5rPyB1uvImn5ZZpUrNMyncoaMNnf C7CKcqdAumBzvWhM5tstYzTSZ5tO9Zd4IWHNpZgrSvuM02oziWzVhBypgM5II0Rn4p5zV7CDE3Z SYg74MGcdlorJ/yiowVekpNGOZl6XDeHOctk0Lsd+OeQkcipJ72YOZQ= X-Google-Smtp-Source: AGHT+IEHTIgzeGQs95nPlCKytt5z5yea/NHClPHPp1BUNubi4Uv9wCiZoYw+B2CYuOVgi1HkJrteRg== X-Received: by 2002:a17:902:da90:b0:224:10a2:cae7 with SMTP id d9443c01a7336-225e0af9d92mr50201135ad.40.1741988417057; Fri, 14 Mar 2025 14:40:17 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c68a6e09sm33368855ad.55.2025.03.14.14.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Mar 2025 14:40:16 -0700 (PDT) From: Deepak Gupta Date: Fri, 14 Mar 2025 14:39:38 -0700 Subject: [PATCH v12 19/28] riscv/ptrace: riscv cfi status and state via ptrace and in core files MIME-Version: 1.0 Message-Id: <20250314-v5_user_cfi_series-v12-19-e51202b53138@rivosinc.com> References: <20250314-v5_user_cfi_series-v12-0-e51202b53138@rivosinc.com> In-Reply-To: <20250314-v5_user_cfi_series-v12-0-e51202b53138@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 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: p1whijz6xo5gzhuhb3xjifwzc1y8zndj X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2EB04A0006 X-Rspam-User: X-HE-Tag: 1741988417-255716 X-HE-Meta: U2FsdGVkX18xeRFd8PFHEqhZH7oTP+lt2aqzxEgamq+Xuu5Gf9QqIUykjCK78dwtlO6YnWhAT2210n3XUun7Fmq1Wh1+rUGnzWKqLw6UijEK30z4x4mkKqyynh21Msuy9pDtjITeRgvLpxThtb99UkiE93H5VK25FTd6T4pi9AHcKL5Bg69ttYR/wWdso5uNz+NdP7e1an8NBJIUNmBWqOY16DT0BXMN+tKTka6oGcIFVOkWVJHge2y/rDnj86W4rAZNiAF+KTLYi+KLKjhzmlcom0F2Ft8CMeVHssTw+3m01MhcsqWWOt8Zs/g9cFKXUG9XxMN+OurxwU9hJ1GcddJMm6ZLm0gr2ycbKQO9pO0wgaS4mWdtJJ95BzW9DR6T3ZegslDAYCNOIT57t12g1WFKfGvmmzxjE7LRHnWONMp65XeMBRfpSWDvSAzsEdZ7tTHxaHVjV0bq30U6DJkkMbV6IeglpcpGvwTWGPABIAWWTLpGl40WCk1kMJZ4yajeeqRh4rTmZ+ew3oHe+pk9w3qxT8a3yawUW/73IqHjwQZcNwPfcDd+m7ln8Ou5x/vxEyma6LkZTUIJthJFkwI5cSkPcGCy3vN8HR8AiqtbONSNhg9Y6Sreog1i36x6er97zO8B5n7rN+FIpcqI0TakhXlzHAx852oWrIC3lbWv5QOfQEGqeCqMkKMatTDhcpWHuEMDh7IMtgMoG7bFZ00UokMUe8y3l0yFmrOhcvoz1H9r/rv4QaMnj0Rzn1QwQt/rTc+GI3M7hITxkfQWwIQGjpwav/xGLatBBrTQsAb1EVrZr5rRQdYi8G2uvD+1vWdOV8HRDFzd1UB5AH9aucOJ8R0WDHL/IHkQ+C11Icg21hL622wZmIKPXKIpSc7iaa+Q0CDJyvkqlJwE2P+fZLZlHkX4JoWOsEbxVaSdBLezPQMh++cK55gcKN8rDUQOHgHULRsOsI4bA/gi1uQ8lYx R7vu9Vu8 oyKweQ/Cu8iKyI2/Vvrr/7IE4cNWwWgdRP7mwlQESCkuvoRL09qQv2DRGvK6NEg9WaooKfCUQTpCbSqciPe5LDbzfU7nmuOnapIVAqokK0q5924yq3Qn1lAQ9f1pCg56x/M1OfOkg0vWx3ofCGR+0wv6ZlYL8Ay2pPF35ywkuR9BkCw4TBM5XaECPoyHc2slcie8e+yj27EO2sV7cm6lU6R68rmVS/q97ktivlHs30RE7CdMDFgNeWuI1mBsi1JNJyF9xb1MX5aCU1SpQYq3LOylWWBd0cFAxNFAtA1ATI3ftpXHzQKha2/9vMOf0bDOmyZNe86p482jFvuh/5tc4tZNE9otJkmsBbtoHeDsOb52TOWjcyOtAImWedZ7kZk+xlT80ABifpdNn1e+GmFvvUp/zoM2q7w2PnGn8V13yYczD3yEZh64RwaZzXwotg5ig1g5o+YdIuuaauDs= 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 or disabling 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 | 18 ++++++++ arch/riscv/kernel/ptrace.c | 83 ++++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 3 files changed, 102 insertions(+) diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 659ea3af5680..e6571fba8a8a 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -131,6 +131,24 @@ struct __sc_riscv_cfi_state { unsigned long ss_ptr; /* shadow stack pointer */ }; +struct __cfi_status { + /* indirect branch tracking state */ + __u64 lp_en : 1; + __u64 lp_lock : 1; + __u64 elp_state : 1; + + /* shadow stack status */ + __u64 shstk_en : 1; + __u64 shstk_lock : 1; + + __u64 rsvd : sizeof(__u64) - 5; +}; + +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..df8b7c6ab671 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,75 @@ 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; + + regs = task_pt_regs(target); + + user_cfi.cfi_status.lp_en = is_indir_lp_enabled(target); + user_cfi.cfi_status.lp_lock = is_indir_lp_locked(target); + user_cfi.cfi_status.elp_state = (regs->status & SR_ELP); + + user_cfi.cfi_status.shstk_en = is_shstk_enabled(target); + user_cfi.cfi_status.shstk_lock = is_shstk_locked(target); + 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.lp_en || user_cfi.cfi_status.lp_lock || + user_cfi.cfi_status.shstk_en || user_cfi.cfi_status.shstk_lock || + !user_cfi.cfi_status.rsvd) + 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.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)) + 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 +297,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 b44069d29cec..b9daed4ab780 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -452,6 +452,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_USER_CFI 0x903 /* RISC-V shadow stack state */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */