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 6E7A5C3ABAC for ; Fri, 2 May 2025 23:31:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8A9816B00B6; Fri, 2 May 2025 19:31:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 830DD6B00B7; Fri, 2 May 2025 19:31:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 634386B00B8; Fri, 2 May 2025 19:31:25 -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 43BA26B00B6 for ; Fri, 2 May 2025 19:31:25 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 30BB3C0EA0 for ; Fri, 2 May 2025 23:31:26 +0000 (UTC) X-FDA: 83399566572.01.225B45F Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by imf24.hostedemail.com (Postfix) with ESMTP id 4237818000C for ; Fri, 2 May 2025 23:31:24 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=R9I7JMUN; dmarc=none; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228684; a=rsa-sha256; cv=none; b=hRIIIhNh1Qn5S2VztU7daqQMHRNOFFJnSNCXgK7rpJpMq/bNpZIRHteKQzS5PifCus6+XK rA8Gvz7ecM/4WCey8Eq5je1aJVTLHsQxR63R4cZpNMTSXR7x0EjBpVBQm4tU/fsrMCNgWl yItDbAiemrLF82u36UVxC9WJUhd/26A= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=R9I7JMUN; dmarc=none; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.182 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=1746228684; 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=mOvvUsAbK6ylLz26xa5rKCddIjjT5aenM1iFIKlP9uJ/Q4XvZ80cvF8kNw5vv7WDEJocIC sPyxs6n2EtCOWI2e2MVr2MVZMEZ4MhQwgbMGn35tf4Ho18nf2CbGpIMUuBDrrtFgPITGmk CEdOayuwSHbIZUtBCcaaZkc1DKou2xQ= Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-227b828de00so28425945ad.1 for ; Fri, 02 May 2025 16:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228683; x=1746833483; 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=R9I7JMUNDs1uTcMZYwDokDXqnJ2o6Ytv14fmM9qwhfpi0QdL6ntDQXh1Kr7R70aSlb QdarAGDZO1iyU2Tmk51TMTA3jNrAiGB0I/DxT91SUTPr5Gf6b+4y9umAzltdkZBDrlCp 8A4SB36VvcPjc14HOLAgRDNIbe+pXwTUsjo/Un0QjkL0fpD8dhdAc6k9mctFY3t+p7nw ESv7Mpnb9pV1s6Svqwhfde4/c2Vpcdkx5cZM0c9g45ZVyJhS2RmyudkQojON+dE1dsuM ED48/M0Fn+qe7ZCdfj+nqQUkIN8349ocTtw06q9Ptbf50e63bK9F/Etok+sT0Nzl30zE Zqww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228683; x=1746833483; 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=oodCEzUeq4W13xeMra2K0i+9CUSkHOrbqF53jgvkruwXPrccQVKbmTkP5JD4w7fFX8 klCSAYDpwRfeooIa0EHF/bvSsXpm5MJJ0278odWvRray21xNFDik7qQV0aBDFCvWOiah Qq/Soo8tU5j3ow4EzE+lMB9r1tzel0U53jcIYungVll5duYqk5QWCV1xfiPRFBqor3yj rC/4yPOG64sHgANqNmYAeakdZvke400v1TdZSsGTzJt7AFS9SbUTCjI+iHwfjYhwliJG Ru0sRC7p2UHYseaJXhyDU2FmGJWHUFFpqSifd1OeLlBVF2y2cdvYiW/Gydx1rfR4ey2n xcUg== X-Forwarded-Encrypted: i=1; AJvYcCVnRe0cg5LXZfzcE2/xv1R9Ueeqn4rBa+n13NHz2Ts44VCSV7e/Ph5kHCd6qHYJo6BhqciPcRll5A==@kvack.org X-Gm-Message-State: AOJu0YyVNp7WsIFWK+H/kFxsEQch7HjOIEgypqed1g7FaK4IZ5O9LDb4 WSq2f8Cb/U6AUvEbkJAV/9LF9aGH1rKROwiXwvKf7QlQryAAnda20BanlmwDk+4= X-Gm-Gg: ASbGncsoE7MMVylXzD7BpA9xpoRoBGZ3N6i7aNfuVghkakERIA1e3h+Ic5MEJ8wVvnr 6HO/1yFr3skO0+DppPOjxJdB/5QrV2yow4TRviUaz/qoxh/ZHd2A9ZCh3fDKpjFkMjcc3b3jESw obmpQjUspaGFMPtFw6fqJJjLxMDI+hHSFnGdK2Q8s4gq5mgHFDf2+YA5vYFTERpQuexUm9gaz1e zrhZkbN3nSE/2kkSabHj1Cg94AJgkqQM3OKhnFwN3LiG32Qu00Blg4QpsXk+BCFd/xJ1Zaqmlxr ZiGzdZvxNorSPZ4qPiyp900VVqfB5HQc44RPpxKWl62YWmBRglo= X-Google-Smtp-Source: AGHT+IEnEyQfv6rXkDwks926L8ASoKvWOxJUNSFNEvrInJy36miwJqftmRV2Neid4SzPOgI5CvSgow== X-Received: by 2002:a17:903:234d:b0:223:3396:15e8 with SMTP id d9443c01a7336-22e18bdf9f4mr14330285ad.22.1746228683100; Fri, 02 May 2025 16:31:23 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:31:22 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:45 -0700 Subject: [PATCH v15 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: <20250502-v5_user_cfi_series-v15-14-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, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspam-User: X-Rspamd-Queue-Id: 4237818000C X-Rspamd-Server: rspam04 X-Stat-Signature: 11xfhfcpjgx91iwmm84qc4cuhfhzfnqb X-HE-Tag: 1746228684-242630 X-HE-Meta: U2FsdGVkX1+bTqr7oP+BV85PpKXklalhrNsz1hTClwSt5t9C5YmZ31GQw2IeiOlO2jtZ5Kihd8GQ9ss3TtNyl96T4q8jpuURMuT74zKgnb3xU8pLARt7vFamgN5oBYy4mYUPwuCmLDQbgFqhKRqnXjwTM5B5w92vyZaUTnPcja8cPR33jGiwLKn7nGJF4BbXHQUdn9eRqa2rML/uhy9XyVP4ZrmfNa4zBE2ugAYkirqiXgdUyQuecuHaJnJDt/EdXUfB4s8fxWu6Vkh2NV/PQTSfFqSvblk28iJxQjRN0JiojcGD3do/Bjx1BMkuaBaPbRTUkQ0QoG3Q6DpZjONPzCrQFKMu4aKMq9LK62eSnuqCT1rHNcp9z4vPHDBLfawlv2QM2s5nDpCJV9duggm+VtUBHgZUyXdt7um/+6EBj8iKgPMFdwAR+gjJ12DJYMRPFPfKbImMD/GL8XR9lb5M91ykTbyyhKH89DpkM+DHD3xdw+2jBmSAjb6xT/UJ4/klJ3wO5WTwnDwfwjt1MLsH+HpDbdQV+eaFz2eGyMPhtTry6qlHBIM0638EpvlsSRlvRIJ7mNxYuAHS77KA5hWgj8JYo99EBgqdB7rtgJykBpORLMYhy0KqrW3MOejL1IsHkdR7EyOKYwh58UrHPOpHQWIe0z7Iels951MHf1QzutGbjut3xCUtlhA2DM69JfBtyW0XQbeFRNG4zTdyMMQQeN/0dPBI4H8nzV0AlFTxQ4MO4ZBhGSjRb5Sq10p+hRnfSXbq3I+yBjTaMljkxyBMf77lTt6kvT1h2GtgQjsTsNUBE7KRdWiei3Y004OdwOsS+58gi/E5I6KAVWwQbNW2m+0ARMs6fpO4CN3U0nlZljJ9DqoXZZEoGTX5qjta4S5pixlCLolmDBJRUbW0Jfz+RqI+Q2NhdqsIAsbjxN+rx+GSiy7uR0LhGPNARnDEeOmOxhOJMmORqXmnVd4i8/0 NPztyL/S Guvhr0vtCH1X/yTX5BGOMx1JPdX3tr20VfiA3fjUT7FM5mbyn7UaFsQHe4LbensM+4mnqKO9PPlZuHtZul/QD4DKYjQe0zvLkDk5Qd0zDjqHoYe1Ie4y+TjD6NG6YLVTrizObbFxc8PSG9cqmJFEdcxFHwntwDgeh4oAjKcDSvt+G4SKDjh7Qj9GuCOv6TuSgBJlg4S3YoQG10B0WMMY2EW7VTz26qsMSfQh3BiPFRvNEGCgHrsXrPoDwyMrIzEEwLhVAxNsKRgwzwbkmXWWa3Kfx+iZFoa7Tat4Gy7PNWlJhoJ87D6N5HDl+hBfmWJBwsPvPhZl2PrDIEctjBoRJ0ZtWK6adrnob+W/MmtIqHwEx1ZvMuzchl92hwiMoSka3MyYCMGSAQoWFEXlAa8P9Q7mdgEMXeyOPkCRRYZCsj765Fhtphkbuhpfo5ZoCigOOwuE6ps6o8ueixWLAnabtCisABRNcuzTeswxrx8C65LthMTNA7L16tL6rfExbDxgu7laUFvn8SXdzg4U= 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