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 D3F72C5B555 for ; Wed, 4 Jun 2025 17:17:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A1D9F8D0040; Wed, 4 Jun 2025 13:17:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A7058D0007; Wed, 4 Jun 2025 13:17:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8478A8D0040; Wed, 4 Jun 2025 13:17:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 63ECB8D0007 for ; Wed, 4 Jun 2025 13:17:00 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 16A3AC02AF for ; Wed, 4 Jun 2025 17:17:00 +0000 (UTC) X-FDA: 83518373400.05.1A02FAE Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf15.hostedemail.com (Postfix) with ESMTP id 1BCC5A000C for ; Wed, 4 Jun 2025 17:16:57 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jpkRM4YX; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.176 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=1749057418; 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=4/f0L0aM2im1hNI4FqeJBncnA+adhlVAx9+n6QIigJg=; b=gPc6xSEZDjFEk6jix4R9lkv6YXBsgyhZVMM9JEYvMCFjiow8k18bxdakqXb+cj4VE6DHiQ H3puP3oXYoMiQrjGC3liLNsi+UqOX/VWbEsvaRwd7y40zQchU4DMV90VBd4XYf/eMJTRjM EBNSL6wMytolX0S6DTQuoeh9JbJITeQ= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=jpkRM4YX; spf=pass (imf15.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057418; a=rsa-sha256; cv=none; b=EcAcdP6UQo17VAQRCIo2myH9Sn916tssUCInu3HvJnwgvZA8EhOkX6z2xlG0kHoUnH7rhi +KgZx83uIU+e/oFxrYJ/JMSWwwsuAmk/hLB1xdOhr+K7xPpsxiRn3K+J2ZYq9zmDpT+0rl YVdVYNmIdvp3w3UpIRmLWgLXv+d3ywE= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-b26d7ddbfd7so51166a12.0 for ; Wed, 04 Jun 2025 10:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057417; x=1749662217; 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=4/f0L0aM2im1hNI4FqeJBncnA+adhlVAx9+n6QIigJg=; b=jpkRM4YXz3gIkhfcmKbwYxWqp/juU591LTuHn74hWKj2rgek/6/7auyTfyYgRhR3sb iuL1kW4kWqMddxzX7glteMl8BEJwQK/bfo97pLemqp4h8EFW11a6IpczJTzM95bjOthV KS+qbG//beBeninymgmFdBMVcg3o2FefwhVw18fBGF8Cf7/pay5j+AYC1wuQKv7isVqc XyxNd+WPb0OvKI7Cvbn2y/C2vFBtnPYId9T9nXuMZuk9u8y4oSsXwthRT8E9fHTF0Evs qi6gTh2KnRG6p7b2yL6l5pmNZD7p9scQ4Tra7CWDBqJhN6hXBXi7+BNC/319Wkj9tz1B k9Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057417; x=1749662217; 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=4/f0L0aM2im1hNI4FqeJBncnA+adhlVAx9+n6QIigJg=; b=KL/NIY2NsQ4VjlcRvPhaWUC8vqplwoTGa9Yz6UcJSp181TmKfITAuhKMKP1UIrtUda DLvcN48PZuAGCw+AtxI4rYmnh2B8R/GUIvabimlRBo+sN6uAbp5v7PYRT+juUM62HAga fgYzoMk71x7+pJbyfkhA+D5YYNgHI+4eHkSSkEm9IpDw6SETMveXPlFK6hWMCzOAgTd8 m9Qp7iljx381Esrv+uBt/AdgMPYo4YwQkuKBxTkpzXMLuVjaPbBb5sgeDWcBPMtZszMx 47aJJ0uqYajFue/hd/tCF3AjiuvUZAvk/M0JpgQJbWNQlR5sVNAYmxAILjlhhV4u5zva 0dyA== X-Forwarded-Encrypted: i=1; AJvYcCU6P+bnuQGTdj2tgmc5pFrjpJhiXgMKunGWsGhff+t/9TqCv4bMtNYuoDuGh7cTMjekkQ25wiOb+Q==@kvack.org X-Gm-Message-State: AOJu0YzNw4AoO0ylW0Ct7DbgQhPwv+94hzic3oXTK7f9yOpqZSiX0Dwl KtSZ4uH7NGiV+s1XOIWSM55jSyQ3EybTEdiZGpmQTvG1U3S+xLnCfuaX1D7DzAS7Bz8= X-Gm-Gg: ASbGncsDzGRTe2KGTWR9V03680xKTam4OwuK7UOAVNv3O9a0U/qdwQZiHlh/BH6ffd4 eZkQs8D8inU1r4S+IIw05pQYuS2ojCm/j3k+qQMUFMlY9W+WfwjmdsgzehAd4Mo8AwAqEueYXCh hkgMsAsWGJDQhdwJuBYXX9xLxou/UOLRWFDqRJvH4HpgdO19hBFn2mBBNXtwvgRvG3buHQMAVPa y10QM8pTpPMpuivMSXjUUoMJnurIvJx/4tHG4sz14ZRv5BoD4ZR93h8UbTUJJFiJh3ADpMKk9/l Cxj7Uy0UPJQo+JGt5Ix/SLR8oXpFLRTBGn0nlxOTyNS5ohKO1iOFJZii3L+bHClpqZeNeHslTH1 HwQdnZP8= X-Google-Smtp-Source: AGHT+IGUQ+606zAFEeN3EdNg/32lSEpOR8pjT3Wpzkm+BItxN7Z6b3x4NPSTnjln/92NqMxTfmUeAQ== X-Received: by 2002:a17:90b:4fca:b0:311:abba:53d2 with SMTP id 98e67ed59e1d1-3130cd96febmr6564673a91.17.1749057416742; Wed, 04 Jun 2025 10:16:56 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:56 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:38 -0700 Subject: [PATCH v17 14/27] riscv: Implements arch agnostic indirect branch tracking prctls MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250604-v5_user_cfi_series-v17-14-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspam-User: X-Stat-Signature: wxn6qsyf33qob91jg4h38j1qty9erjm1 X-Rspamd-Queue-Id: 1BCC5A000C X-Rspamd-Server: rspam11 X-HE-Tag: 1749057417-52551 X-HE-Meta: U2FsdGVkX19MAKR9+I9w9627m7g1lZfFSznlNlKOlGzU6FM+VtqIcRqzmz1dOPWkNGmrNbmt3qqz6NtpWv5Z1AdZXD75YjbV+pyuQbKqWf/3qd+eLzc0P8eszZQdFuWP2Ozk3YEDQlwfELzQOtzXakGLo7EwKV+3P+RmkZXHo6qPfMnp3yV0pXSrKJ/rkf+roiG1XCGfg8epEUWSOjN6877uYWvSDM5iXGiFG0YbieWqXlastkAWTSvJ/S248GkQXC4XQEXEyvdUuzdaEg6IYIn1cM2iMcG0elkYFtNcCJgj733YfmsFXOUgSGrS7GbL8XLoSqGj//jp6AeHbGH9Oyl7uDhuYjuBr+eTvyhZ1N2Nf1j39s1wARkMhXiO5oxh14mhgYW4FJq5Zn73iPV/GyfS+p2q8eouD2M7qaLxaAbzhdsBFULG5Hwkjg4VaFJcqFhHBe014Plc8XX0Tv8ILhC+lC6NVpMuuIPcgPKV0FLn0ArDoGHn2FvVekRdxe3oosffIt8rbBGEQFL9xj0Nu2bzbxzYCn8BkNS+bhmidR1XYet2Lz5+3cbNVsD4IQNyeHvI4MxNuZmx5X2ioW2iCrqE7aHAoL+u3C1DNMZnlfXPW+JoFpT1NA3bL87kuqseZ4G4F9o1KRL5n5Pu5EgLSZX6PmvQxF//7c40Zm022IHd6xETtXiEP+R1L6vPnRtH9E18ng3QFZSCGkPS6EHa0tZZ+vZF6PXaoe30HfHwGXBTtuQwkhV1CfWwP+0R1KPdaN+8wwLsy3ClS6W/yv9TLxWuYFP1/jhfkLqHFUqy782xcVPJlGyKT0lvEXozyBb2PPvqCwiUTkK9Z+jgmmRjPzR/PnWPhmBvkHH7EGtvjtYDW+xYJsj0iLHuE2Uzi8EUF3nNz8Z76D4WdjGIC3XBOKQBBV20GuFX/VFmu2r0wi8uXQiTGTNvDEUCGywl0Koj6iyzbBaxZMRsPFPs6Y0 GUYEuGXD LL83mpv97wBKDspITfBfUsgHp7COphmgA2avkxTLApiLMu5S2vDJI6s0rkWcNlhqQyt+vnuZgxBOBmi4+4OujayDkvRYJnzBVOsTv9lmHl1NL3BzLR14YGpHPclJHsiO1gy5BXkePWkvH8cG9J6KTeIb02hWkiY3JlFnbMW8wBDS4hpZQfIr8X8bQPe7jmq9Zt817xtuksKsFDOm5oLydc+haNXckElT9C4kX6SqoAdaIzQ8m0kNJ13Nqeyk4ftbHsEVz0StwzP85bOATtxYeDov3jMPPjKkTs+wyFPeIuD/BF3D72hKN0A8HSfl4idK/HmGsXLlXy320XTme7bgLGtKbJlshCdVAr5Fhh29BkRH9bxcTVM9n+sX4+bLim8bzoMeTjj5uQoiOk7iERbq1BEuULaCW/YoyaD3YeV/C12PK9fUHQEzAiLza0PXBIDpOcH5pTBkLLdrwIXXtj/NGxTTgC2w9U1Pwjcnm0jV+UjkXIu8cGV4S4Kt5kY2yAZgp28aIRhdkYgQlf0k= 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: prctls implemented are: PR_SET_INDIR_BR_LP_STATUS, PR_GET_INDIR_BR_LP_STATUS and PR_LOCK_INDIR_BR_LP_STATUS Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/usercfi.h | 14 +++++++ arch/riscv/kernel/entry.S | 2 +- arch/riscv/kernel/process.c | 5 +++ arch/riscv/kernel/usercfi.c | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/usercfi.h b/arch/riscv/include/asm/usercfi.h index f747ad469c7c..98820d93c6e1 100644 --- a/arch/riscv/include/asm/usercfi.h +++ b/arch/riscv/include/asm/usercfi.h @@ -16,6 +16,8 @@ struct kernel_clone_args; struct cfi_state { unsigned long ubcfi_en : 1; /* Enable for backward cfi. */ unsigned long ubcfi_locked : 1; + unsigned long ufcfi_en : 1; /* Enable for forward cfi. Note that ELP goes in sstatus */ + unsigned long ufcfi_locked : 1; unsigned long user_shdw_stk; /* Current user shadow stack pointer */ unsigned long shdw_stk_base; /* Base address of shadow stack */ unsigned long shdw_stk_size; /* size of shadow stack */ @@ -32,6 +34,10 @@ bool is_shstk_locked(struct task_struct *task); bool is_shstk_allocated(struct task_struct *task); void set_shstk_lock(struct task_struct *task); void set_shstk_status(struct task_struct *task, bool enable); +bool is_indir_lp_enabled(struct task_struct *task); +bool is_indir_lp_locked(struct task_struct *task); +void set_indir_lp_status(struct task_struct *task, bool enable); +void set_indir_lp_lock(struct task_struct *task); #define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK (PR_SHADOW_STACK_ENABLE) @@ -57,6 +63,14 @@ void set_shstk_status(struct task_struct *task, bool enable); #define set_shstk_status(task, enable) do {} while (0) +#define is_indir_lp_enabled(task) false + +#define is_indir_lp_locked(task) false + +#define set_indir_lp_status(task, enable) do {} while (0) + +#define set_indir_lp_lock(task) do {} while (0) + #endif /* CONFIG_RISCV_USER_CFI */ #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index c4bfe2085c41..978115567bca 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -169,7 +169,7 @@ SYM_CODE_START(handle_exception) * Disable the FPU/Vector to detect illegal usage of floating point * or vector in kernel space. */ - li t0, SR_SUM | SR_FS_VS + li t0, SR_SUM | SR_FS_VS | SR_ELP REG_L s0, TASK_TI_USER_SP(tp) csrrc s1, CSR_STATUS, t0 diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 3099fadb0397..2caddcd62848 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -160,6 +160,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, set_shstk_status(current, false); set_shstk_base(current, 0, 0); set_active_shstk(current, 0); + /* + * disable indirect branch tracking on exec. + * libc will enable it later via prctl. + */ + set_indir_lp_status(current, false); #ifdef CONFIG_64BIT regs->status &= ~SR_UXL; diff --git a/arch/riscv/kernel/usercfi.c b/arch/riscv/kernel/usercfi.c index 08620bdae696..2ebe789caa6b 100644 --- a/arch/riscv/kernel/usercfi.c +++ b/arch/riscv/kernel/usercfi.c @@ -72,6 +72,35 @@ void set_shstk_lock(struct task_struct *task) task->thread_info.user_cfi_state.ubcfi_locked = 1; } +bool is_indir_lp_enabled(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_en; +} + +bool is_indir_lp_locked(struct task_struct *task) +{ + return task->thread_info.user_cfi_state.ufcfi_locked; +} + +void set_indir_lp_status(struct task_struct *task, bool enable) +{ + if (!cpu_supports_indirect_br_lp_instr()) + return; + + task->thread_info.user_cfi_state.ufcfi_en = enable ? 1 : 0; + + if (enable) + task->thread.envcfg |= ENVCFG_LPE; + else + task->thread.envcfg &= ~ENVCFG_LPE; + + csr_write(CSR_ENVCFG, task->thread.envcfg); +} + +void set_indir_lp_lock(struct task_struct *task) +{ + task->thread_info.user_cfi_state.ufcfi_locked = 1; +} /* * If size is 0, then to be compatible with regular stack we want it to be as big as * regular stack. Else PAGE_ALIGN it and return back @@ -371,3 +400,53 @@ int arch_lock_shadow_stack_status(struct task_struct *task, return 0; } + +int arch_get_indir_br_lp_status(struct task_struct *t, unsigned long __user *status) +{ + unsigned long fcfi_status = 0; + + if (!cpu_supports_indirect_br_lp_instr()) + return -EINVAL; + + /* indirect branch tracking is enabled on the task or not */ + fcfi_status |= (is_indir_lp_enabled(t) ? PR_INDIR_BR_LP_ENABLE : 0); + + return copy_to_user(status, &fcfi_status, sizeof(fcfi_status)) ? -EFAULT : 0; +} + +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()) + return -EINVAL; + + /* indirect branch tracking is locked and further can't be modified by user */ + if (is_indir_lp_locked(t)) + return -EINVAL; + + /* Reject unknown flags */ + if (status & ~PR_INDIR_BR_LP_ENABLE) + return -EINVAL; + + enable_indir_lp = (status & PR_INDIR_BR_LP_ENABLE); + set_indir_lp_status(t, enable_indir_lp); + + return 0; +} + +int arch_lock_indir_br_lp_status(struct task_struct *task, + unsigned long arg) +{ + /* + * If indirect branch tracking is not supported or not enabled on task, + * nothing to lock here + */ + if (!cpu_supports_indirect_br_lp_instr() || + !is_indir_lp_enabled(task) || arg != 0) + return -EINVAL; + + set_indir_lp_lock(task); + + return 0; +} -- 2.43.0