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 4DB42C54ED0 for ; Fri, 23 May 2025 05:31:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEDA46B0096; Fri, 23 May 2025 01:31:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9E956B0098; Fri, 23 May 2025 01:31:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8D916B0099; Fri, 23 May 2025 01:31:29 -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 A61136B0096 for ; Fri, 23 May 2025 01:31:29 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 451F55FA77 for ; Fri, 23 May 2025 05:31:29 +0000 (UTC) X-FDA: 83473049898.16.E76EC20 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf26.hostedemail.com (Postfix) with ESMTP id 35F62140004 for ; Fri, 23 May 2025 05:31:26 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Mv8gp/uj"; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 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=1747978287; 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=PNxvFnHnTv2l/VyV5yHhoi/xxjE/MRRgYcBx4CLfcr30pBTM+OxDTLxzaJA5epy1fn0krZ UGTrkYPznJj16YiDa4vkaSqR7+pECxNce8FQmj+/fK8C6c3O3qxCoX9Nrp6i6XLGURBzCs GUt3fj/lhVRkTIGtNnDW09cQuG97K1U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978287; a=rsa-sha256; cv=none; b=kWoUIisKWS14wWccPngxJDS65mTNAEOr+d2cfc9lKsv6q9pdtxIIKQ7uE+st/tmoCdnWeH 8un1pXS7Gn5NeYaGeCSpgP51seNkI5IKyDsFebjCnB+xszzftOLununUup3urSLhTqmrCY l+Xn60H3a0A8qJGFnLs+U71ptFln91U= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="Mv8gp/uj"; spf=pass (imf26.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-742c2ed0fe1so5824258b3a.1 for ; Thu, 22 May 2025 22:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978286; x=1748583086; 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=Mv8gp/uj534ZxqVQTAfvNEYdGpoIrYwyWrSD2eqzKOA3+9ieu1QKKKtHHAH6906YDM LyNLdENItsg6BJvxIHzRq6Gc0DuWAu52gvs9zlHTLrrTQz5Yy2hRqKGqS/4BsgRzvEyw NxJ7b5xGjzbUZkWx/h+iOha9ORkDAi8XBca2ssyLPktytYHnEmxG4Ln616lN5MMuRb2H Z+RObHDrCnxZUiJTxxgpcUtCgRVBMXIU13CPa2nsBn8XtOScdNhbDJjdo8suwtHxTkar QynE8zSt30IWtciok5x9CzgpKSn16sLU59gJ+7IJbR5kaEmcPbCFb3xoTPTrIlrUW0NS XcxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978286; x=1748583086; 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=XFvPI6jHG5/LjZU8XjVl/3KPxHZn/rD5aIfDTBSfYcd4xeaylb8qPMFHSWx6BBxwrz JZO/20bqdW93/nEU57YFWTSQNyoBXSuXj2g/pyQe4nhDyQ2Sav2NJu4PzDAuFU7OHbEa VLqaZzNhJPR3+woH9/g4TzwIXOBlea3IQE3WaCLZ2pxqsjrYcqLW2gE/ye55kB9RtbVl 6L1HRl42U5Yzrm78Koqka2mzFRHQVmAQot1T0louoiwx8RMXs1yueSIvwmKHJMVl4NMa eCowQMkSixXtZweNMVdYyO8pF/P+RT0QwQCv0QBUNSef/dLFVVQlOm7sjCxAHVWiwYbm kmkg== X-Forwarded-Encrypted: i=1; AJvYcCWE7eSe70y4y7zIecIusWOuVYUq54jJfNPU2b+moTpmhlg7kOu51nUl1tvqGwUZRYAzAnZSNo321w==@kvack.org X-Gm-Message-State: AOJu0YzLP+fnSorK7HDA1nMpu0tmfmhDGxd9jbVhFo9UJZEK1p/nRdRA rGdi/0GJvezrIhhON4+DcSVBGPikPQbM71t3a14LpNcNuHuNazR31BDUxDxIW+raIz29U06bt66 U/ufA X-Gm-Gg: ASbGnctKVeWI8cdmCn4auHGKpo73rnL7FI2kwtybL3ev/XkpEO6JZRCN1UcRbvnr6TF EQbHbudDlgRUmISh9wO1kzpCUa0ZHrdULfs72ldXnB5nceVVUUe2Mor6Yrm1+lMBcUSOTeEIboT rdUXq/XAw7mOsh2qAbI/Fu9ZZKhKjsNWiPu8g7R7iuObdjgqyJLhNC9l8qyjuS47kYCNCYhn3ho wqjvRUlSHFHb5W0i/EO2uzv5BdmqCxG6OIeeKgAxG4U1xBc9BSU5LqRWWtXLwns3OJPv1NhqOP7 N4iCrqQkY8MTAaH7ipgstA7+AF52S3QBulhINbdHR37p42ggaATTbaMTosWTdZTq3BOmnuvw X-Google-Smtp-Source: AGHT+IFy9mwtZnQ/WjFKBdOPikCoEGl4650GUvlOy8QUpra7GcIJlslhC25l2UA+JFmADy0WTQ9Ftw== X-Received: by 2002:a05:6a00:6f57:b0:73d:b1ff:c758 with SMTP id d2e1a72fcca58-742a98abbecmr38574133b3a.18.1747978286017; Thu, 22 May 2025 22:31:26 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a982a0a4sm12474336b3a.101.2025.05.22.22.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:31:25 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:07 -0700 Subject: [PATCH v16 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: <20250522-v5_user_cfi_series-v16-4-64f61a35eee7@rivosinc.com> References: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@rivosinc.com> In-Reply-To: <20250522-v5_user_cfi_series-v16-0-64f61a35eee7@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: 35F62140004 X-Stat-Signature: hoyqnt4y67a5ce6e73efxxuz8ohfqg5z X-Rspam-User: X-HE-Tag: 1747978286-345615 X-HE-Meta: U2FsdGVkX1980jwXfPILU2Zb3cTLS1/9d/RNTxaQdTqJvNMMosn74yMOyhfP+ZqjGVEYvoYMAzPczseIFKc0ZlObif0K7bSq8n0QeKws9j1yFc7Wnm4Ys/MgQY2pSUTP5EPo3U3LJgB7RkK4jWnQv3b1aVEAJ9LtrWDuGes3rrnAP2ZMozWQ4O0iXMzV/v14kiGIhYjE7UY3LnZD2s/QzUZzAv6VOHcBTia6ossCm6hcOy26VsJVW9jiaQvUofhZi2PReqXHp+DCkNzcikidRP45QnAufK3avD4oT9NrE1huBBFvf9RSkL3ZUc/Fd4IDs5ysotZx/zIJGkWdh9NUo6uQWDWaQAOMeKQmDKyK6+TZBLYMnUdjLVQT2F0+aMb7ESdK5f38YO45MIlKXY05DUB/DLRrvGvy+3ivE/HbRhTKtnN5NA0bxL840PERPO7PLb+s6MrOZ7seTZoFqPukM1b9YgwIQQIiaxx778fyZoEnjWA/G9siykC1fzxVuaONU0D75xaPlVPJ2zTsY11jgxn+7/ckzL/4hpjEJw86I21eCDT/lLhPjwTPelAszomRJtZGfW2mOltx4hl0jTsqmhCH2KybwXQ2z3EVZGyk5z6Sgevq4Skw6gOg5kCS6xaXuYAeweO02D0jSssu2Nt6BVcad/5zwFrpwgsT5pK4Lrb71xiaDgSXRRNXyqHARUFdjfVPMB1SYrNfDSWwKnFv681pe/OpAkSKKSaStVI0VXOzJE/BqrptL3N+jchSEn989gkoifVo32gKM63v9ndyo0F+7DdgFJfNCw/aFCJJsfGbK1vnq/BzBXDMpi36rtbZaznTKjvaDxvWe0bEerciLT60sofPpLDapzCBg+MZHFAEnRNnAYRvRUVgjJnpvV5m2U9N7XikPCtGvH0Ll3Z5rDJWYUQhsa9r6yB1bAo0Yl41eg4quqYoMyp1ZGz4lDpeSK0fP6UsYGrVtNYyeLK 6okWf+Ja heLJNqyFICyn94qCPDeJ6o6Vb549/XyfhAHJWDl/uwTJi/na9cxcuduwoy+/LeRHDGOzxbknBcBmRhOJjrU31T6WNqK+MA/CbRSui1aHA/o1TNbp6ClELFNmQzt7jVup6Jkywf2Dxqwm8Phwa7G3vsYrrOC/J99S/g7phCvFz2Ze8wZPNTvNjsKmqVothNLluPEvSc+zOd7KZDQyI6Ze6C2UYwrTcygFj02dx6YzbfRBUeJaanwS+Uv6O8+tYkNfGPkZdR4YK8LP66z3kxWNHSInrgegsNmnMEdCrPokCl1ZQkFAKIKSNF5s2euzJLOwYpYgo5RYlB0evpiHntoGsKDWYc0jJFOEtn7IJ1E/iVaRrM8UI3Ib2e9eGFm2HiIrOKte5iZoWKwLW3EMRB/32GY8/u9iqB7PPU2a5eiS9CqGaUw7qNrKY6+oVBjj2ovK9yYaaRS7uW7BZlxM= 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