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 F0F57C369DC for ; Wed, 30 Apr 2025 00:26:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 226EB6B00A7; Tue, 29 Apr 2025 20:26:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D69E6B00C7; Tue, 29 Apr 2025 20:26:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 056A16B00C8; Tue, 29 Apr 2025 20:26:34 -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 D3A3E6B00A7 for ; Tue, 29 Apr 2025 20:26:34 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 400AB5F91F for ; Wed, 30 Apr 2025 00:17:17 +0000 (UTC) X-FDA: 83388795714.05.61F8020 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf09.hostedemail.com (Postfix) with ESMTP id 4877414000B for ; Wed, 30 Apr 2025 00:17:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hcXsS+lJ; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 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=1745972235; 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=zzG5aBj4uT4Cxy0Ye5VbMroQI6g4J7udAW2U71MrLVg=; b=275sWtOcG/PYtuRCquRvYa39g6fpRprnbVd3mWZsZHKzv9q7nqjGanPgMgn5Craq2Ei12E 4NgNXxL+4uZiz6+KTmZkc4al7mmkfUkDP/kiNgIp9e0D9MaoQuG/U8MQTgJSVDcu698ank wOuH/VCw5Yhwh1vGsMhOyXRXA79+BJI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=hcXsS+lJ; dmarc=none; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972235; a=rsa-sha256; cv=none; b=q5bRO/TUCcrETTY1xfsvmoDpIgUmjo9wR8nWT8oQ24tiguX+/UJGsaUBcYe7W0HB+stNzJ Wds3SM9I8/WrySN0s0R1BuEyS4IRC40oh2cIQHZ7ZzwA7mcx2wRc0CdRRRos7egs5g6N6e fapniVa/iguArBN/DbAsOZCvs87RssY= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-224191d92e4so72621605ad.3 for ; Tue, 29 Apr 2025 17:17:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972234; x=1746577034; 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=zzG5aBj4uT4Cxy0Ye5VbMroQI6g4J7udAW2U71MrLVg=; b=hcXsS+lJ5r36pm7t1gj59KWu0lccfd+JcWGr7x+6H1CMMfOxU4ZO/X4MLTPHvxwkR9 Tr6+rPRX29cG5Zt+gB/+G7I80wiK7NKvDWJNx+Dg6fPDYwlDNzsNuptW3QqxjY1LaKAT 9MvhuFwWtbjJroifSu9mqJTeNnC2HBXmx0qhNzRamZF4/kfLjju4mGUdch+HjKm+fUU/ ZBykDAdde43nqcDU/doZ/mi66xjgdbhXzn2YHwvyK9tmpZR1ND+9j7SLvup0EaRqoEx7 rJqbbl8+qxq0SKx46eB/5igV81Gbo4qWcm4mCbyGp4unHYQN+6x4tGH74hrBWMpSA6qT okEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972234; x=1746577034; 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=zzG5aBj4uT4Cxy0Ye5VbMroQI6g4J7udAW2U71MrLVg=; b=VR3XFjJrs9sjJpnhnzOeXDwob0Iy8qZBlvT5ayKBX8eHTkq5MweNH2Lmco8xD4pLxI mFbjCcH2yO06veNLoPLMlFhlJZaqspC+hSyb26CWfvJihmtylHX2FFqdi7sCinOvXW0Q 3X/OGSy2ZruAMukl5ctae7tGE8JP6VONosnoK3XyJOWZ22kt2fxps0RFwUw1nt/hwpBq whiu4lHD90d6315cqTopKoGhq5I9GJ2YzB59IhwzPnEITSEw3AvtNnHeQP9JRjHNsbvi rD3OdYWUx6OwVS2CzsDaVvPJFxKOO3iPOM8jeK6rX3dXf2rPIinrel7Tn6NZrIUFyZef NxDw== X-Forwarded-Encrypted: i=1; AJvYcCVO3lIEyN05+N7/ns2ZLUUUrws6PgqtxEyGYDlWIdQi2eSJ12xtZfiUD8Bb+b42gN0FZJY7MRmtrw==@kvack.org X-Gm-Message-State: AOJu0YyNr7wZUWo46qJbMR+ppCzI/ktjh4boDWExknWejoUzFvEXy+xC 7SHBWMy7E2KgkPdXEIbifxc/fFP9y6sxCFIiGDEEf5o3PbQCb6ly571cfRem5MY= X-Gm-Gg: ASbGnctzR7+Tl+apmzPDtHLzmO94WzGnZI2i/QA4pV8FbZQK/XQ/77O7z3C3iC/o3hB 2ehSO1SR+zvBU/RNCEwefa28ez7zMUXjILjfbyqSKK0mT52+RcALbfrKgzAqm/yFEqy26yXYFJW c4+CoItm1ZxV2KAcD6B+NknnRQYpevo9wtSLbGGzV5kbnyjvfPAGE29QH3JpS3bNfFGfJzBMiSc JCymUijhYTuu/3GL9bXaVzu0zooAvd5hLV8mfX1EzUorV6E2EYJNZQn+lwRfYbQeXW/u3AzDC5r 7SsshgkE5rg2KVP31eGxBDcSTrQpTJ+IlytzinMazCAsfCk3yrY= X-Google-Smtp-Source: AGHT+IEyV8PM+Op85J8MN8UIXzOwmO5AoH1n2zuPf2BQnUgr2EBtE46vqxBibis0+RspBTbObsPbvA== X-Received: by 2002:a17:902:e54c:b0:224:1c95:451e with SMTP id d9443c01a7336-22df5827bcdmr6954145ad.33.1745972234019; Tue, 29 Apr 2025 17:17:14 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:17:13 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:32 -0700 Subject: [PATCH v14 15/27] riscv/traps: Introduce software check exception MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250429-v5_user_cfi_series-v14-15-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-Stat-Signature: fr8kyxihemcoatg9t7u7oht5fnp4caon X-Rspamd-Queue-Id: 4877414000B X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745972235-144679 X-HE-Meta: U2FsdGVkX1+Ww4BG5oRlhvY4/QbyoLGC6zN3+gOrl71yvD3LN3BATfK5Zf+0mT3aihjJWWCkIWNJ5iYaB0gBbwPd+A9Cj8OkGgwkzXRx429RF4OiZqUjlJO9hDvRCEkuyliovGmhY106Sthtpo2hXX7WoROjBxFarnGKc5tG8F20TehgG9LYAkcsS8gT4F7AxnIyDS2axaDkLXlpCupAL4i6FaZSWqoJzAlTsfgEFBARHoCkW9KBLVOz/JWHZaK5lsLiLl59mjsrZKBEWGII1Hmi7lq5T3ZXPOSesxkcqhT/AbpruK7ypBY2uCfkjt8/1dWdl8h1VY6R6IxWx39AalrG6fIDUIs2uw6P3zsbiJOaoCIIfN/P47stOeFBGJMneMIsxFBMKJzW3YvZtcuL8u6qjwUc0IzoklGB71BbHf0f4mUcr/46WLG5nl9Bpsg95lE2lA2j48AeEFEGIYR7cn8rB+/+/QaRVR+UhddgbSiT31HLBG7qy1HUZ3NWcnvF8kH4IXT9JEr8f7R7TiFaVSftt7AS2RiHP8F7z/sOSFAkC6b5huWUd42BaCCT7cQk0iAH0wYxtqENM6az6GfP0ge1ASfYUDYDc2qI48C/n2RHmYvx6dCjjpzLwSyJJ31MOw9UHRIw0lJDcfeKGzCmjYuORno2O6Ex4ESDaywuvnhGDyh4AOkVRhSzOtCufrhvUmBUcAkOhdI0tgYiSNQ+KxUqQkASI1+xKkoGTYSMaJ8BmtWzc8h8uXTXahNQWgJP2uZKaxwiHuZXBDUKMlj14Bs/VLDCJ7Gmas+kuLD2hpE4PWmOFUPkN0OMtqZcvKLJOK69jX1n51rGXjS8n4NRxXINLc3r6//06H8HHszIMLhNXcHJtAbvrbYa1o3SUPmBmEfl6gtHCksezG56ONkhadq90SpYaiOTKVCtHssobSyUrymQE/IjNmHiPchgU3+g+NRNdQ2kj/QHmzhmUc3 hsRVKgBf xXgV5dctUQ90uuG8RP4CYJ3TT6rDsfuAgA8PkwMaxG3YRu1svhMXNxIIPrHjj+gcKezGsa/yYEBqd78fbVGruv2cdOj+cMMt+d/CUlsKpKMQiuFfdexZfXGB2VpecPZxcZ+JslUs+VH05cjQSDq1OvLaCt6xDX1FouUKq0uDjj8yO4FaE2kJBHBhocGo/6bgU8xe3T56GzwwiMp2SEQLVg6uP27y2BScqR/et+Zr0BJhgtIRJxmXoW8jPyGE9BYTJlGB6GPb7RFYXYtAyz7CDmIhFbRHJnI6a5LgQ6Vu3NcsmqDpnbqQK65tO2w5y6O2Xz22TkO9RcA19vtNR8Z3qi8GzQsYjObL91vUPeHvhfLH2kIOnqcLEgsVJWYUA27Cusw0TrDELpNpOD1nG/en6bt5nniEyhyMqnnynH7LISyI4zopByM42AY+FZbOmXTvUPvf1CrPGZDU41xerwg60cNF0WnYPRAEq6JrZKNaC/iLn1vn5F2OpibSN2rYdjJFIjEQ3zrDkLcHzqb4= 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: zicfiss / zicfilp introduces a new exception to priv isa `software check exception` with cause code = 18. This patch implements software check exception. Additionally it implements a cfi violation handler which checks for code in xtval. If xtval=2, it means that sw check exception happened because of an indirect branch not landing on 4 byte aligned PC or not landing on `lpad` instruction or label value embedded in `lpad` not matching label value setup in `x7`. If xtval=3, it means that sw check exception happened because of mismatch between link register (x1 or x5) and top of shadow stack (on execution of `sspopchk`). In case of cfi violation, SIGSEGV is raised with code=SEGV_CPERR. SEGV_CPERR was introduced by x86 shadow stack patches. Reviewed-by: Zong Li Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/asm-prototypes.h | 1 + arch/riscv/include/asm/entry-common.h | 2 ++ arch/riscv/kernel/entry.S | 3 +++ arch/riscv/kernel/traps.c | 43 +++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+) diff --git a/arch/riscv/include/asm/asm-prototypes.h b/arch/riscv/include/asm/asm-prototypes.h index cd627ec289f1..5a27cefd7805 100644 --- a/arch/riscv/include/asm/asm-prototypes.h +++ b/arch/riscv/include/asm/asm-prototypes.h @@ -51,6 +51,7 @@ DECLARE_DO_ERROR_INFO(do_trap_ecall_u); DECLARE_DO_ERROR_INFO(do_trap_ecall_s); DECLARE_DO_ERROR_INFO(do_trap_ecall_m); DECLARE_DO_ERROR_INFO(do_trap_break); +DECLARE_DO_ERROR_INFO(do_trap_software_check); asmlinkage void handle_bad_stack(struct pt_regs *regs); asmlinkage void do_page_fault(struct pt_regs *regs); diff --git a/arch/riscv/include/asm/entry-common.h b/arch/riscv/include/asm/entry-common.h index b28ccc6cdeea..34ed149af5d1 100644 --- a/arch/riscv/include/asm/entry-common.h +++ b/arch/riscv/include/asm/entry-common.h @@ -40,4 +40,6 @@ static inline int handle_misaligned_store(struct pt_regs *regs) } #endif +bool handle_user_cfi_violation(struct pt_regs *regs); + #endif /* _ASM_RISCV_ENTRY_COMMON_H */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 978115567bca..8d25837a9384 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -474,6 +474,9 @@ SYM_DATA_START_LOCAL(excp_vect_table) RISCV_PTR do_page_fault /* load page fault */ RISCV_PTR do_trap_unknown RISCV_PTR do_page_fault /* store page fault */ + RISCV_PTR do_trap_unknown /* cause=16 */ + RISCV_PTR do_trap_unknown /* cause=17 */ + RISCV_PTR do_trap_software_check /* cause=18 is sw check exception */ SYM_DATA_END_LABEL(excp_vect_table, SYM_L_LOCAL, excp_vect_table_end) #ifndef CONFIG_MMU diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 8ff8e8b36524..3f7709f4595a 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -354,6 +354,49 @@ void do_trap_ecall_u(struct pt_regs *regs) } +#define CFI_TVAL_FCFI_CODE 2 +#define CFI_TVAL_BCFI_CODE 3 +/* handle cfi violations */ +bool handle_user_cfi_violation(struct pt_regs *regs) +{ + bool ret = false; + unsigned long tval = csr_read(CSR_TVAL); + + if ((tval == CFI_TVAL_FCFI_CODE && cpu_supports_indirect_br_lp_instr()) || + (tval == CFI_TVAL_BCFI_CODE && cpu_supports_shadow_stack())) { + do_trap_error(regs, SIGSEGV, SEGV_CPERR, regs->epc, + "Oops - control flow violation"); + ret = true; + } + + return ret; +} + +/* + * software check exception is defined with risc-v cfi spec. Software check + * exception is raised when:- + * a) An indirect branch doesn't land on 4 byte aligned PC or `lpad` + * instruction or `label` value programmed in `lpad` instr doesn't + * match with value setup in `x7`. reported code in `xtval` is 2. + * b) `sspopchk` instruction finds a mismatch between top of shadow stack (ssp) + * and x1/x5. reported code in `xtval` is 3. + */ +asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs *regs) +{ + if (user_mode(regs)) { + irqentry_enter_from_user_mode(regs); + + /* not a cfi violation, then merge into flow of unknown trap handler */ + if (!handle_user_cfi_violation(regs)) + do_trap_unknown(regs); + + irqentry_exit_to_user_mode(regs); + } else { + /* sw check exception coming from kernel is a bug in kernel */ + die(regs, "Kernel BUG"); + } +} + #ifdef CONFIG_MMU asmlinkage __visible noinstr void do_page_fault(struct pt_regs *regs) { -- 2.43.0