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 539EBC83F1A for ; Fri, 11 Jul 2025 19:46:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E62BB6B009D; Fri, 11 Jul 2025 15:46:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E143F6B009E; Fri, 11 Jul 2025 15:46:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDADD6B00A2; Fri, 11 Jul 2025 15:46:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B62DB6B009D for ; Fri, 11 Jul 2025 15:46:29 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 618D9807FC for ; Fri, 11 Jul 2025 19:46:29 +0000 (UTC) X-FDA: 83653015698.15.0AFACDE Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by imf01.hostedemail.com (Postfix) with ESMTP id 64D8D40010 for ; Fri, 11 Jul 2025 19:46:27 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Ta8t0/br"; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.174 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=1752263187; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=0gQSD4Mm8+SXHAD+8IlOz7KrklW4xwsEcRbgKnYe69RQMWp5SUPHyG28vdP9rs8fE0hhAF GyKoAdrBveqN0/d1Hp8KKS9k5I4guoJ7tzJVD/JixweWg71hWAbI7slsDUshbNnBVYYzN1 lmBj/YUbB44sGVZK8ZsaJlsh0aY0Fps= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Ta8t0/br"; spf=pass (imf01.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752263187; a=rsa-sha256; cv=none; b=WGWv9Mj4eMnpwFRDeZziJSDza08uilw4y19o321riAwqyQGIec01pDwLn+kM1Gifi2lcm4 ETRbSFvJuSTho7rpancyhoCyZq5VfbnpDOWhvxIj40lKf0J3sp0BXgGpWMNJelCXu59Clo o2r1HyDM0tugQvK2f5JPuN/OaattsHk= Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-74801bc6dc5so2149212b3a.1 for ; Fri, 11 Jul 2025 12:46:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1752263186; x=1752867986; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=Ta8t0/br9f5q1/3c/YFeqxIXACdED8yaEWjs1/wXqHNf+Oo1RydZBx928uHoCGxnjP 8i/fxusy8bj2J7wTqnr72AcZonDa2+vj7AfqaLWZNYcXi0hLpbxVer/i3BZr5QxKNcKA V+A8CxPf87FU8+Km9PNHdn4u/cGzuqsOxPgbJEHbQL8lcMoPp217Efou/LMQTxrKu/DV w67EyN8oO3RRJ7IB1B1ZlvAh0+zyyvPcwzikb6c/AQZjfTSOvX/j9bm919mvCz8IkdCD rDJy7sHY4YB/QuNeUSlaxk4vigdm9tovm/UmSqgTajOmmcqBzynPbw6hqvCG/A2sPRrd Ot9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752263186; x=1752867986; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=poXt6qF37d5Vtr4tRkAvaK8HQ3j8WmbyZ4e/7A/wanGsIQ+zOwabS8KO0v/9noCtF4 iTG8jkMTHiVqnoKrZcBntRqxGiSLVV/oqF1dMWqOS2U+xaPMD569lZKEqgFuTbKJ+HiI /DHwfD1vnwMcBzbR9QK1BMnX21IFitq/FOv4xs6i+8RGyGKEk55HaF278z43YtAeqiUl h3RayN1ijE6UL1bLoGXa7Q4U3d88Pub84DhFkp/5Cj3Xb0vN1mpVyjbtFFT2Lv6IdsQN 0SPl3A+SgSdrAwInjoCY4AzaIUS1hYZgq7k+8JAXnZoypMlJxDMTwqLQ45KA0tFr8AAe uMfQ== X-Forwarded-Encrypted: i=1; AJvYcCWF47uXt+54ARfGNHnojxf79K4TuYt6L9J+2HohUinmeA5syhFL6uS6DuMcDFNAKJIa67PVQVgrFw==@kvack.org X-Gm-Message-State: AOJu0YzaQU2ofrxYxS1BRtM3stWORaTaSuXSDd4nHQ9+K7IlxT15Dk4d /Jq9IwCW5puvXch5A6EbL2ElMxd9iL0tG9C3lmkyi56xJ/OE4jO3gEj12B9c2//958k= X-Gm-Gg: ASbGnctcvyjjW6UIzKXkrb9CIDzY8eDzx45lMUXgZJmggqgs6lc5mB1UXxrPmG3u+Wm Q9oxo1X4FshUccXg14Pi2heITeQ71/YzxtEx9rewVxzmy2xmkGaWtMkeYonipwY2T5ONdf8CIzV rKNpk4JnX3PR29HZ4OynpoP222suq3Km7c18BjRopwC/BvPJ2VZ+CU2gJ1kw0d4w3pe8MfJgd5a Q75E9HYc5IsJXomDY4bwTlWtemMdOm/s6cVwcuCMfwTeBKeX/uB7m+eE9Nmtt2vrtF/lwUfq7KG GIgdNq4TLUBr8yNgWLiBHHDbzuppRr1U8CUjpMsaMp2tHCkbiu374hwLIFE3RZcnIbZsP33w7FW Pl/mimlrzBAMYdDDB/VN1XR21cHmaBoLb X-Google-Smtp-Source: AGHT+IHk1XiEj4FpMiqxFpyzNMz9rTOrxw62KxiT+gyE2Dr8zhJmShMtDIHUXM6FBcUeikzrj/OBJA== X-Received: by 2002:a05:6a00:99d:b0:73b:ac3d:9d6b with SMTP id d2e1a72fcca58-74ecf7cae55mr6943507b3a.4.1752263186160; Fri, 11 Jul 2025 12:46:26 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74eb9e06995sm5840977b3a.38.2025.07.11.12.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jul 2025 12:46:25 -0700 (PDT) From: Deepak Gupta Date: Fri, 11 Jul 2025 12:46:09 -0700 Subject: [PATCH v18 04/27] riscv: zicfiss / zicfilp extension csr and bit definitions MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250711-v5_user_cfi_series-v18-4-a8ee62f9f38e@rivosinc.com> References: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@rivosinc.com> In-Reply-To: <20250711-v5_user_cfi_series-v18-0-a8ee62f9f38e@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?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Benno Lossin 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, Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 64D8D40010 X-Stat-Signature: chsh6tr87wqymggadauxqb6m57t4gzdp X-Rspam-User: X-HE-Tag: 1752263187-499963 X-HE-Meta: U2FsdGVkX1/fMTORTiKQgOcZa5QAMw+gEoJK7dv1znlZ3vkNaYtifHignbAi3VJ/DIxeTPMkv2dKx4k4Q3rxkIG77CgnGkMPXZPC/isGEa+k8jySrbYBq2o3pdscEsmE4/4Zk5Nnjs0qoBeRZjsQ9ePKvVJTWkm+gz1dyPd8NRvChbZ0WtEwsNDAIbIN2V2Qrfry8WKMjkFSJ1Y/P62gsqUmszdwsC6H8F8qrfsyYKz25Vgt5gmXXaVxH7Tx0p30EgBmphtGh43QcGED3ROy162VeCur5dV773YPZT1lzIjfJEakCg0vcno6sLbGtodj6yK8Z753WvvBg2AXeOTGvgvafhpiAvCJO2X19FV+wjjX/QetnutpzEDeqOd9IUyLhHOiij3sMvta9PMEQZNvMWISab9MA2D+gxogRFaY4jlaBjRnpcxyrOuFLM7BJ5idaYIkPUCKQobvKBGl9B6I4PD2HyhQzTQQOy9Ch1p6SLlP4UXlcuiUAfBrl+u5qUqM21SXEjN1BqLwmUSmPuXi8QqWxG29VvSvAgqOFwx03BSVo/HWLjZYmxHtpy/gxZ8pWXC52erxxpOhpZgDqNHmsVGmXvaRDQiPn+GoZ6V9R8Cqx6Yl+lvFQwQeseEbikmikylQUWyPRY+hLJIFf212nthgYVjJ3VbACCcHRHt4zqo43z5WYoP8C0BnPDGIqk1S4EFxKnRmhgXNS+tDF+n1DI78zbygPRD0NzKjxVT3+AcAfm4sWca0uxiZUyH8nsW04g/RBjr05WxZcKexg9JBxR5BBIp3RjDalysnMtOrKKsCVenr8/b943/06Xu1i52BjTmyG4E31B6Js/yf5rWu6Q4QqiKpGHk0XpTSP728OkGyXjfGVG+HgHVh1s99jbiaQdDaM3eyLan/V/bC6f7omn4ANqncjXavbkBVtXS6TkFbnOFTrx4zvjNkOkr3u40/5iVTp55JCmFYUFjFmfE jt3Ya//W Qc9FRLUXTNeerxhmpqe74YN2ny0vGIr4h0T0/UKeTeK/XvAlCFZWOcQMbgVvw3yLzp4eQW+T5Wxf5on0Us9rFmkK4741x5TpQA7IRM8WdX48u7L00pdzOqc/HHTaB4ScAi10vwIvR8tQv9i14KpDrl6oc111F9jgvKJCQFW7ZKew8wvLFc6zqNQZA1BI/PJ02IIQt8H1fY57tEqX/P+LpATIM9qKCRNZ7d9vWQi20+CmPR0nOL8XSpR7kdnnXzgk+Yv8eDml1alzk/SJPq+u+edqcjLTK5se0JnDCiHd41Rl+IGBvbV/Z2lIbfGlmvph39Wg8n1rOPz9uiMw7kKx53d4aPLtihbV2JXKKwyyYG2WHg5Xa1LmXl2gBOp2FO4Em89NP6JqEZ/is1kwaktno5jdiDJl7t3D45EbqRuGaSwZD8+qjNi7prGU5G/x2gGatx1PGiFtDlc2PG3I= 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 and zicfilp extension gets enabled via b3 and b2 in *envcfg CSR. menvcfg controls enabling for S/HS mode. henvcfg control enabling for VS while senvcfg controls enabling for U/VU mode. zicfilp extension extends *status CSR to hold `expected landing pad` bit. A trap or interrupt can occur between an indirect jmp/call and target instr. `expected landing pad` bit from CPU is recorded into xstatus CSR so that when supervisor performs xret, `expected landing pad` state of CPU can be restored. zicfiss adds one new CSR - CSR_SSP: CSR_SSP contains current shadow stack pointer. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/csr.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 6fed42e37705..2f49b9663640 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -18,6 +18,15 @@ #define SR_MPP _AC(0x00001800, UL) /* Previously Machine */ #define SR_SUM _AC(0x00040000, UL) /* Supervisor User Memory Access */ +/* zicfilp landing pad status bit */ +#define SR_SPELP _AC(0x00800000, UL) +#define SR_MPELP _AC(0x020000000000, UL) +#ifdef CONFIG_RISCV_M_MODE +#define SR_ELP SR_MPELP +#else +#define SR_ELP SR_SPELP +#endif + #define SR_FS _AC(0x00006000, UL) /* Floating-point Status */ #define SR_FS_OFF _AC(0x00000000, UL) #define SR_FS_INITIAL _AC(0x00002000, UL) @@ -212,6 +221,8 @@ #define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) +#define ENVCFG_LPE (_AC(1, UL) << 2) +#define ENVCFG_SSE (_AC(1, UL) << 3) #define ENVCFG_CBIE_SHIFT 4 #define ENVCFG_CBIE (_AC(0x3, UL) << ENVCFG_CBIE_SHIFT) #define ENVCFG_CBIE_ILL _AC(0x0, UL) @@ -230,6 +241,11 @@ #define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 #define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +/* + * zicfiss user mode csr + * CSR_SSP holds current shadow stack pointer. + */ +#define CSR_SSP 0x011 /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM -- 2.43.0