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 DE4CAC3ABAA for ; Fri, 2 May 2025 23:31:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8C4B26B00C1; Fri, 2 May 2025 19:31:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 875E26B00C3; Fri, 2 May 2025 19:31:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6AEDB6B00C1; Fri, 2 May 2025 19:31:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 49B8B6B00C1 for ; Fri, 2 May 2025 19:31:42 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 10B68C0EAD for ; Fri, 2 May 2025 23:31:42 +0000 (UTC) X-FDA: 83399567244.23.A5C395C Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf23.hostedemail.com (Postfix) with ESMTP id 240EC14000A for ; Fri, 2 May 2025 23:31:38 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PU4MEyU5; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 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=1746228699; 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=PDu6g4BpaNogk8gcfFE3BvIJbVqqlXqcJZQ2eluy2MY6MxvZq7I3FbPWIG0BSc5ondZHr2 aLfqQjnwW42yzXJt725qTD4PjeXrG5sKJoxCeR/Y0lkRZzgAgufoIEgMqtw7LJfxKXQ1of EHYZyeH6B0fNUjJFrqxIe1hiF7VkYVg= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=PU4MEyU5; dmarc=none; spf=pass (imf23.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228699; a=rsa-sha256; cv=none; b=DaCWGw10PDMVyjcd6LO5wh1GmD2Z3VBKdh2GJn+r3QB52jFwH9VTrW7/Vu/d2IiNp8whvJ usAehW6Kg4AwyDXa2aFlZGHpkfhENeK7mfzTei6v75suii5+Vq+Pem9S1B9mLVc8F2JEqI nOy3JdHil2ALUeFBJAUFLV0Li2LnmW4= Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-22e16234307so8119815ad.0 for ; Fri, 02 May 2025 16:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228698; x=1746833498; 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=PU4MEyU5ndRIWqc7TWPSMFR2WYxDJUBnidTZ1826ls99JP4jgsGduqveLklxn8dXLt K79F7ck3jgf7VEfXjTAvEFiLaiwPDuhk412h6jvMVBVZrOobLsqhtIlAMxHKeETtTKiX MzPsDsEqZjr69VvRoYMsgFYu3hk0NODuWSGeZhfTEXXSmY6toFD7T8gAToJ+CoCrsPeG rsjx6I77XLzx0WEI+z0GBW/CzHYl6/EtlqVK8pa6Iamxyg3cnQ3cMEbgeeKpcfd3je1A LEopPd9uwZBq4aIVac3UWhenogVROGb+Bac0ICTVzWOk4Vwmwgs8qIwvMB23CYqB3Yu1 mX7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228698; x=1746833498; 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=b/gCOMzhN9VX/Ne7Ua9Irg8M4iD/dBi1Plog1qrv9KNGXgpYe3FIFWP02zrurL/r9g ZU7vSof4g4SEEYKvFMHPnwGn4RJriOEp0/52rehVcoem1q7zpTnRCi09zN7dPO6TdxSX oA/h3yYOpEAl1v+ulfpsTUYsVZyxfGhKvreeh4BA3dPxazjcp50cZBZyP9UviFIAmScY +QvqI7mEnXcBBgj40NHUBumf3ozstNczEQFotTpuS+NMd3cwArdpqKrl0iKe/1xw8O5W N+d96GuGRHnti4pDydMdwwk2Zg1CIljpSJzDVzY63d/RXuKt1pqxMyvBm0Tmndjd5E0C Btug== X-Forwarded-Encrypted: i=1; AJvYcCUqUQktPC5zLYRxMN1ds5Rez+sMhgEDENAiLNVVunzvw3RTdrpSdK4t7ci3Uv/DHivInBs4W0oMQQ==@kvack.org X-Gm-Message-State: AOJu0YwGG2txM2dQtmM9v3oOxmMt/PeMpXHQl4v1VR9Z597C/RXkZ2Is 897ypN7Bj2rbTvpqmWf14xghX8B3ep73UWrBpl9JRaVcP2gLs7kPwcVeDjB09bo= X-Gm-Gg: ASbGnctsUvUIXuWG/PjIOGrC+3Ozz6xA2G9aP0ZxW2KPaTjHQsdM5skwOVdUGDYknq/ nkSygXUAxbfxmZtLXwU3tFjhX6lr3b7aViLrDDJxVU3eO+b0w138WmfLEKkmGXQE3AO8cKT01QH RHFGK4JI5qnQAPcnLcvY6v5eSQv8lQycQgc4NTv0QJnyrs9iUkVgKuBrSXvinQoPPbgxeyxPX+n KSkV9O4fh7exeENrYTAeSbDAUX7R6p2WWo0GlnbvHgl4jvFTsGY+prNqEWXlmrV3iSbmVZzd25Y Yhk7HQGmLrLFWJz6BlAfcAyUXligpYUNvl+bx/zs/Hy1qDnR7kU= X-Google-Smtp-Source: AGHT+IH40Jmn6oEiZT0umVLkqo8dVsl41YyQO4DPBkxlhpe7o3KvJQ1BRD6SebSW+AuEVdZx++vrtA== X-Received: by 2002:a17:903:3c47:b0:215:58be:3349 with SMTP id d9443c01a7336-22e1007d2bamr83923895ad.14.1746228697999; Fri, 02 May 2025 16:31:37 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.31.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:31:37 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:50 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-19-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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-Stat-Signature: k8a6j4dy1zmdfauqmcbichwfi6n34ud7 X-Rspamd-Queue-Id: 240EC14000A X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1746228698-440466 X-HE-Meta: U2FsdGVkX19aFyWxVKLwVeWzzs91L/zXi4ymH+Kle/1lwiJgeh3JlnjelH2vUB0eP3GexvSfGfKPrOEdjr4F4QY+TMjqYpCwiPBe1a79dE8/QQqiy7fpGkUvWUu+KzDx8iRCs4mWSNJj5SVqt8fJawUBllhibexJq+C0k4Nw+mVtDsgGUCiSJypVAMA3nOADEJRKEFeIehogjtWPZSg8KTT4s/LgNxqb9V4cKoUGkKpBUQv+AgXPKu9FIxZ1KF4qjsJk6v83k/hvu8OpDDYM1Yp+ee2WpEFgsStMEnpYcncp2krhGwWuGHJ5XxRG3Jz9eB50MX1Tq6JVL1aKGKWjHWMrachT8ITlIAfNuNvzBJnpmQTxiEVxUOG2NsJAPHaH4ye9GTFY0OVuPF8ah2rPNSJdGX0k6DXqAJeymXG0Tjz/X+850TtCJ3e1RvtWCurCqhVKmj9f3DS17ASxOFwGQCT/Gtzj2Rq3ry0AwpW2L6osIkIUYvedt8T/EoOVAzV9R0mLcS5fchLNWU21tANmMg/kUUqoi9w+c+3JMmjKT437/GeY8cukTUdEGlF62AVwUw6G86aT0NIb0qnwatymir4FVKuPy+qwoOyI9Fp8B6Hnk+P+s6WPlBF85MEh04+zeq8tR/CmDe/HAtXlSmRWef5ElzTrferSSt7Er5dLxhPUkqvPAE9Wu4RZcvws6wIyDabEZXe4OVeuzqYNgw5yQTctROUnomDx1ZWRidemc4XcfzxARjJLm9g7IdOYsAIecRH7wzyMmtEZLtESipF/gOV+kVd+pL2L3ooP1IG7fVOC2hrMwvq4lLuROpXDFEDhK73NroqeJb86dZByKok+b8Ssgb6S6jHbHWuhFqGXZPtCnYtDPDv7E9hTYYm7Eej02ruf3MNcioqqcdBZaG+SGVi8x2DrNQCiYKHktR8l7RWnsB10DCODtpimVf2EXx4lgyL9pVY8tYUfKZt0Qp7 3/2yBYu1 fnrVoPZ7TUgT28rlcCYAta20lYPHee5W2wBnO1SgHjylfvJQZi/wLO6JLFfh8/ysBAY0Am+eZc2KMy0yxku0iAoISWEeLTa0TsBbwixlix8szXrD/VvSbNLZeyE5/4QjFJaxjLGDbovchZ5UrC+yr5P9M/0yGNbkwNOfq6CoYvbgYncZAWDMUptbQLykd1B4fyKrRz8z0EivCyhrrjG+LfpguIMkNgzoIF79KCgGeD6nWDy5YwF1fLAeWOzc3piw21mgzNrcqK8G5pMab0mg8VVNpbGp+8f945z5oWIkABrUmQX7xJBQBpu15MhRU9Zq/JGoXJlfv6+2w5EsQc/obh9Em0G2n43agLGiDm9J+s6NLrDsx+41+f66YDSsNnEtdUAeYTELFgeOGcR/vwS5L9vjrAU96SrGzzMl8VgCKTkcFEzbZ6KjbIxA826VAe9LIUs9XSzyLufVo0HM= 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