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 1CEB5C3ABAC for ; Fri, 2 May 2025 23:30:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 673566B009A; Fri, 2 May 2025 19:30:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6229B6B009B; Fri, 2 May 2025 19:30:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 424A76B009C; Fri, 2 May 2025 19:30:52 -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 1103D6B009A for ; Fri, 2 May 2025 19:30:52 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E15C01CCD4B for ; Fri, 2 May 2025 23:30:52 +0000 (UTC) X-FDA: 83399565144.04.22DDC4C Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf11.hostedemail.com (Postfix) with ESMTP id 008E140004 for ; Fri, 2 May 2025 23:30:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="iivN/tPO"; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 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=1746228651; 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=Kv/IZrFWN34T6LwOeKmoAZHYNOr2b+SAEf5j5mwxEcc=; b=JQACA81sj7KOflRVb0QFHUDcSo3/PDDMIww15+W/zi6kxycnXLs5/wLBrIoqHuVVHrhQNu a1JY3B9BhxdFzLBAujwTPUCGpucwiD9EUJB2VF0pRYa/qQt7jKnv93ngOEYlDtraQ6UqpX gAsOmOUSmLO04rjOlh2iCSdbvQoE8wY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="iivN/tPO"; spf=pass (imf11.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.181 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746228651; a=rsa-sha256; cv=none; b=fVgcbgXBD40i/tPjN31sOOU9cZ9mMZ0PpRdfPJYgzRITTX6//e60qLFVerNNSTcQTDp5ew JPUeDRcmAS6unxFT59FuTJTJVx153l6xEYsbdD55PGdkbZBO5TPeUq8EKigxK7PRetCRt8 6wNe342f23iYte/slphqCFJlhUAWYV4= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22c33677183so31466235ad.2 for ; Fri, 02 May 2025 16:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1746228650; x=1746833450; 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=Kv/IZrFWN34T6LwOeKmoAZHYNOr2b+SAEf5j5mwxEcc=; b=iivN/tPO5nYtdHyQ1zPbA0u3wpXuiQ2yBdqjQ8qD/iLwGJ9jXetVoN/XcqkLfuZ9pZ 9psixqot7EJDIgrwWdvNpifMfMlAZFcpDHBl8ssW5Cxi5wazBzModF7ictP/kE/3EU4N bqQx/zGGqg1KyrlOsO3dbSNF+m/h2rfZUOsCuKT1XVO3RjM/o3MQD8KyfImFuad4OnDl bC16OPbK9Wy8q8MmouzG3nIdQ9swP/SWJ8wudkX+OMFjS07XHrJhADwJmREGYGyYdloE dvI0YDnQWa2Cl4wHYX3KnDqRjZywLwynRAzZb742qw8dLyxMCrPQcgcIKIC05Wt6y9+1 7B3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746228650; x=1746833450; 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=Kv/IZrFWN34T6LwOeKmoAZHYNOr2b+SAEf5j5mwxEcc=; b=p6y1bzibYHjL1S4F1eCgEnpN8u1GSd2yHRlV7DA9j6ZpsIHh5NH8Ql9sjbPmsH4z7+ /3Hi9RlHpy9dWqdU+7BLK7JaIRPIfhgXAECBbsBVqfrNj/gZ/H8L5yMWaDzHEzDCxfcl fWV6C6Yoh6Tbs43O2zAZlcCgTgVn3+P8LxAJKVoIcVzcgUik3wgz/q7BRmG5EbpUMHWY fl1KjRHfcd9HDyxgtP52fiv6+EkySckRAbJB0M+lrKSDV7xlcOF0Zn8JYb5fHOrjEAP9 XVcBajvwR9krirq42Su9wRGJn4qhoY090FEF51yD1ENtaSB0HzndKQgW/QLNCDsYY8l+ 7YSA== X-Forwarded-Encrypted: i=1; AJvYcCXwVXM0nmahS5XrZDVKbuUNzEcwt3+BK0sJUWnrcH2V96iwTb71TRuL2WUkk534QK+U3M7XT0f+5w==@kvack.org X-Gm-Message-State: AOJu0YxwSfGT/DQZBZUfIO76R7M4/JjF3B4/6Zp89hCvObvMS1QoL4jt bRtIZpmxisSLi1qgodXU3aA05RrQH5iNyTXuJuFjiAuGyvpgvfsFYmjjbXgh5cs= X-Gm-Gg: ASbGncvPvlyh5oR9C92gkld6O2NOhgAgJOwq7aQxQr2XLgoLG+i1Pe2WgmrKZrHXxBG E0Hs1rDBjwfiysGOUOtr3EdeV0KNiBA1nUc1yMd+0U3gMKvVYpoPeu0rAktNUB7cIQk0jKYxKP4 avIlgJzB9A48m0uF4A46GgM9dFUmw1jD4d5hStJMT60gmldd247Kkq72FF0MWNdM91S+fwrQe9v uqdt2lBHkS+0XCpck2+PBFpEvR/Jzawrn1F2ddrbhHHFLN2BBWaU3Ee2g++KaT4TnjpsIQyuzEy LIYNdE7HqybXZZeS6/GzG3iQzalkbmc+th5bvk0PEJUg8ORLxWw= X-Google-Smtp-Source: AGHT+IEAYFNfLDhBWSL/B8cbLh33RhIRLr7URrEZ/oj0lBSQv4I7gkWt7LyCh7wHrx5urs+SSaElAg== X-Received: by 2002:a17:903:3bc8:b0:221:85:f384 with SMTP id d9443c01a7336-22e1032926dmr68727365ad.16.1746228649871; Fri, 02 May 2025 16:30:49 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228ff2sm13367055ad.180.2025.05.02.16.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 16:30:49 -0700 (PDT) From: Deepak Gupta Date: Fri, 02 May 2025 16:30:34 -0700 Subject: [PATCH v15 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250502-v5_user_cfi_series-v15-3-914966471885@rivosinc.com> References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-0-914966471885@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, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 008E140004 X-Stat-Signature: m48ykr43ns4s1degd17xw5bw4wfmfm1e X-HE-Tag: 1746228650-821545 X-HE-Meta: U2FsdGVkX1+7VE6ZHznHTBLReO7KB2C0xhMRqpoJ8hW4nJ/HCUkEXs42z8D0/VroWStQtQJXytOUv67yUw4m6xMnHq3jJcgik/UrJcG2W7CdrXOaVKEX9BeImzvUnrk7jKOwmMO7S1nRyQWKly1hzscK4fzA4RE0omkTU0dsJ/02hkDvCz7KxpfaoJBUjnzgI0G4kNYnLW1jriWc4k51NaLW7r6fWXo4KPmn3bhR08yNimUpDFxjvbk+vw6qzIZGLC34RTOeicz7TYtMiY01AEHqjRHp6h1Fb9z4rJv+a2kzPtNPB37Fo4ZM0WXiM6j9V1YlKvnMnjbAK7jUXajFi8psdvlId9SH8/bCXLljtfBp2tL8NsgfPNqShnkQ882mYtxE8o6kZA1sKmv0S0SbOjE1e3QhSno4Mplomf1dfDFPUtGJ8I1GeGAsrxk9xtu+8Hr3Hm6vbQndyraiiH/qQn5yLf0N5jNnGcSRMQT/P/UOtOBexEyyorr2/5AEXwnvW2RtAXZVi5ucLtgPavstLpQfFS+ztDXNrQh3XQv8U6hcVZwJ/HitWnYqLLEGiH4kIvABGpWTxofJ9VllNBh2vMIjv1OwT9NI7QXECFPPVY78gp1vij14Zco3qG8jWEA+fmlClgOZC+2XI0mGB9B7grVZzyItIsU50vJWKqoO1emxOU+c9E6GDPq0i5y2SzuJ1MEKMeGBRopns3PmT1wvTnF2pggyNjN2HjBBHtb+ilz8tqEZCdu500N8k0M2NrqAajr1T33dFUAYPwjtmEOTDzUi33CU1wNK+h0xLVRuzVXdaiBOaX13SeQV4KkPm0J2LQ2GjEadwxtOKjgZuACKdd2hoP6P3Figb8bupte04PNfOSXluL4Xyyn16YreJdB6zdyDeq7xYDVy2Dr1VUmgkoDVWkCo5Fqi6Z3Gczh/D4YCyLDobKehunJAiZ5jVxPeDJB/GKaitbU5M8Q4uWU qLeBchyS JQFAutwK69cC/HOZISI/AWbsrL9wjGuiJQAX1Y5on8WVQPZsyfXDEW35C8muVKOQvNeN+UecuEgHA9qGC8/G7jO3SpOhKNXn+9HUKVuxK5d4bDpMT0oRdDvU1qFJ7cWZ1BEzcNcHFQ8VOQQGizFbA8zTsk3P/h/wPHxcqgUWMlxw8/Xpayx7bdz+YXrWrtneT6bqPAh7np5dUo2h8YnZigFqdrC2HUSlUBR1mrkeRnrKZjFI1RNuQr4xfICEmfB700P5iAu4nvHqE/t7HaX8gmOU57j6GFPGTTZ/ALHqPjzefYOZ+F1bc5V1E9nJln95V8T0U60zntvk/FXnLGl8qBbg1DECp/RGev6FzGEv/X9y56rXqEec0RDrpP52gIOZlQSjMd7gIbzcuHsLT2JlJc/GfMfnnuQJOsgDoQOvvfZxY8nQZI2XA4xcUt8RfCypG7yTvh7YMgOm8DxsXPq3Rhd4aWKv9LOjbmpnh3U9qBLRiGwP/TKfpclMVkW60n6ExKBbuFDPVz9tEtxI= 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: This patch adds support for detecting zicfiss and zicfilp. zicfiss and zicfilp stands for unprivleged integer spec extension for shadow stack and branch tracking on indirect branches, respectively. This patch looks for zicfiss and zicfilp in device tree and accordinlgy lights up bit in cpu feature bitmap. Furthermore this patch adds detection utility functions to return whether shadow stack or landing pads are supported by cpu. Reviewed-by: Zong Li Reviewed-by: Alexandre Ghiti Signed-off-by: Deepak Gupta --- arch/riscv/include/asm/cpufeature.h | 12 ++++++++++++ arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/include/asm/processor.h | 1 + arch/riscv/kernel/cpufeature.c | 13 +++++++++++++ 4 files changed, 28 insertions(+) diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h index 3a87f612035c..100f4b53ba5d 100644 --- a/arch/riscv/include/asm/cpufeature.h +++ b/arch/riscv/include/asm/cpufeature.h @@ -146,4 +146,16 @@ static __always_inline bool riscv_cpu_has_extension_unlikely(int cpu, const unsi return __riscv_isa_extension_available(hart_isa[cpu].isa, ext); } +static inline bool cpu_supports_shadow_stack(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_has_extension_unlikely(RISCV_ISA_EXT_ZICFISS)); +} + +static inline bool cpu_supports_indirect_br_lp_instr(void) +{ + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && + riscv_has_extension_unlikely(RISCV_ISA_EXT_ZICFILP)); +} + #endif diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index e3cbf203cdde..abc33ca1302e 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -105,6 +105,8 @@ #define RISCV_ISA_EXT_ZVFBFWMA 96 #define RISCV_ISA_EXT_ZAAMO 97 #define RISCV_ISA_EXT_ZALRSC 98 +#define RISCV_ISA_EXT_ZICFILP 99 +#define RISCV_ISA_EXT_ZICFISS 100 #define RISCV_ISA_EXT_XLINUXENVCFG 127 diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 5f56eb9d114a..e3aba3336e63 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -13,6 +13,7 @@ #include #include +#include #define arch_get_mmap_end(addr, len, flags) \ ({ \ diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 2054f6c4b0ae..98e55467557b 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -258,6 +258,15 @@ static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, return 0; } +static int riscv_cfi_validate(const struct riscv_isa_ext_data *data, + const unsigned long *isa_bitmap) +{ + if (!IS_ENABLED(CONFIG_RISCV_USER_CFI)) + return -EINVAL; + + return 0; +} + static const unsigned int riscv_a_exts[] = { RISCV_ISA_EXT_ZAAMO, RISCV_ISA_EXT_ZALRSC, @@ -444,6 +453,10 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicbom, RISCV_ISA_EXT_ZICBOM, riscv_xlinuxenvcfg_exts, riscv_ext_zicbom_validate), __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicboz, RISCV_ISA_EXT_ZICBOZ, riscv_xlinuxenvcfg_exts, riscv_ext_zicboz_validate), __RISCV_ISA_EXT_DATA(ziccrse, RISCV_ISA_EXT_ZICCRSE), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfilp, RISCV_ISA_EXT_ZICFILP, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts, + riscv_cfi_validate), __RISCV_ISA_EXT_DATA(zicntr, RISCV_ISA_EXT_ZICNTR), __RISCV_ISA_EXT_DATA(zicond, RISCV_ISA_EXT_ZICOND), __RISCV_ISA_EXT_DATA(zicsr, RISCV_ISA_EXT_ZICSR), -- 2.43.0