From patchwork Mon Mar 10 14:52:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010204 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 B6EF5C282DE for ; Mon, 10 Mar 2025 14:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C80D5280014; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0A4A280011; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8390280014; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 85F25280011 for ; Mon, 10 Mar 2025 10:53:09 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DAD26C0FCB for ; Mon, 10 Mar 2025 14:53:09 +0000 (UTC) X-FDA: 83205934098.22.779B1DB Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf24.hostedemail.com (Postfix) with ESMTP id ECB0C180008 for ; Mon, 10 Mar 2025 14:53:07 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2hxfi+Gj; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 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=1741618388; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=DuOOVXtwug18pglvrtLojD8wzhhjI6Q494OEB3X609VKwOqYH2lsgn5UYFmhCmdLcaQMSv mOoB/5NXjfHzzRa+gLmrcFymH9wwIDDKvlrQDPU495QrhXJyeP+RwJsbhb5wSdAcizdzpp XJ7WmbU2xu6GxE+Dr58JDV6iKOaHYhg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=2hxfi+Gj; spf=pass (imf24.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618388; a=rsa-sha256; cv=none; b=2jmlX+F6+uSxiykiL6M9eQ5Scax9OEFOqAmc23toqVI9lNXp6aSbHWTlIrruhk0E19ng2w wkp3GKEOE3Pj9nkq1vkujAjRcBxmtXFJ0xOMd8+/mlIMwT9DGKplJH5x/AkbIl1X02O3c4 k/bwtYGvYKwm24Gpmek2uaMPEq5Qk04= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22349bb8605so78595545ad.0 for ; Mon, 10 Mar 2025 07:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618387; x=1742223187; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=2hxfi+GjCfj9Ip40VAqakOEqRBk12ttkGaMEZuifunk6D90260p5LIJjFfmnF3IZdp dl342qTNoxKaRYSEP69yGLL1FbxFVWpKUiB4TyP26H0qmUQ5aJyqjWtkCSXcCpiPAUZr heKMbiU6TQGpQRk2VEy9bJGqHxKH+u6rw3ELwTg/nuY8JiQnTIS/0RBSdpM6eht+mxYh 32EupwWL00nbZl1A3s72uzZQASWmn1e9O/C2jIPSAXXm2Zm2iWWCcXqlJH3ON4Qhc1yq QG1wmShbAIV247hMTwCk5XNViuuLAKIoTpqk1TfoXFE8qStbqw4Y+Tp//dhCyAhKLNJT vnqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618387; x=1742223187; 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=M49HWf8gzr6wWBf1Qtr4VOivQAEEQjfyuWgORGOVTSw=; b=uRBB9quxKoYMF6AstXPCCcqhY9+X7YvOSkcbujm/fvfqh9tJjjwV/qX4KNmfrw/IRr t/1+x3KIv/xJrmau0FYg9E0A6j42kavKioIDRZj5lOl6trDscQ3e7eTTFFCcJVtr4ISn XtCz4E466gODiNszX3dDESId+ba9a9kjkcPOQY7So8Ua7zaJBVhrWNYE5RPuGyfZeD98 r/NVpn5mzVnc+IiObhgSzjOqdGDIy3bIoHuMectinteRDqn0urDEuyWc9gXOlgIJ54OG mLyP25TCP84cRAUBpnW/YuAtQZgDeV1kHClVaQc7g2EX+BYrzSyX4r8PSu0Gk8Y03ysI tkeQ== X-Forwarded-Encrypted: i=1; AJvYcCX276ZODB0ERVZGT/h9AEKNIZlnTdHytZG5Bp0vOfeVLoLkK30w66uLjS+mqiU6dGpDyvbk9VLthw==@kvack.org X-Gm-Message-State: AOJu0YzVgVjNRbRZ7gmcxUmQu2lj5o19+jy3ocmrKUK2t2gTPW2RIF/k ByDx3gJVxmRd3GvsH9HTdxXBsqe6HJ8GTWD8fPpbD8w6u6ujjXJmBbY9ggt5dg0= X-Gm-Gg: ASbGnctaVo96WhbQpBcgT7FkBUulhwXSeBFaUFC11hZ6QGPdq88h9XgSD6rDsNXjRC7 13U1AO1SfxjWL3iXLPTc+N4PfOKAkBrZL/xHV4J7NUSZgInLCM7J/beCD6E3Ai9hZBZAtvrBB5i Vu1dLopiT4dVfxEZlvrleHXQBIOvfywSm6b2DKutfdchQF/stwOeADqvVC+F7i11Wz7d0jTL68l xrJGnyrgnUVcJnWVYx4QQS6c66I3Og3dfqLVZOthcQlA9Af1WsQqb3tdVZEiJ27zEW9Y2Z2xLE1 NSOdVYVeOzUkLn3nr8WS9NBGqMGmQbOt38BwMihGtsVpPpx3v6MZXyY= X-Google-Smtp-Source: AGHT+IFsZxG1TWVrNQMrqkKpccFn2JJPQ/WSJPQEXgIDTpBCMBrYmD46kiCZqmMB33SVFrCrhoe36g== X-Received: by 2002:a05:6a20:2d2c:b0:1f5:8221:d68c with SMTP id adf61e73a8af0-1f58221fee5mr5284959637.3.1741618386923; Mon, 10 Mar 2025 07:53:06 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:53:06 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:36 -0700 Subject: [PATCH v11 14/27] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-14-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Rspam-User: X-Rspamd-Queue-Id: ECB0C180008 X-Rspamd-Server: rspam03 X-Stat-Signature: uxenpaji7fpfbe5mf3me1n7kddoywfnn X-HE-Tag: 1741618387-56576 X-HE-Meta: U2FsdGVkX19sgpe9v7A6b/RFgC3JC2D8R9fo965UiTZhNYEUhxVSfBUstXKsu/q/ewzA1Hm55nJqslJZXO5zJ3lxUmS7RkwG7MUdCSLXjRjj3jsWs4YjZrrqrywlUlcXPcwUvA71svuePRX5NZoQYaBLjnSOUq4A0y9QVFREDOzkEhd+qVWD/TQLWrxSvUHE8nWYJaJ2i1FKhIoa0CjJlLtmUkYJDIfLLK1LoGAPpUrOzw9ioD3arFtzZTmEqJ2CsPH/xhgas8gyx4yc9SN3ncN1qFEQqm3tJ9sBy8Tkkk5wnvgy1ZxcwCTjHOAHZcO+OWJ34wcOIt2VKk1J+G2pLCVDnKgfeo4GStHj5Idx6eckDsvzI3pp/O7FLoTqDRfp6KYuYHS1ITwSP2XksgaMpErAq/vEnLVFTmViq0D1vVEMjL0ON5y9bAvqIV3gCfrGBElFUlbZe3HeYyVlyUNu6FSgmQTxn8PLRH+mzCjfNIhVMDEFb+r4dn+dDi4eoxuc99uPp9PLqcp1EFeLm+4v1wt/iA3+gsykyb9WdUYYQsQrR77x56gecBWy1kJtrPZBIm2XNWAkUW2g2X4KVl67rpKF4490+2iGaWwnL1MqNRob3718DLVEBs7dgTapnBQmqF2xwvWQ14cpy9vKq0TLCkTNXqVYoD/jsI5YpxzCeTwPDLpXppB8Q21apaxSBSSHRwqExFSLaFuflnMz6cFjtZwUtCXQCFzTuLWH37neNSv5PtgqSOPAPndr7inQd4d/1RuOJi7VMCnvtaHEF6av/k4dskrmt8vMW4xSZk4M2Nh0dmtzV1BGa0inMPpiBNcDOIO7QRaCupBPLvE4dYrcrGAhOXXjZC3ZfLtnBlA/v9NKS8j2RPtf4H6SvvET1xnzhKK+pG/w/v6OeE5UmhDVigPZPkNg77IMSA0K+DofEZnAnq9nraqADHg24THgu5C2e0NFt0Ew5UXOg2fmkUR 1dFye8ZU u1r/eay32k3Bpw4MnqyzIeQfrSQ1jDIMtvD9jI5aVV6keM96KDOgGPOqWR3uqF7kYzjStMihDGmTyJZ8cfieR74Hevkoi80YTYT8i9XvXonwos2X6/tTrQ7g4meLfkq+wKhyXkn9MW+8THUvUWnd5yabUmtFRsHHelx2NqDkdagh80ppxnB5+zkwQfzZspMduxxXfcUmOvJyYBDVcQW2GAyV8X/3jnMVnV8tbG5PBZUwlwFAM6xW+ozzfRGKNDAZ/JrcC0rzcs0bIABZCch7Cw8PRiQoOZ28kXlbmW9tf0SpYCkhDPCCZ289k7RF064/bikzuoUZkiS4Ff5IqoPbqkUPfHfjad0yB8fbEoVzK2Yp1znOyIKVTzWD0BSdvFoHK7DJ4BhEcytpTrfF3mp/6TUiBMUTTRzwQ/SNtnq1XQwxRG+OCWdX2vOgfQt/D5IZ9XSJOUM3P9TJaQ1Y= 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. 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 00494b54ff4a..9c00cac3f6f2 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -472,6 +472,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) {