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 00C4CC369DC for ; Wed, 30 Apr 2025 00:25:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA1756B00B7; Tue, 29 Apr 2025 20:25:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E27F16B00B9; Tue, 29 Apr 2025 20:25:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B1FF76B00BC; Tue, 29 Apr 2025 20:25:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7AB926B00B7 for ; Tue, 29 Apr 2025 20:25:11 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 80016809A1 for ; Wed, 30 Apr 2025 00:16:41 +0000 (UTC) X-FDA: 83388794202.26.387CD06 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf08.hostedemail.com (Postfix) with ESMTP id 969B0160004 for ; Wed, 30 Apr 2025 00:16:39 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DVjS+Cxw; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745972199; a=rsa-sha256; cv=none; b=ahHubU4w1mg0q2ZAhWmFmVBXaDxFs8bIpt5DvdujlyC2dfwOOZ6k18F8CDhKyHI4iWUXbU sBN15Za9VCc83g8kLP+ng2+/YtN1SSyNOuzU/W9Ygldea3mqK1W7io/lur7juIMSe20bbZ ByRPXmXgU55ndUUk+WLlk5DFOJz/SFk= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=DVjS+Cxw; dmarc=none; spf=pass (imf08.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.174 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745972199; 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=PwcKkY31HnFrOJwuK2K6WCLCgF1XBWXlJb3OyFJW09VYySB1V2hH+kQ3+km/Yp/U2ZsDN6 ZSYZsuwnJZ1FmUU02IPTWf16u4V8vF4bUlhRxgBoWcKuylwH5ih4r21LLf0tsR56fFjILd 05K9xJx3GC7njituJ5XZhn3OkAdpcuY= Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2295d78b433so72316965ad.2 for ; Tue, 29 Apr 2025 17:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745972198; x=1746576998; 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=DVjS+CxwSE+ZdIAZrUnPH7Zn0LmbxHDfxWO8BlyoO6WzMgErctZC/n2xPxkd4cCuTp uPKvaj1AIvSXJaBgbCww9NJBjMY7dCPoP+pfdqgRZJYJ/E3jM3aDa5ksRD0aY+CYrPYs dmk5fDhnb9iEzzzGV9hxHjwdBKiWndHKN1P7WIcBy8iamb4EFrL1+DpfNcqzYM9ecS+5 EbOd9vPh29N0jF1Ad0zirFKvSEXN4Td+gnMmocS5YgFc2FMU9tJMLkATfPATRrxd4zDe Pki6msdVY/hfH6XkiKUf8aSPH93fp4KHLWeuHkFAUabavpdKGy6tGu1nZKIJAOXDSvA+ sguQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745972198; x=1746576998; 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=uy+IkNDpZhAh5WIsBNVC3MGdQoSgzVVmzWpbeC6F2lEB86TRxpeS9E8ZPp78GvSrxj dI+MonYYB6TF6AYhI401p7lziugLrIvO+srqRzja8bMbEkwGPDiXBTHozOkS5SAZegiS xiAvxGm2vT8uQpH4pe6sz9/E/jNZX/ugYNRVFC5B+pMBFuo1I0cE4K/mmclks7uneBUA BgsueCyrEa++xMBU9jUIGH1ax/m6U/QTRBjwbsSq1hbm73zCVxhhQwh1Ni5Jmgz6t6yO FIR3TQkKl/g+ttO18/wKVV+Ui6w7yzW4vJJGgaKj2ayOxX6Yfq/9v32TSlbjBYSWZUAG yPKQ== X-Forwarded-Encrypted: i=1; AJvYcCX1Nb6WvzRNOq1Uno5ju/aiBOLKaS4GWu5uQx1SZCOA6XvgA1/61FGZyR/w5ByNFSM+G8y4rLBHOw==@kvack.org X-Gm-Message-State: AOJu0Yxu0y286S/xaSnBCItjkA+D3zX94IkYD2kPhrGfunkAwJaM0NCf bZcgRjDmLw19LjyVkbgL67VdGxNnHv7edp4Prh9JxCQ3CM2P4RQEtPxGfn4QmjYThg0WsXOQoik A X-Gm-Gg: ASbGncvZdEao6ut74BNyLR9SseP2t6r99HLCqEge8KT9PKEelEXK1RXK8IIUxuiXKWm mjRBbFvSWJ4LeHv4O46fue+ncgD2V5YWkfcIvimE1QwzT0lXVCZUuZJUeEpOkv1kZgQNPjLCusX o5wH9peb4QPrxOTOmy/cwqLtEFvdA0tY8b6qNZDovZKE/Mm3LipczHLQSh411oOCZBWj+gGcHQV CkT/z7saUJpgSCk+FpzlpaRZdVgIAJyrLOvF4mwY+YG/R0X+ZLdk/uxMsGd45QA/gps40zxiysQ DVF1a2JV+d830AXFEqeNj8T+rKEQ3CtOm8TWEgEO4SQRe1X1dmk= X-Google-Smtp-Source: AGHT+IGgUZYU3gBslaD7DYbu9352xzjmmUNsFUbJHh9p4RhBMds1qn9WRtirqdbQ2JrH79nyYx15LA== X-Received: by 2002:a17:903:1c4:b0:225:ac99:ae0d with SMTP id d9443c01a7336-22df576355emr7856465ad.10.1745972198489; Tue, 29 Apr 2025 17:16:38 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22db4d770d6sm109386035ad.17.2025.04.29.17.16.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 17:16:38 -0700 (PDT) From: Deepak Gupta Date: Tue, 29 Apr 2025 17:16:21 -0700 Subject: [PATCH v14 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: <20250429-v5_user_cfi_series-v14-4-5239410d012a@rivosinc.com> References: <20250429-v5_user_cfi_series-v14-0-5239410d012a@rivosinc.com> In-Reply-To: <20250429-v5_user_cfi_series-v14-0-5239410d012a@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-Queue-Id: 969B0160004 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: siqxibccsjooojaraxit9wruefg15b3s X-HE-Tag: 1745972199-807597 X-HE-Meta: U2FsdGVkX190FkL4JrlDpIwzaxCZG64kaYafc4trId0hkwoXbiAiQDrknLEde4HuAnngXriV7LsW1dnj/5hvYpixhMdZuyrJ+bHosQQ5DLiFb7Tj4cU5zgAuPDIO6NeK5gFaAHTc0W1dCKl5U82OhJ2sV6BOMAMy2vaO1gGj+iH2ekLYPpoLa1AOd7FG3bNJiYl3x7NkH1k/ftFTbk93pRddztNqKPks9ehphOdHhqNSFt4HaPqK/LTEwbgxjIUWaiG/3NN1Dpkd0DAMnVUnaY2WT2KaXlu6ywyxwDoqgIBp7HU5K5wluZghgYf296qQ3vkTIImZ4pTfDtiFuSgoKKHsQ1ENUcD3MqKhkX/GtieMlTZXD7ye87KLoiXadHRtmHgEOMQ1YTNILlyP338UYRDtOQijjcqKL7MrOsx+hiD0ILrJLd0r5RpNHQIyfcjDoT9OWsz17H926p88Bz+DIvwZz0E7tcAcyGgKmV2QTlksZVdvdqdvgByloCGdv3mmIU+i4cjaSSV6v5UIYxUIoeVsRcQRhL0+pIefbsboi3HBxWDaHkTbETuKVF7NtLEUMfzVdX9j9BFwUz/qt7b7atkbf/btPADGbjUr3erI0EpcFc6q8ddRuXBAVROInOfbQm7grUyxLhQypcAeYA9Zc48/ONg5iZx7PL0JC/J8Q5JFIlk1WFW4l0hPuntSfEAoaa73dqM29Czp8ZYEvLV6trY49KWOIA1cm2CPd1uV/nr2eZbTuNKOHZjbTQI25ajScj6MuQQZfGA+6ErqEj8TSD4nYdSBMME1xDuBYdWNv0eRNIrXq723FaOlcvwfSyuCawoHZxgpRBxQhVgH7G+jcqBA1iqPin78XRnn9HcGhfmg/TG0fUP19nB5OEwn8WZ17ZpGopdZ1FBcftxK+v4yxX/F/B/vFBlMNx4K9216UAxGm2GnrOhuhV8LtdnUrjrPwCFG9mUVZLo8cLl1jfg mHaAZtk+ +MMT5IK5V3xXJJa1PO6o7MJFwtpmPTWC4elg0w7GXTgAYQCLv608ELzybHOOy4wxUz/LuTPk8iJeRiU84O8ncDEyC+yN6J/YBD8CwKaEOWd6cre4m4hExo+T9jifcAmv+2U0+fS7GipJkk90voUrFcxI06gSyKHUk/H29vUZdTiqGQ1EkeblGEIAwHUTBXgJu7kVvm6X7p3LLXJ/AzL12+UlfjJQTr3eYDPICBUcsewEsPfsieOMfyr7WdqiO3UxqyhK8ykLfkJMyVLoXpQzhlVH/Q0p+fyCaTHGef/hA6DBQBdSP2OadE65KBVl52hn9S59RmdWoYT8RLO+bJvkDDTjJGRONTKIrUmZLOTN96IjBBqpqcc9DrKr/qRkCss4YHriCLe0z2J498lFNlH/Cv8FR6lZ4Bgk//eCG50omWYWL7brfdSDPhBYPHRo27bD0/ifaWudpDaAxSMU= 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