From patchwork Wed Feb 5 01:22:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13960375 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 C5651C02194 for ; Wed, 5 Feb 2025 01:22:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6922D28001A; Tue, 4 Feb 2025 20:22:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 61A32280016; Tue, 4 Feb 2025 20:22:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4455828001A; Tue, 4 Feb 2025 20:22:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 21C65280016 for ; Tue, 4 Feb 2025 20:22:24 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CB89947A4E for ; Wed, 5 Feb 2025 01:22:23 +0000 (UTC) X-FDA: 83084140566.09.03A599F Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by imf26.hostedemail.com (Postfix) with ESMTP id DCD69140006 for ; Wed, 5 Feb 2025 01:22:21 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KQt97o0V; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 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=1738718541; 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=zdnDBLtl5aaL8nG2dAbftlNYY7RRlcZhkDsDiygXKscud3w6BiotD1Fd6WQFrBsB3iTaM1 6SGE5ihHZ0VQTBXElA7ai5BcW2CCsnp3a8+K+E4B8iqSCRO2bOtCrTPv4Rt9yKtQjfgxt/ ek/qrINpetmLrJ6o39INXUuMAAoWNeE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738718541; a=rsa-sha256; cv=none; b=Yu8V9ACgFglMWcrLKeTX/eVjQoB7sE3JllA2aGY3u9ZJqtGVGGbIu+Oj6pjExi/pDI4Wj3 XFfGKeIurTq8HfCQ+Brma53pLv4GTUbVmPqXpPHdOz+c49r8+nWSckpv+kETp8HB4wS5Cv x5dbgDkWuz8ceP861sJYjHsSCEW1FCo= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=KQt97o0V; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.216.44 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-2f9da2a7004so883208a91.0 for ; Tue, 04 Feb 2025 17:22:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738718541; x=1739323341; 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=KQt97o0VGsBMdMaojwGKnlWvIsBTJxDGCmV2IxVAfwSofBi6fkWfjVKBLXQS1NiOb7 XGsAoE6mNYYDGQje9tBllyKKGizbb0PR/y4+zdA63L4Ct48pBf7PlHt04TIZhcENauSW VjQpqAfUx3MTASwoyBjh1V/MyM5fKs6Z5+YuGiukicDU+Rr91/sCCGwwbNpc5mj/oxiZ GzYJEh7SpGc5GbtSrbSKlsRjluQkdQXg3TiXbhLA/o5S1tQ1HFfoYo/FzF3ZfElDZxtd XE8TavGhzU2CKhpPCdeJ/1ZRsuY+Jssc23svd1tmGWsHpkt45soNovkdqKeKWX9rED9j eTxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738718541; x=1739323341; 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=GkvjVvkK4nWZqhJlleAyLEDMzC2/ZkNNgrafDN8plIpzq16ATjGMQGzP1RlsmGnzTa dEouGqaVsTZFt4qbklEB0kireALWU9yi9jBcUD2yiFoXGv247WHkWf6GQIRSd0nNBG4G Peh1XYRSJi0mZPRWMxTj8EYbTM/GuVs8Hp3wUxp4v1UEtYtMLGr35NhWOJSW5uU/1Zdh t15ILEi6oHk6Rk/SfrOIxhkO/TO2pgKUkebsw+9nHDiyXvM9l8wjvd4fq3Bjsu9TPsxO EOHwYwTLTB+fbykBOmHGa4Y5Eu1CtOZWGQKxxr9bNL1o+C5CBmJsE39l6xX2446JL1QV bYgw== X-Forwarded-Encrypted: i=1; AJvYcCWbEcETgRQBael593R8f97pzrETKUPmeQ5rmftgldba4s3NykrlCRpHy9bar+Ofqk+DknZv331tWg==@kvack.org X-Gm-Message-State: AOJu0Yzp7N/CY648jJZmPgr1ONX7jpl1XxLF7YrRedpoelHfmqdHPCQM TSVSToZvZMNyYLjJn/fekiJWGiqNi036M4ystxkRIzV5lj2s6JMPHhZIIibuR6k= X-Gm-Gg: ASbGncsA+BNGD1gTuRVmUgovQwYc9QDZPWHnCRXtjEVWOP61V+j76WwPBqZWwmJGdDX mnrzhwxT891jT3FIMY57y95WnBOMVl7gTebeO1ihxIw0WHZ2Qck0ARm2rY0SQdOv0/B7aRtEKVF DLT0tSGk+NLYlWO/rHGbAVwmffgaIlQR1KgwllQ5UhVYno6U2wWDEITwaxNslOEu3m/2F9+8i3k 1SU3iDvBIkkGs5PdqLMGMGug7LRslV+R/uNeGkt9BN1b3WELa8/nJv6dCAJi4PxYhCoEK4AHoMX TsIzFcDt5ZBgdqUOUxKycYXtLg== X-Google-Smtp-Source: AGHT+IFplfoY4kwYRUYkUapPyLUTmtCYI1kOBemc2Fu2DroKYmpICeBEsM6C9QAH02Mf3MaRp7pG+A== X-Received: by 2002:a05:6a00:3cc1:b0:72d:4d77:ccc with SMTP id d2e1a72fcca58-7303511ae5cmr1489432b3a.6.1738718540683; Tue, 04 Feb 2025 17:22:20 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69cec0fsm11457202b3a.137.2025.02.04.17.22.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 17:22:20 -0800 (PST) From: Deepak Gupta Date: Tue, 04 Feb 2025 17:22:01 -0800 Subject: [PATCH v9 14/26] riscv/traps: Introduce software check exception MIME-Version: 1.0 Message-Id: <20250204-v5_user_cfi_series-v9-14-b37a49c5205c@rivosinc.com> References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> In-Reply-To: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@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-Rspamd-Queue-Id: DCD69140006 X-Stat-Signature: kozwixbsnim8qj63u1adr86of9mhsdzq X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1738718541-184794 X-HE-Meta: U2FsdGVkX18FEpHq3LCvq0XuhAB9iuIKQFnwRI3QqAorzTD5xZIAh0cIjBSfi9ma8u5WlCSZpKYMF0xGJ7YlR6J7a1TexJ2PdRNn8/pBrnUj7JiB3OEQtLXPPxDoJvCu4O9jV1IW4FaBc8lUHFNabRRzJS2mwCN34JmfYA+LdZ678uCltdZRBZWiIxzE5ZFcRnJj/2QtgSAuuRW/mmr4ekp6qnRvkryM62FR0IswhsMLCsCKCJlxx1xv0kAoNRsHkKwIa2+Q/sQKY3sQvFEW4eyBAz32r7AupFv0MXJC/GkpmECBs9uhZXljKUPcT5mOp+WbdZYp/FRqyZiVe5V7JH/acUO3caUK4l0GnHxUHeZqvVZSBzBAKo6JFbcTIubCFo5kYNCatLokhgpX25JQ8qKo75kzA4leit1cfYGJ46o2rSeUYLtshKx3V2oE4qqQlxLwpX5N/E2w2YUurgdcgNm7xjnhwrfckIrgomBbgLiYGNlpvHzYiP0c7CC3zBJZEBdEPJpkteCsbU2lmH9gQGKxFJu2+7JFFxvzFbGvoygW0JpBw+oLcIypvfes28yW2QKBCbN12lUy1Uh8hXxR+hfz/3Jrmz+xssGPAen3NQZdh15h54tKI7983n631yS7SqWcBjZeoGVxponPwvF4fDElARETag3YDYEE3EswFfjznlNsOnSfQNFOJ8x4po8t+xmakV4wNSBTum1uhyrghwiXRaJU+k29dsF10z9NUzOkca+NDT7ZQ/xuR5neNlFYMm1dsLq945YO0v0aPcH6GMP194yXdDpfqo2vpG41pp0lt55xPbvLyg22VGjVmg8BRdsxotd219JcVgz3mmo35DHRBtCWjZ+52YEqKHRjK5XWAFG5ePgWIYTCF1X6zji6HhPyjhnZoUbk+ZmXs8PCJWdow+NMcf8YQPzyMpMMmXyCR5DAYTd/UT6h7aNyNAdzklFbvBxVgjKcmJG2pUn p8UwSQ9T X9eYyjSWaoRtqTGQK6DfcDd99yE38HSxPtmImWbsVuz6lVtfh6DfJPRGuhbA2QGI6oGUpp39eYzFSGN4AnLU2bVpf6kV0XSUf+U6xiZXIRb6i8JzNyoc5D21sKX3Nh7j4O9ym3Ux7qrV5GpJYywcyNKF1fMiOO8ySZUccbzTMig0bV4z5CQYr/x1cawhwn5ZlaUSdPHt2W1FOgXYblCtDFsJAH0SBmjr3vwXLq34cY07T5GarVNqUtJBp4flql/34lXw0fgA7KGs4IuzFYEtNNw2dounpvMhc0KgtB8bCyyr/hj72xkASMjcDGKK8YgBaowKbgzc4ildGjAftrTuLMYBAmnc/F4c+1rB6DBZhwAwbEucW9SvUys6TvbMkCxRAVF/AwuOo8FUwDtsQ8Rub0W+8aZXeyUv8PxRWpJzRVYw5iw8EDZgXFB4g8YEOmXZ5Aqw01hWNrfc+zYAVGOac1vgxFg== 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) {