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 0113CC02199 for ; Thu, 6 Feb 2025 13:49:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 812CB280010; Thu, 6 Feb 2025 08:49:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 79B14280002; Thu, 6 Feb 2025 08:49:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ED1A280010; Thu, 6 Feb 2025 08:49:19 -0500 (EST) 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 38287280002 for ; Thu, 6 Feb 2025 08:49:19 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9E4521A1174 for ; Thu, 6 Feb 2025 13:49:17 +0000 (UTC) X-FDA: 83089651554.15.D8E80AA Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by imf04.hostedemail.com (Postfix) with ESMTP id 88CDE4004E for ; Thu, 6 Feb 2025 13:49:15 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="uZ/V3yI/"; dmarc=none; spf=pass (imf04.hostedemail.com: domain of cleger@rivosinc.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=cleger@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738849755; a=rsa-sha256; cv=none; b=Y01qaOK4m1Z23wp/oKIxOkGdjUS0qkXXCHnlsEyOUMCqktifmYT/rD8hkYLEBqA3vBI+/1 t9MbSgzwq5TLAr1kQ+dYLO21bGZzjNOEmrned1tJZqUtadfxCGsdQx4PdCldjCCm3CNHM+ sbezQ0Vo0EQAwkTk1sicPMMJrRQfBUw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="uZ/V3yI/"; dmarc=none; spf=pass (imf04.hostedemail.com: domain of cleger@rivosinc.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=cleger@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738849755; 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=3+yUQpAX+o3b8spnwV7aqw1/aYSKStgrXep4Af2rWXQ=; b=Afe0UZwufxvAulFeJZl2OTQldmdjfJF1SH9KtV6aB55iCKcL9mATdd095mFACv6yYMyblT bfIUbUsAYLMK0hvdMHsPCqvVa3ar6yByi4dPWIoeS3z5LoiwC3kJk4cMt9281VH75qe46i vWU0iC5o5WK0vD1uZvsEZcpvBCEK2lQ= Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-436a39e4891so6194195e9.1 for ; Thu, 06 Feb 2025 05:49:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738849754; x=1739454554; darn=kvack.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=3+yUQpAX+o3b8spnwV7aqw1/aYSKStgrXep4Af2rWXQ=; b=uZ/V3yI/UgIb8FDaADm+eLCSzNEdnGCeVnUYuhaT1JNG6F7ZtkCsg64AfE2q2XpZ64 YUWbrycRjCjZTc9NsRag3NFN0CJ9G2yW33QEzvkFuTaHws13oiSFusLNrGKUnT0lwzHb trU1FP8vGcHAzo6Jb1pC9IskunJUes9W+VGwTHDRQhCPIGJuQ8UUS5lVwaSV+Akg8uim xHFShHffL9r3Y6vRgU84kzD+9Itun0ike5nC/1t3yp97DKFiGtyKMlhxVdp7+kFyYFxe Z5y+hXK9/dVS2tJDd3IG651vlGwbY5HZy7FnW8OaSgDPVVwpiDVaqqgpSnCbuT1cGxkT bg9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738849754; x=1739454554; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3+yUQpAX+o3b8spnwV7aqw1/aYSKStgrXep4Af2rWXQ=; b=Pp+hx/mXS4vak/Pj8zRSxPH6tc+dIu3+dgtnCb2oipbE8S/kCfomEOzOW6ma7dhW7Q Gb/7FKODbfJDwc8IYGWLzdunCpXNkXXMQFOdnqnsADjC5ywl11K6F54v3cM6NZJ79E3t xCpTGV95v2axQqN9pWCJbRcfua4+jq3HmzONDrd9EWm3pPaAGRkrAZb5vWpAhT1goXXc vP+kLOUAGQ7cqrHBaY/+FhuswU7ewM4Ig9GIcMZSycYr37ltn5NK3gI5TD+yWEZbugcF kPhAwXwiV0rdnAhab7r3nOPm+Aujz2jNzak9j/7COBCgZWykg0uY3VRZwbuJ77gHpL+9 AkWA== X-Forwarded-Encrypted: i=1; AJvYcCXArs0bhucyq6yqahW4OqU4t7CyzoWKz8zOZo3jSPXOn2DnWhkN8UxdqXgl6HiMAaCeNax+YuhBcQ==@kvack.org X-Gm-Message-State: AOJu0Ywl5HfCEqIhic3VHDHgrfTag0KvygF8LuSAB3Z84b2KRUfkvCSB EikEOtu5XCTWxjtL2SY6r/YdWC1taG5h8Pn9gcgKMO1mtXH7XM2rdrZCpeb24Xk= X-Gm-Gg: ASbGncsAhuN8SldqicRcKlxyyDcir+5EU4avczrAl8Vv8FQIBySLZWX9LEogLwMWigF 3LePXIwlgu/b+K5Zcr3VpvZh/9pffvWTFLfpQF1CIEBjhqhEpSutAZdY+24lpK/Kf+TCM4qvBEp cfpn7rWd1S3aXRuPYNum998fJMZwEuaimyiqrg80OdASy89Dvvg+O6ocBPbc+sQ7nAl+M3VQtoR G7yzBM6v+WLMzVDtIf1nahn9qskdwIiO9jFKN/n9MVnHAop7U8xHOH3FaYXgdv0ynGy8Q3IQcH4 JsiPOexkKtejrmjljxo2xbnZIdWJ9LV5GhZxzlZHCbxUbS+7Y+wmF+08HySE X-Google-Smtp-Source: AGHT+IGg4Oxn/it/Gfzbb+ERjhH8cdtxBySZuTwU5SUr81Aju5a+rmMa6q+7lfy94Mm7DhC9V1Q64g== X-Received: by 2002:a05:600c:4452:b0:434:f82b:c5e6 with SMTP id 5b1f17b1804b1-4390d42cd07mr47760125e9.1.1738849753707; Thu, 06 Feb 2025 05:49:13 -0800 (PST) Received: from ?IPV6:2a01:e0a:e17:9700:16d2:7456:6634:9626? ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38dbdd368bdsm1831411f8f.33.2025.02.06.05.49.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 06 Feb 2025 05:49:13 -0800 (PST) Message-ID: Date: Thu, 6 Feb 2025 14:49:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 14/26] riscv/traps: Introduce software check exception To: Deepak Gupta , 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, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> <20250204-v5_user_cfi_series-v9-14-b37a49c5205c@rivosinc.com> Content-Language: en-US From: =?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?= In-Reply-To: <20250204-v5_user_cfi_series-v9-14-b37a49c5205c@rivosinc.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 88CDE4004E X-Stat-Signature: 44aihxhxb9uodqee76b694ynj9k6gdtd X-HE-Tag: 1738849755-597337 X-HE-Meta: U2FsdGVkX1+WT78GybFBm2SWFNaDWdC506rLfP7RuvdMlBjy/Eps2hEzdwV0RU95o28avAr8cUpKaxdd8MfbqzkWzi5vxUHuCDBbr1078HbXe8beewk5QR/gkLzNKrRnIYjpGr0bC/5MhpN12ZzNhIJUM+vE/jswk8LswWuYInfSwtYqmiIIXtwuBYqq8IRdqNg6Dwi+mSVEadXQ1XYTrJ1c/JlhURZ9IcSCU40gaw1JZjKAEM222uaMyqBtS4nn8EcWc4hTDH51Anf2QmGbzrEI0Hr1krrxrly0pdfO2CMRDanJ4d3ZJPVGnTR1r2+AjggMaYtWgT1n67jGGFicWEDobCqVnKJxx/Bc1n/qd5nOUG9Zc3RIzjbYT2XZTzQH156+R4bn1bueIoUDuM/EADITonOYvPJDvhfKeKlUEf5qkjIaA/WlDP79S2EcRM157bsUCE1lL23pZTgb7xM7WbKUHkCQC/11nJfP8HllRqE5NTgFOG8xp6VFaJ4XjpzZyuqwixG2bYfhU0OMp0FN90nC7/H96VJBvOkg2pn1CQKDmnHJyQnVmLhTqr2SG+AFKSseYRTGCGzNvukKJzOlYKW0xzIT5jnLyNK8S01ViGZsMQoslpaNrynTnXKuwjaXKda4BTnJrOAqlg5iUPh/01mbH84xsDcpO49TYbOXP9hOzSUdqF8xMh01oypAT+FyNJJSgLA/6d/Voy1lowtAOa/PDMocg17N/W10h7ltX5QdzqmXrj9gd4ndUQcI2LYPyFSa9vJ++ECgfmGpQVFEtD/gdQJEs9yGNkhc9A8MTqz5OmWOFfAzUmK7RpWFO2SySXrEBUpzZMOfMKjWq9c+c7ChMW1hgNW52kby/02S4SmtMlqCsR1Emw2R8nKQtv2PnHX8v9GzQGukXGHwTdmqYp9LvUAxzQ0I4FkFe8J1pHBmKaynC8MGwAAGapGAGfBv2qMxo8zj6pTi3O+l76t zkJ/9XOg dm+nq4cMUUI1qY3WrBdACMhUTo/+DioaJ9KMf1gC+6zj4qFM20UBQJyZgApgCJEyasggMyf8hVWFhPsAjm7csGyEjS4TLjw+sG6C0eAhF6E6TnaGxtGXQ+LG8NT0kS7tVzwkHb2e+3Zf1YfsWbJ6dCtpZYNvU6lNMpd2ZxYNPfwnBzILEihoRLhlQPyWHylKsuRI+4UJmuheYAhemW7h7V882Kr8LNlkvNQ3AnKwrgPrOcnHTfPEWLo+GFZwX60f52yfbutTF8rLttmS7YpO2fSdjwRtW6sbEKRT0zlRGqdAGmhMkoWlqZ0QszqDAiH7Y7GSMnID3Xv7rHydzJ9SM4fmv05p15YWFZS7f/MFHBncveW1U1lW1tzzy77dXvTOt6L2mnQFKDQPhfUp1Oj3zdNFRtqPb3HUtzFzVpM0fos+j9wlKhxLwOkKyioqtX25A16ZfrFtr1RYt4xx/SFkG70hGc6Y2Ts1/s6QeAcbblv7f5vOuqrU0OqannlePQGe+r3xAAoN44sSLc2IWxj2HWNjc1BuKeNkt31Mw5ysu9u2NeX0kzMWmlJxFLnVxjHARP6O/lCbAZyqBU49EXFeEe/wf0phNUjTAXI2u1tGIeET4ovZp8K6QID+t95jyeaaIDwak 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: On 05/02/2025 02:22, Deepak Gupta wrote: > zicfiss / zicfilp introduces a new exception to priv isa `software check > exception` with cause code = 18. This patch implements software check > exception. Hey Deepak, While not directly related to this patch, is the exception 18 delegation documented in the SBI doc ? I mean, should we specify that it is always delegated when implementing FWFT LANDING_PAD/SHADOW_STACK ? Thanks, Clément > > 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) > { >