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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 77969CCD1BC for ; Thu, 23 Oct 2025 16:52:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 51DC58E0025; Thu, 23 Oct 2025 12:51:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47FD98E001F; Thu, 23 Oct 2025 12:51:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 322178E0025; Thu, 23 Oct 2025 12:51:26 -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 19A5A8E001F for ; Thu, 23 Oct 2025 12:51:26 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A98B51A0BED for ; Thu, 23 Oct 2025 16:51:25 +0000 (UTC) X-FDA: 84029969730.27.80F9581 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf24.hostedemail.com (Postfix) with ESMTP id 594E5180013 for ; Thu, 23 Oct 2025 16:51:23 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EWyh/56x"; spf=pass (imf24.hostedemail.com: domain of devnull+debug.rivosinc.com@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=devnull+debug.rivosinc.com@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1761238283; h=from:from:sender:reply-to: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=M+08dmVPmdDoW7GfbvG/M1qTro1t4AbiZR0cd1eb7dw=; b=0nGwY4s7pul0MxgJSYcf6Bo/P+ssBrdKAdiNUz2TEqsICudakPt2wkzOogxBtCcgzrO/re m+vmoQ9gCvS5ZR+LS3puop9llRhQon8M/kvj4Jdh4wE1+opWaNwaDO6lR0HPv03ieBiJBY 3Oo4oOILFawxMNIDqKrwNx2ldYyEFZg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="EWyh/56x"; spf=pass (imf24.hostedemail.com: domain of devnull+debug.rivosinc.com@kernel.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=devnull+debug.rivosinc.com@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1761238283; a=rsa-sha256; cv=none; b=mhNyV41MVssldWIEDp2qUxLDsBhi3qcwhSiynQv/BWEkhqK1yDYkz6R/aCi4CYdDFjTl/T yjGxWMlxk8l47c/lK4ijz4oQYYouLxfSi98Hj7QYgvgvD0ZLp4fpatIK01KGGKah90aJvh vhT2+3/ynD6FKQ1il9aEhk93hC6d2h8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 7D5B24B12D; Thu, 23 Oct 2025 16:51:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 357B8C2BD01; Thu, 23 Oct 2025 16:51:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761238272; bh=9anbjlp/dCVq4jdi8+AUUQHUYCld9sH/aI/ellmQ/s0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=EWyh/56x65kNs9KdFDGTR47glgC6jgkgZbwjB+QolFkgRhOJYJMsBHNf96E78tJpV w2ZOFBo/kbbn1iMQnArIZW+FOZrKmhqI5XxwZe7SYoqRz+Atsvw03unOZcB3I4u3Bj hG6I/N1DheGV+4c28FVPugyieZwR19VkZliCiN7GWGdcDuipE5WAIoRiGQeK7oM1uo c8d2O2juatPcyHmKkOlezNmSHiPGcjYyV8zxY4kLxCWMboTA88yXw8bJFRpSqr+TCK lXUESXUqLqlsJ6Caf266bO+Ps7aqmTUVeD3c8in8HgyIPzAXvwEvJtAWO+0fFSRlHt 11HZNoLm8FFeA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A5B3CCF9E6; Thu, 23 Oct 2025 16:51:12 +0000 (UTC) From: Deepak Gupta via B4 Relay Date: Thu, 23 Oct 2025 09:51:26 -0700 Subject: [PATCH v22 21/28] riscv: kernel command line option to opt out of user cfi MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251023-v5_user_cfi_series-v22-21-1935270f7636@rivosinc.com> References: <20251023-v5_user_cfi_series-v22-0-1935270f7636@rivosinc.com> In-Reply-To: <20251023-v5_user_cfi_series-v22-0-1935270f7636@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?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Benno Lossin 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-Developer-Signature: v=1; a=ed25519-sha256; t=1761238267; l=8599; i=debug@rivosinc.com; s=20251023; h=from:subject:message-id; bh=4CrwjAc9RtzBMVfTPQPILf3kD5i9soL8MqVxmZnq8R4=; b=Y0ckbOTjS/xG3fya0NTDF9B5n1TT9F46fszfFpUt/npkScNMR11iZJmBYnkFRrteM1jkkw+Fu Y6kwqz+dO1xApYo2LnFlBaVRELWuN7CZdes6SYpwllK3XJ+MYCAQn/I X-Developer-Key: i=debug@rivosinc.com; a=ed25519; pk=O37GQv1thBhZToXyQKdecPDhtWVbEDRQ0RIndijvpjk= X-Endpoint-Received: by B4 Relay for debug@rivosinc.com/20251023 with auth_id=553 X-Original-From: Deepak Gupta Reply-To: debug@rivosinc.com X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 594E5180013 X-Stat-Signature: pioq5wfxfzxbyw9mpo6ft67itfzpapm3 X-Rspam-User: X-HE-Tag: 1761238283-519554 X-HE-Meta: U2FsdGVkX1/S3zwkTZHDzfrVew/vAtW3XprWrZG7IlfCGeFYvBHdmlOat0shedXqmE4ujWdRfn2AovsPZhKIUgbCb36qLkcp9KtM+KyWrpHDMKmXoYBaddNHFfObSgHqDgbX/gIL6V/+SS/NGH4aZjkG502oHS691B5+folPEYf3dvUethSbKDnNNfB/tS/X3t+jEDiWdC+RX3xudZczimVkraXIvvFv41N5fZYj4CX1CffBcwvWN1TPDBP5QFo/z7d4qtlFO8Wi7Gp/IDWYkaByowVrZy0NXidi5rtPgup0aUpsjf7rzRZ1CtB+AIX9f39uda9wBkUwMHI/umLQPYBNlS8sXVgyWe38fzgdnVIFZDK1t8X4Q9VgRmr0hXpk1A+os4hKvbyS/DnPeMNNkdafITYtRbA0A19e7JxpAJu760R5qcPAFc8bVz6hZeFE6um24Ga2TYdpY0mjm92rHzGkJjEJyB3MccHtDTwsX+NCaTLK8rjiYje/TY0Epi7AElCgrd5RSjkwd0dBYP8XuKoQwuGbAeqojOdVDUr7p3puNPJJ58csy75EDlWnvt7x3eHDIfhWb3lwGVFLbUHskJxgQO443nQLEhzzd5oy/tTk8Z1MAqaJEMMYqKvvetJR0AH9pQH5a3EyPVvAZMfHSuoCEe8Mb1XfM4gpX/zlnpYEQGhh/guTWLM0bMbOKmqhzADodY6wOllmX2wc020qu6fnQevq11861kAqyzw1s1gaXVzYJzQqoXDJvdhc1nKSvDtK+HZu1DtETrMNpjah5xpxjTpQEBIGxX2Mrhy00nz8tBJo20eZvSehCz7Arqtl+UvVIu7y63Us3kuQPAUmoMxW56EHjxi/FN0KsWVRliaihDmmgguZ/sVu2Hx7EZx0hbn3RVEIYEHSEFa7hJIVP2MsjkJE7/tzjeigbAfG4WWYS57ve0cvx1dZ5pljc/32ZDe3qC7CUsMM8PdcCbX 2UF8SOOZ +umuyrIjkaco+2eHs75+GNF85t9n0vy471EhGaSYy789AMa2SWJ1q5dLbnM4PClAB22zWlPwxdhSNOK7Yhi118O4r7IkNsPHno9EE4m6tLAxFvUMvYzn/8QVN0QbTip58zBkqH/Y5lI997pPh0GWVywtP84DSG07B2x+N/1Wa9Kl8mlf3lnliU6952RIgzuvgmJS0Y78T/6Lr75J8CtvsQEfSAN8juSNJFg57ZNnJmh7rYegsN11FgGJWRE2KSswbylOLWXG4mE0phONm/6y8mJ65nD7NM45Gr+tRmgp2Lv72b5RmjRX7q924YPJNTxzucy9imdnhZ464+D7yJfo+15ile2BXm9OOHX4nME/8XDsyTPW8XLu127n/4V9b3tZoIwIQu11u2+mWOZPSMwHjsm31gAzx+TYrLmPKqL5sTK4StRcYB794GH1RBFO/C5wnVkAymM+8Bw6L3XuTni9Cgw+kto6gVdUakKhw 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: From: Deepak Gupta This commit adds a kernel command line option using which user cfi can be disabled. User backward cfi and forward cfi can be enabled independently. Kernel command line parameter "riscv_nousercfi" can take below values: - "all" : Disable forward and backward cfi both. - "bcfi" : Disable backward cfi. - "fcfi" : Disable forward cfi Signed-off-by: Deepak Gupta --- Documentation/admin-guide/kernel-parameters.txt | 8 ++++ arch/riscv/include/asm/usercfi.h | 7 +++ arch/riscv/kernel/cpufeature.c | 9 +++- arch/riscv/kernel/usercfi.c | 59 ++++++++++++++++++++----- 4 files changed, 70 insertions(+), 13 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6c42061ca20e..453127ef8746 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6453,6 +6453,14 @@ replacement properties are not found. See the Kconfig entry for RISCV_ISA_FALLBACK. + riscv_nousercfi= + all Disable user cfi ABI to userspace even if cpu extension + are available. + bcfi Disable user backward cfi ABI to userspace even if + shadow stack extension is available. + fcfi Disable user forward cfi ABI to userspace even if landing + pad extension is available. + ro [KNL] Mount root device read-only on boot rodata= [KNL,EARLY] diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index ec4b8a53eb74..451bfa607745 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -5,6 +5,10 @@ #ifndef _ASM_RISCV_USERCFI_H #define _ASM_RISCV_USERCFI_H +#define CMDLINE_DISABLE_RISCV_USERCFI_FCFI 1 +#define CMDLINE_DISABLE_RISCV_USERCFI_BCFI 2 +#define CMDLINE_DISABLE_RISCV_USERCFI 3 + #ifndef __ASSEMBLER__ #include #include @@ -83,6 +87,9 @@ void set_indir_lp_lock(struct task_struct *task); #endif /* CONFIG_RISCV_USER_CFI */ +bool is_user_shstk_enabled(void); +bool is_user_lpad_enabled(void); + #endif /* __ASSEMBLER__ */ #endif /* _ASM_RISCV_USERCFI_H */ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 5a1a194e1180..f7f3368bd8f5 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -28,6 +28,7 @@ #include #include #include +#include #define NUM_ALPHA_EXTS ('z' - 'a' + 1) @@ -45,6 +46,8 @@ struct riscv_isainfo hart_isa[NR_CPUS]; u32 thead_vlenb_of; +extern unsigned long riscv_nousercfi; + /** * riscv_isa_extension_base() - Get base extension word * @@ -277,7 +280,8 @@ static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, static int riscv_cfilp_validate(const struct riscv_isa_ext_data *data, const unsigned long *isa_bitmap) { - if (!IS_ENABLED(CONFIG_RISCV_USER_CFI)) + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI) || + (riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_FCFI)) return -EINVAL; return 0; @@ -286,7 +290,8 @@ static int riscv_cfilp_validate(const struct riscv_isa_ext_data *data, static int riscv_cfiss_validate(const struct riscv_isa_ext_data *data, const unsigned long *isa_bitmap) { - if (!IS_ENABLED(CONFIG_RISCV_USER_CFI)) + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI) || + (riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_BCFI)) return -EINVAL; return 0; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 8bc3e1e3f712..92f536d46fc7 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -17,6 +17,8 @@ #include #include +unsigned long riscv_nousercfi; + #define SHSTK_ENTRY_SIZE sizeof(void *) bool is_shstk_enabled(struct task_struct *task) @@ -59,7 +61,7 @@ unsigned long get_active_shstk(struct task_struct *task) void set_shstk_status(struct task_struct *task, bool enable) { - if (!cpu_supports_shadow_stack()) + if (!is_user_shstk_enabled()) return; task->thread_info.user_cfi_state.ubcfi_en = enable ? 1 : 0; @@ -89,7 +91,7 @@ bool is_indir_lp_locked(struct task_struct *task) void set_indir_lp_status(struct task_struct *task, bool enable) { - if (!cpu_supports_indirect_br_lp_instr()) + if (!is_user_lpad_enabled()) return; task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; @@ -259,7 +261,7 @@ SYSCALL_DEFINE3(map_shadow_stack, unsigned long, addr, unsigned long, size, unsi bool set_tok = flags & SHADOW_STACK_SET_TOKEN; unsigned long aligned_size = 0; - if (!cpu_supports_shadow_stack()) + if (!is_user_shstk_enabled()) return -EOPNOTSUPP; /* Anything other than set token should result in invalid param */ @@ -306,7 +308,7 @@ unsigned long shstk_alloc_thread_stack(struct task_struct *tsk, unsigned long addr, size; /* If shadow stack is not supported, return 0 */ - if (!cpu_supports_shadow_stack()) + if (!is_user_shstk_enabled()) return 0; /* @@ -352,7 +354,7 @@ void shstk_release(struct task_struct *tsk) { unsigned long base = 0, size = 0; /* If shadow stack is not supported or not enabled, nothing to release */ - if (!cpu_supports_shadow_stack() || !is_shstk_enabled(tsk)) + if (!is_user_shstk_enabled() || !is_shstk_enabled(tsk)) return; /* @@ -381,7 +383,7 @@ int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *st { unsigned long bcfi_status = 0; - if (!cpu_supports_shadow_stack()) + if (!is_user_shstk_enabled()) return -EINVAL; /* this means shadow stack is enabled on the task */ @@ -395,7 +397,7 @@ int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status) unsigned long size = 0, addr = 0; bool enable_shstk = false; - if (!cpu_supports_shadow_stack()) + if (!is_user_shstk_enabled()) return -EINVAL; /* Reject unknown flags */ @@ -448,7 +450,7 @@ 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() || + if (!is_user_shstk_enabled() || !is_shstk_enabled(task) || arg != 0) return -EINVAL; @@ -461,7 +463,7 @@ int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *sta { unsigned long fcfi_status = 0; - if (!cpu_supports_indirect_br_lp_instr()) + if (!is_user_lpad_enabled()) return -EINVAL; /* indirect branch tracking is enabled on the task or not */ @@ -474,7 +476,7 @@ int arch_set_indir_br_lp_status(struct task_struct *t, unsigned long status) { bool enable_indir_lp = false; - if (!cpu_supports_indirect_br_lp_instr()) + if (!is_user_lpad_enabled()) return -EINVAL; /* indirect branch tracking is locked and further can't be modified by user */ @@ -498,7 +500,7 @@ int arch_lock_indir_br_lp_status(struct task_struct *task, * If indirect branch tracking is not supported or not enabled on task, * nothing to lock here */ - if (!cpu_supports_indirect_br_lp_instr() || + if (!is_user_lpad_enabled() || !is_indir_lp_enabled(task) || arg != 0) return -EINVAL; @@ -506,3 +508,38 @@ int arch_lock_indir_br_lp_status(struct task_struct *task, return 0; } + +bool is_user_shstk_enabled(void) +{ + return (cpu_supports_shadow_stack() && + !(riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_BCFI)); +} + +bool is_user_lpad_enabled(void) +{ + return (cpu_supports_indirect_br_lp_instr() && + !(riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_FCFI)); +} + +static int __init setup_global_riscv_enable(char *str) +{ + if (strcmp(str, "all") == 0) + riscv_nousercfi = CMDLINE_DISABLE_RISCV_USERCFI; + + if (strcmp(str, "fcfi") == 0) + riscv_nousercfi |= CMDLINE_DISABLE_RISCV_USERCFI_FCFI; + + if (strcmp(str, "bcfi") == 0) + riscv_nousercfi |= CMDLINE_DISABLE_RISCV_USERCFI_BCFI; + + if (riscv_nousercfi) + pr_info("riscv user cfi disabled via cmdline" + "shadow stack status : %s, landing pad status : %s\n", + (riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_BCFI) ? "disabled" : + "enabled", (riscv_nousercfi & CMDLINE_DISABLE_RISCV_USERCFI_FCFI) ? + "disabled" : "enabled"); + + return 1; +} + +__setup("riscv_nousercfi=", setup_global_riscv_enable); -- 2.43.0