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 610EDC54ED1 for ; Fri, 23 May 2025 05:32:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 033716B00AA; Fri, 23 May 2025 01:32:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F26516B00AB; Fri, 23 May 2025 01:32:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3C616B00AC; Fri, 23 May 2025 01:32:02 -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 C52536B00AA for ; Fri, 23 May 2025 01:32:02 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 70F53E8052 for ; Fri, 23 May 2025 05:32:02 +0000 (UTC) X-FDA: 83473051284.20.6E85E57 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf20.hostedemail.com (Postfix) with ESMTP id 826281C0008 for ; Fri, 23 May 2025 05:32:00 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ZE/j3n/g"; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.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=1747978320; 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=tCrTjZOfI+JVMv4HFce3JFt+Huw19vlCWLtjnaAyTljvawD5lRB6KzPasWmXggkwcJg0LT LeI9VzOj1iTb9s7h0NIlIbKgv+4fd/3H3fj1d/RbdV1BXnGZse8nBk/s1HLFRUoTU7to7P catNWDNZCgyksUZt6RZWjMHMrXCBzYk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="ZE/j3n/g"; spf=pass (imf20.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978320; a=rsa-sha256; cv=none; b=hyrkMv1LexaV7jaQx4qGfAiyw0xRdjphEHx/KSq6D3n47pkOwtfSdzwQMrkPT0bMv4X4/W N9wY7qU4RMieiQOEv7wVFFkDtAicTTYN0fbTbPU0ZvXz8x7NjOnPN+71zTHs0xFfDYmWZk DdxKzOz4m4XcbzwjWDkuaEx6Sz+jNTc= Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-74267c68c11so7561017b3a.0 for ; Thu, 22 May 2025 22:32:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978319; x=1748583119; 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=ZE/j3n/g0ZK0ZyJ3f0dTGJQ1qfgDbBkhzfb7bX441WQ65mO+Q67SqvL6UmdUJshzyC 70pb8EVKBNtmiwh1pLC+SvRN0ZMGtF10MVzgLIGMjvMl+5/5BRjTLheZ3VsBVmS0NvT8 aPSmJrszyG32zSdhoB3oYUwjGXA2eFCoQGLIw1DFlHoWSCEKFYTmyYhVyu4Na7u9+JSb c084XWjnw2ozcuDSECo3Gyt2k8xXvCqG24yWERh4xt8uxBUktG0oVXkMi5+5P61jN1iL Wx9qy5lcB1/kryhDR8ODUAKcdBsJfe4tmetiZqy8crz1I8jU/kGwjxa7lOBzXV1ceWoL W5lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978319; x=1748583119; 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=vJM60bkhpiWR2efyotyRE6tpJ29YL4Tnsp+LCiJLIepzacOy8op5/pGD1m1r0bbXJT lVkGo6AlP3RzRtUeIOd2BjUbF6v4Q4cV691+uoGS94jnX8EOZJmd+Qe8G/8pXWISdifc oDQT0sflZG/MIlYnoZ5yhiX2KjGKSJuHkTsXrD/jRVjWKOoiT+VBYWagUCGEXEWWhfUP 6oT3MC5sSmCpalQqFfbkDEYdQj4clMdFMaU8EenOOGM9Q0IZ2PJKSx/uTaDmbf/Q02td 3CErDHrS0C+dmCel7daGkkMvi6G9W3+R9raVbVEKJftEleZGXQLtS2IvXOj9s+YuaaBH hNYw== X-Forwarded-Encrypted: i=1; AJvYcCU/OrcCGZb10z914Mj3C32FZ6TXWgXnHyzP0nUvOnqL1x+j/WzRPkC4PSUIpqBcvUn2to0FKZtAHg==@kvack.org X-Gm-Message-State: AOJu0YzZ76PxGvMZBvbubnu4auRsKAXrPvzP+a/mnh4bb7IKxmxZRtsU 3B7mg8V/6MnVUq/aJptL1KYJ7VYJT59ZNPiawAo5RbbzIozWNCctqxohcJSQFuoPBXo= X-Gm-Gg: ASbGncvq+4+FuSE1shdxALO6g7ZUT2y7pasiPp8Td1C+f4DP62J5Jyf+2dhaw9zaaVQ nJAMXXxw75dVIUa9I5ftEdM04BtfqLza1e8ojc43a8Z1uEEcw7PdeXIhpb7ZPAzgwOy51FiIm8H rV8+SlEgsl0AT+hC9CqDhb5Ex+JAZXFUyMRN6O7gMZ0owdGYoUN+TwqGnL9aByYEljodMJxWlur iXyplYAPFoTQgeLFJOJcAA3ddwacl+VQAYfLISiYvXct6AuAFcic8/XNkz+09sEYx4BfkD/1rSO aX5ixZSd/ybug8YQsiS4zcElLX9YU65Pi57TPZ34vm5qE7zVgISGfRN5CiNu/g== X-Google-Smtp-Source: AGHT+IF7UymuRM2VMq3BcObEiXcuDqFlUtYX+AoOMqarKbJw52P0vmSyNebEAP2p44qvWK2d2s3lag== X-Received: by 2002:a05:6a00:b56:b0:740:a52f:a126 with SMTP id d2e1a72fcca58-742accc52cbmr33032056b3a.9.1747978319325; Thu, 22 May 2025 22:31:59 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:31:58 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:17 -0700 Subject: [PATCH v16 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: <20250522-v5_user_cfi_series-v16-14-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@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-Server: rspam01 X-Rspamd-Queue-Id: 826281C0008 X-Stat-Signature: jxewr8xsecr7w115zwuxu7zjsn4fas7j X-Rspam-User: X-HE-Tag: 1747978320-769990 X-HE-Meta: U2FsdGVkX19VwgOVTXbKuzmfXCKi5TSNPS0XDu0jjFK2eiFxbh/2lBHOC7ILsJsZoRoTvv9Lc2xS9KHhrtV4P5QvSirLMhwUzK74T6Lni+HRRDDHY+a75OMaYg77An1dgFCQ7hSlsSAeMVlBXS5QR0hTVN6DnEq4NqAO57ZyByVPWPQpxGmDiBcEE2cPNRHyRLTyhaAtfBoP+eMtH7vtUdHJnaEGI536fvjigG7LX6epte3BazcFTGU+Wq8/VHSHTN7yJaaFAq+aIFV+5MOVBAmTp8NSI8HhxHmcQokT70zwYt7fMMu49lHRiRDmWkSmg2kfl3mpVHi+iOAQ5Dsc0aZZogfYtYsxJ60ZMzXviMpAMRIcV7ASQJ6x17rE848FpIcPhWF1E/+gi2hkfmHM/Ug7uDnvIGeYH9FHhTdLiiIptfbnYXftMmd34ibFKsokF1zwSO2LT7DpAEu+L7LRzmk7HJbMR3qhw9Nl1H4lF28KdaZkLp8ovuKbfQ1q/pSBVg8DB3sE8CZLsMCdXEo/oT4JmcwfeTjjG2FsBMejLhNkqN1tqTCdd5l0eT6yAsiLGjbVoxfVUrWnyH4R5xEgusLc4wPhEm37Es8tVGgykac4IAr88Dg3AEOLqE0G9ztEFoBuhWdoXrxh7HHN8i478p/kEVMN3Pt3Dex9ZUPkQaEAXEWGB1KK1OzPAHbCCyFZaNFRoUIEOCLYOwtGGsQmrMHGPa8EtFgGrbsGPzontc4ojp6ZKpyAXGpOYV0QkE36hCnPIDh8MdDUMQOmjkJ42H+L5sp7LGXS8HSuj/Ih04tDlfv06iQUtdeKkYa97xhwgUVQ4wqAOdznHU5K2p5jN+nhvGFnXy5c8VyuqRqFeq1ePxPXcKfBrEKLebwIrDoS4SdhuFNOatzQhWRR1p405Wd5cT2H8kiJo6ZdRU+LMZhh9rx36u5lPtwflhHGU4Tjz+YW1vUAjiowvEdznGs bYkVe0rX lSAMt1RIuSyOnk2gx5kHDvGOzgB5BLfyJF/fHlXM94CDBrZxuMjDNNaWaR1fDBN7IKhhCI/XWt9F++LHty9fPyjQn0e4o2ZhNnZTeAlkpSgqGzRwnNtJTiJ+4ezSpn2R0GPDL50dM0+pF/T4ZmL18Sk6kiGUl42+IqigVgMKID2QFKxqc03Qod5RNHCPxE1h1VLASd5TlJhev18mEk6SUWSSGC4hIbAqfIqHPnSV+PMP63Bvopr+6YmLwlHUl+qrwI7ewqnCg6N6JTzBtfntk1P8UTgDBnweHAkdNIkLQtoKv4wUiYNxsHDyYO/X4iknUoKDqEaENyWtM8N5iIsqNFkDnGdX0XwMDorWzMm3rn9a1UUuanNMIF3d8TZBdBzwqcFCAr3AhGKRSXknPTp8IfPY+nbg/UYDvRN7bt+nJKK6az2mks4of/FpuCp+uAeg4Y/nBH2TLzVIxbggbvUkLZ6mhq85PzpJeSi8TmxTxUGgLF5ruCzhXx06wcE718ZiyETrWrCccvn4z7+o= 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