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 AB1BBC369AB for ; Thu, 24 Apr 2025 07:20:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 57EA06B0011; Thu, 24 Apr 2025 03:20:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E0BD6B0012; Thu, 24 Apr 2025 03:20:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 30AB26B0022; Thu, 24 Apr 2025 03:20:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 108386B0011 for ; Thu, 24 Apr 2025 03:20:36 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 781395CC62 for ; Thu, 24 Apr 2025 07:20:37 +0000 (UTC) X-FDA: 83368089714.01.9E57B1C Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf13.hostedemail.com (Postfix) with ESMTP id 899F020017 for ; Thu, 24 Apr 2025 07:20:35 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=RLdCwSX1; dmarc=none; spf=pass (imf13.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=1745479235; a=rsa-sha256; cv=none; b=JqYgtxfg/Tcnrahx4Ij5WL4Wf1RTjfcgxO2FiLmmWUZvTYKfjAPsj6gU3IY2ZF+38nRKzf gj6mZJXttrfQs8PchMx3YAwKfPBmSkf6ebaYAselUzUPmDuEzkDDHEF36tf8NfU6S0fULY QJ0uIToqsV+1aXYlveKoo/dgrPPqogI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745479235; 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=rRKdo3m43/oRqrcy/XbPKSalrBqvvKJS/RWr9AXrP4SUb81+L/YoaZxM2fbMaMlDL/fyiG INz45yRxSYEe0V4lm9RvuQ0n6EvrzRUL9VfQ9yB0diEoDg7R577sZr2v1XziRw4++2S3wW 4cDxX++VhZnIj7dfa1EQeb/EnnBeXXE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=RLdCwSX1; dmarc=none; spf=pass (imf13.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-224171d6826so10019795ad.3 for ; Thu, 24 Apr 2025 00:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745479234; x=1746084034; 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=RLdCwSX1TuNW+lg75VEIz3OipK+HBzWVCnK7kgZvcq6CzF1VLQy3EOLNuNjD5mYhEX 2E2jD6nQGd+4ZdjWgdMTgIsAFfqQO4Y0xpW1COYdFmvB6V1/B66J7sGljtLUs0On8hw1 qr3Y26+pxQt0cZYQvffKlHUYXjBYbO1bIX+JugcD18FYI0KrG0qLTvjhSnG6onHDh9Hw r72qnWOxXfIr/bB+cyPrc9aluuxWXnOkNanLDxHtOBUcMDtr0fUsjJQ231oU2G9PFIZO D/Rh4H5IPU6N83prJ68tZFav2O7OWiJ/eNDA9S5AtHbib7A5a3ANs24li2jdQtvDYo5N DGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745479234; x=1746084034; 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=VB78gVMCtxPqKIdY6jZPjpw4LICYsozbzsetwAOojyFCE7BRzr6VGAVgdy7vqkmV6t M/7d5C12pAZqrrgy+J8WSLxxUB7V+wWKevZkaS70RbCj/erEUTPoyjChh5OAJMzsbfga 5kH+8DEvyagbglNOxAETaYm5YT4Q7TK4pdYRvoRK5lgOEps2QrA0ruXFm5j63coEtr35 GIAsdTMZ6gGT2rLDa28maN2qN/QE+OGT1vcB6AuGqGqC0/rx/EuC1mEnCwCQXoGQrygi 12XsjhQLBtPHZdmROnhxuKZzAUrMZgxmU7p6c1IPcVEu4+GtlGHh5EfIYnYhU5FaKJQv dWww== X-Forwarded-Encrypted: i=1; AJvYcCWLSxPX4MzHeaQVfXtypI9zTdi9uHoCRCGMwA2PAmcx8FhHI6VWGzTFpUZnO0qPxEHkb22DG41j4g==@kvack.org X-Gm-Message-State: AOJu0YwJLUnDZVUHC+zZ46VqpyWSGG1KlXmtD2bmFZ+EnjAQ3MZTygQA y+3knpYYnNowMaLNQD7L3TVVLWVXgEsyKudi7oSAaU+crMkjbtJ0zYQh2K9nDl0= X-Gm-Gg: ASbGncvkfxQIc4ufewSIuyKMmQnTfcSmin9OZLBSWfGf6rW+uBadG1f5hHLKCKkrMnR PjEOQp47atY3WwKOX/7Mm9oWdWmCj9rnQeCTj/Uc2Pvka80IFHvaVneEK3SPSRXLdRuuzT5R2kk NWrDLlo9APvm9YyYmRKFCokwkic8HwUiJaHFy4RPbaZhkqlio2FpdIZ4ljBN8nMmbznPXe4SlEo SaAYagLRAhn7MPf7DUqOFHV2OXN7KzMwDbgFsB/OpjgikxXzd7zyZiT6GFQo12UWu9oIxqHJo8M 7pTQn1BMtYAWSuxtvdWCbz1+fBhd3ghR+UrmfHhPFsvjDamcnys= X-Google-Smtp-Source: AGHT+IG7mvKQVsAWhJ67siR5HyXzPu+FGKMk0BZF9KiTPtDYxOR22o33eCLSKG+9Sr0e0wwJKYQf8g== X-Received: by 2002:a17:903:2d0:b0:224:283f:a9ef with SMTP id d9443c01a7336-22db3ba02e2mr22559525ad.6.1745479234501; Thu, 24 Apr 2025 00:20:34 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db52163d6sm6240765ad.214.2025.04.24.00.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 00:20:34 -0700 (PDT) From: Deepak Gupta Date: Thu, 24 Apr 2025 00:20:19 -0700 Subject: [PATCH v13 04/28] 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: <20250424-v5_user_cfi_series-v13-4-971437de586a@rivosinc.com> References: <20250424-v5_user_cfi_series-v13-0-971437de586a@rivosinc.com> In-Reply-To: <20250424-v5_user_cfi_series-v13-0-971437de586a@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, Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 899F020017 X-Stat-Signature: pecs47jy5rpiuywtesgiprtwd1pf6kym X-Rspam-User: X-HE-Tag: 1745479235-645330 X-HE-Meta: U2FsdGVkX19axsMWY9iH3SxWaWpjhg+4Lno0dLEPsyZnyQa8SZh6sk+Hco4h5tf3edCdZpp3SJISLYVWCU51aZ09lya25TqVGG0vrB8Y9QymDQjM7kY1ZOE6jaw+UQKOFlHsz4RYKFaEZtVUE9g9xhjJ85N5gyPukrXHAxy/RsYpho3etT6GgW1UOWM3UGmetgo+Vn9BOFrTiB9TdDbZyUaXYBdK+Ga15SZ3buYiGAxRv2oWQviMuccf62U44W0gGiKYKyedQr6VmhXnSH8xWidf+eDvcvc1APDbMUpA9+mooRh1L+/E+geD53Q4mvQpnT96o/xz0FPkLQIOgPgQgVEctvsowKOJ+53SgdAefRUafu87FELYS/BDUj3ilgCffMRK4/72Djrri2XfVBsbwrQoVj5ulIeLFWZrLo2DiDM5gEjAyN1MScmYEx/KgrGQXkMRf4bWsRx/jGxiDDS6Z+OiMvj504Yg4rAznMM1B8gI3fG7bjJa7h/jwVUso1VQqcLlfwsqsMIeVxios0ixjQKYfaYTEBpDaTMTi7X/boXJblpuzKB6JROU8DO5wOxMVFUfcJ4RuCVXKyuAiQwmx/k4/ezmC4oB5ZhPrh8+dvLnxOcdHgfworu0kfUJqZ3XI8jl3yyRf+Xfc/Pd6EQzW10oY8D0dbh4EugwL0x+b3fu3oEe8+LgP04AIdyljQjLEbyjccGJtNv78u2VWujCRDmTZyiHqWRYFOY8BBEyLzQPoInMb0/fheZCCPEj5n1GNSAINV+eZdclDF0fqV6u+SSmtPtaDWksl1VS3AozobqGlDPa1YYeDLU46QoPH5yrm05DcYf8+MnRVp9sunBCwwj2kOaN5JTAHoOzRn5rjG+0boUZRwhPlGic3jxShXjQzzdRLgJZDaBMis7XmBycz/iU2ZYBaTi5VCr90pVRRb1B11JNBa4MZAgUraX24DZcoJI8byVewaKRxLFDwRv TOYRWmj3 oW1+DT9NdHYcVa8bF4Se0pYVYoMLIt++KyP6603Pr5uUSxdGLggPM8HokPwsV9vVpO3GDvryA2xUBj4htfif0vFABvkPO5ndYtRiVD6adVnISehtOyHD5noBrHnUlQctuWs7+yEnlIpeSBhZqg9pht+OWYs4Cr9kWnt/bpxBgk4DtxYURDhFzRwnfcCBsv0W6tzh+M6vsYtVrwjGgWm93Ob7Rr5R6Co12Z3ScheNRtTo/OVRaUNYbBbSumin7DmztflH/Edlg1FHr8UY7WTl2PF71Y7RUmGiaEK4/5Mp+OlKj1dHTY8GwKOMOgUmwQbWrk42SAmEEf29Wi2Riz5Dw3gpwNuPztoQnUQNhMW7v9Rnt6OrnrkZtwOyPmZeYbTmqKHBgCPhdNnUSaOQfQ3Cj+2JZNEWIkYwe589wYTOeeZeTYG66wWgoJkb72ppdoR0r9Q5D1mjbVBRUZks= 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