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 99F69C369DC for ; Wed, 30 Apr 2025 00:24:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BEC116B009B; Tue, 29 Apr 2025 20:24:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B9CFF6B009C; Tue, 29 Apr 2025 20:24:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F0056B009D; Tue, 29 Apr 2025 20:24:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 75EF06B009B for ; Tue, 29 Apr 2025 20:24:33 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DD1401A155E for ; Wed, 30 Apr 2025 00:17:13 +0000 (UTC) X-FDA: 83388795546.08.B426F42 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf10.hostedemail.com (Postfix) with ESMTP id F1AA7C0006 for ; Wed, 30 Apr 2025 00:17:11 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=HfFcwzWl; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972232; a=rsa-sha256; cv=none; b=MBIfznnTZ8RsouBpmhnJK08OV+skX4WRRVbDnKT9yM6vuX0Fa8PD7mXOu+H9VcTdKQ61Aw xOUO85FdKSnUVzKEVaPWp3C6SkT11pYO8ldaayR73oq3i7qFY9AzqaMHlsx60VQUeKbASl v9POJ7TbHG5777sS3Kig0hleFj0jTf4= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=HfFcwzWl; dmarc=none; spf=pass (imf10.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.170 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=1745972232; 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=SQhD4RGrPvN5KDVlO784BlCXFf+Afq7++TBvXb/ZOFY=; b=slvpIMkhzoxjLX6Ch2oeSjw8BWGwNLJPmTnTJg/aHnfg3H24pQPhOXcKx1ea7wMIqwiSFJ YxINEgqhU3z+j16g1EMAFtZ3YDFf2ZwfbwX0U82zWO4nISd/t+kSWkm1X+C2KpqnqRBD0c D8blvZ9ZKIjDf5GCnfPMHVBfOOuiuno= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2254e0b4b79so99464815ad.2 for ; Tue, 29 Apr 2025 17:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972231; x=1746577031; 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=SQhD4RGrPvN5KDVlO784BlCXFf+Afq7++TBvXb/ZOFY=; b=HfFcwzWl+86bKaMiNx7+l8XmFR8den80pTNpQOIW3hZnyLcztqDKmWnYmd0yYAT895 GjtndV/mp27QBrcsQZrPQ30OMT4pEFW2ebBMHuZwWOsra9cAyjn37ctSQZ3QZSy0Pinz H9JkkYffo0GhNObq7aRz5LF1kme1x2qZ2+ygEI3DYvKAUUI+p7p5OZlm+7n+adqZ4Ab7 F1JNL0cmr40LDs049hILGY56e6oJeIUg9TrimZ8t+Gm+YLwVGZbUx7Ka6bHLl70jx8Dh Y6zHGei4RJul4pElN6UXo5//ZH97pUtyy/XnP3G3mJexSjFUIp9YQnAo7hWY3xsMx1St 2T2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972231; x=1746577031; 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=SQhD4RGrPvN5KDVlO784BlCXFf+Afq7++TBvXb/ZOFY=; b=Sv4bxwozOdN8NTynzJ6uvsN0C+FK7N+XO8Xq+2JuX6qDdU/+ez972y0wM8C++cTMHl bcM0fQ8yuhx1M2PIWZxxvdSpz0aoeMRC0SfxVTBlJzGYrKB495yBWlIk21zui2dMBT8/ L/U7SVYdskieVXbz6yDhIAbC2Gb3Bu7NGjOMjF9JGfOk9Vywi5tBVK9u3cZFnqvzWekF HajtnWgq0XPw8a5fMY6brutlJ5vJq4uce59ROrVrlA/eKPcO8aXoWXnxN1LvAigYCwCN uAE5WiGca7IzajAc298bdvKL8t36YfdSPz32xGtFyfhK5x1+DipX1K7PjbCvI8H7wJMM R7hA== X-Forwarded-Encrypted: i=1; AJvYcCXqWl0i0YzcEInda7KS+CUUL9DHfgKwHmxx+JRSH5OJn6MCOdYu10rVRvwyvO9C3A/n3igi/1ARqg==@kvack.org X-Gm-Message-State: AOJu0YziRWoDTe27UMITXmRpJwu3wXKSCpiO91blNhRsJaHM/Y5yP2Wb M53ILlJB8euTS0jNsi87LrCp70U6J5BVmvrRZGeVTZWpHETVMdj4db6LAue6axk= X-Gm-Gg: ASbGncsP0dCxgrpe6Bk4p6HrcuW1CCKgNJ/BS6c3Vs8hLn7aRZcQCzN87c9LxwxYPlA 1R8SEYswBRKU2Lsgc9/LBgz7STyqzg0G2tdDQxfsUtQ161S8vKboNN8WErI3SUxs+QhdRuO7p0L mt1VvRP95Gppjzgt0kM+T2hERWYzBfOINS3SfPlaRda+Np8S8T6tM+hIsJjaBuyx/N4PkEXNtnk XFci3N9YNMYT1cTszkr5zfBijpXcJxCGZMa0Lb3yDTxMk4fWth2TkRCU9HxjjanluA68iHs+MxS r7GwVYFJOWbRtjrEqTRs99LlXPuwSGrSYv9RnqmTcR0rMcUrHys= X-Google-Smtp-Source: AGHT+IGGioI14EzwjWxiMgKSjXhSCLyNkbMqM6RySIWm1VRTHqizTK0idzfeTktPhmn7c6G1vIvRvA== X-Received: by 2002:a17:902:ecd1:b0:229:1cef:4c83 with SMTP id d9443c01a7336-22df34a9861mr18945415ad.4.1745972230840; Tue, 29 Apr 2025 17:17:10 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.17.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:17:10 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:31 -0700 Subject: [PATCH v14 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: <20250429-v5_user_cfi_series-v14-14-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@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-Rspamd-Queue-Id: F1AA7C0006 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: bxkb118xnd6jrtbic1qrdunkpxc1xaqb X-HE-Tag: 1745972231-59717 X-HE-Meta: U2FsdGVkX1+5ktlSKyrl3TztpjgHalQYlP40/nYOD786Tqg0ES2Uyr805T6G1uTzL7rU/JLNcBqDo4+QWryI1vXb6WYXGopatfWkaYzkJi50bAVuJDQUmwe644kRRrMSBpOwi/1STEu9SQO4ZJ0yfedf5HfC3KQDCwKqq22sBuQ5k6jok8ftcOznyV+8nU6MWT/PyBPgE+XeqnAP4uFKyedO6Waey9s0tKglZo+jMTF6/LT66eKAFhvcMTsWbYvSqFdumpUivDnhz3YhEd6hbw1TAKBgPj4H41JoFnxQ90eSIWDZnvFZkK3aIPIzOR7iKYupl3kOaPgbtLJeCWpk0m2N6chaCghaWdnPh5EAk5gpXP9/WzGX+Pw3Jw1RU2SRevUV/82PO3WeiMgeYKvbydv8cz5lZCG6m9ZWh/CWr+hlJNPbpc76hQdfUQmjhMz+ixVEK2TVnxGxsfV5Cl7N0rJe51RF9nHzLukzrpUrV34Fs51Hw6P+vlx1ZPGmmouvOiuxaAHO9cO6h0jUHakj+tAiAijjEouedaW447tkt/JG31SMWVZqvGM5VEZg2/pU1cDhGHAkUDq/kznkZE+FVEZGrqyjsrewKZChDHeue1jrrgWwC7vwOkGWL+dyVcipwtYxFUJn9Ak3f+QGHnGtpHJmV0jzIAuIC4VrnWLDYH4lx/GlnZkIsopjv7vdFjn0HJbQMHZxEdxulk0Rawcm9USroIEDdqGTp9F5/eT/EKEAC5IaiQyovg4T0qmMUsS9saC9VPU+OkBtIvih/ipDukV4MvdkQ5ZDb/lvLKfTDw9V/gGl1wdBS7qXJ8cVgz794L1iLS3H39tbqNCsQeoJCpcQ9NVAGUSsHJIqrZ/BPfC6INRYBLxgXwVujKkiCMBfobPDpoNy/7ksvJLyupfZ7CKdtyGsle82pRJCj7MMvBMlaTtR4k4t+qE4DSUcRlpdEs2pLy6s04ix9Di9DF7 5XcGCCJD 8QtmXiD0fg7rMARO4mtH8+AjwkSoLkmSube+d9HViyhzRCMf0VJPnaItrQuQryxsshylCIAe9R5i2btULhTBQ1FbbuME93fcO3oKqp5f8m5RbWcGTR81tJLNEPpA9je+eZrsrdSss1AXQHruRSZ17uJMWYK2WNSjXoMJigm2zXgO7N4R7OvTM9LiuXVQa8L+BGW3LkDtfVbC9e71EcGRzaKjlIrH0yz1gDPBi/plgQunRvoKZGTb+T124k8auxAto9CCA+L1zZvC9cwOciuyWsE3eaEmjLcvZRml/vBDozjpRX3P7+UpH6+3yFIWP78+rJYXLWmv9BQ8xBwWPUGtpyVPH7f3uyXTi8/Gnoey3YjX6EaMPjdkxvo8kv8BRbyFB9mOGxn006KTs2PLNF3HZzXUmYTjuKAVTYBgWqcyErbgRtYDXDhzp8UlCv70R+66M1L+w1fqPZakCNv4XsK+IkvSIA+WqvmNm2uHWF13qfcF678dww7GPKE/QaJz1Z5HR7Yz6WwYquTda94w= 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 b530ff5baa6e..cea7908cdb3a 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) +#define is_indir_lp_enabled(task) false + +#define is_indir_lp_locked(task) false + +#define set_indir_lp_status(task, enable) + +#define set_indir_lp_lock(task) + #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 cd11667593fe..4587201dd81d 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