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 C3C63C0219D for ; Fri, 7 Feb 2025 23:25:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB6CB280004; Fri, 7 Feb 2025 18:25:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D8D2B280001; Fri, 7 Feb 2025 18:25:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2DF2280004; Fri, 7 Feb 2025 18:25:38 -0500 (EST) 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 A06D7280001 for ; Fri, 7 Feb 2025 18:25:38 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 397CF1C915D for ; Fri, 7 Feb 2025 23:25:38 +0000 (UTC) X-FDA: 83094732756.20.609DFEB Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf05.hostedemail.com (Postfix) with ESMTP id 442BE100006 for ; Fri, 7 Feb 2025 23:25:36 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=odD+EGv5; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738970736; a=rsa-sha256; cv=none; b=ZHSNmrD1oLoEp0fYWZzZmlhLCEzq3opC/OB4l1AQJ+K0CBM5RKTJCNLMJjN6xIGBuc0KZ0 wVo6byBv/OY85KckvDAgQ8UsrLalv7nfvc1onvopzqqSCxQOKs2OFOhK2Xiy/uwI0SbyAa pyzDYipM/WpQ4VIOhpsfgzOZQFP6bbY= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=odD+EGv5; spf=pass (imf05.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1738970736; 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=NNlAmhG4r3/Civ4C+1dYrzk4uNPcGHra0U2geeoELN8=; b=dNfZXCM+O9FcNphbHLdJzSVOcHCL0b1KYGnMgRRZunU+k84Iei9t7pTM4AoOhck7qoc01d ulAflaZ1VpBze2KGJGztD5s2Fo9Og+ysOUwknCszDpWo7NdcmHcJSj2R54uonzyKPSdqJ/ VO3nucgGKBxAaqxwN/JDogsWH1hkyWg= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21f53ad05a0so19870905ad.3 for ; Fri, 07 Feb 2025 15:25:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1738970735; x=1739575535; darn=kvack.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=NNlAmhG4r3/Civ4C+1dYrzk4uNPcGHra0U2geeoELN8=; b=odD+EGv5fdUDce9rui4It5KOEPCe3N6+Vt3yo6/OLsFNhs9ME4sW0Cq9RKigNz5WZ1 1d6bX9WlOsyBFxWsCFw5L/bHBu21TPdEy+mwJVYslJgGXartU58qLQMhQ20OhzHdmKNV yI7mECWW3fCgjsU0uD+vC+ByYDMo0rEhq7o1Da43//F9cz0k3HjgsfGH56kn0iGBcXtB VcyCUkdKp9+A6tLHeQZpshFSwPtXqtP5hK2hraDXle9a7+yd6laFSnf7sds1P56E1U7b 7UjABpsNwC4GGS64ma9YeW4bFcHMMsoFS6fOmA4/RLMvCbG4MAnHLOZxWVoISun9oegU QczQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738970735; x=1739575535; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NNlAmhG4r3/Civ4C+1dYrzk4uNPcGHra0U2geeoELN8=; b=Zut/thu95EykJ+6jcBbUQyt5czk+JJv0sB+kYU6iaxTFOWNJjST23MVqPX8gu/Gx77 a0HNks2oXkQY63W1OLnPaVxl7Jrk9Gig6dmswfpiV9UOxPQO9m/iiVtA/kQU5GpNeQ1o UWoSiiL2S3BBGWS/V6g9uAmcpJ9pAVPx2VsQWytzf9T2cnuQDaSxIp83rBtaFfdjBPlv 6wlCvf+SsOgSTI63OdlAYM54fK6b6uK4CrTMhqjDJC+/nT5t1MzayNrwdsl1c67iDgMv 55wEWItCRw1ur5zsqedaYj63ewABg7gZtGPnXq/uurm+FKeZl19HigjwkR2nJLHqRQkW 3lNQ== X-Forwarded-Encrypted: i=1; AJvYcCXalVUB3tCupDMy4IoECII84NyH32JNgCLCRfanJDdJzxHO3xVp9yVxR/Scp47NsjqjX0EoN1oq0w==@kvack.org X-Gm-Message-State: AOJu0YyJmxQ3OKhuzdYxBvtwRGq194h6zW61mPIjn+0vg37hD+xrspjs ZycGbyPiOH2DynCqFyK9Ky1z23ujZOUVypMVvnIvxpKxnMlWknD9FMJChRZXmN8= X-Gm-Gg: ASbGncteoJTHCQNEbRWllGFAez2B106vycEGsvqn+zgDSezv6srYxLPX/Qq5Yh7cEkX mxZNpdGgSTcIPzuVcIITJhB9CwcMZV07boLAi+tMebx6e8n3qaZsrUvq7yFeiTlH+TKY/HvFHRR zsJD8L95mAX3RzFr1cfa4UnL0JaVLNt+xXLqpL27nPG6uyfq2eSGsLpO7B1yvAX7TB9UQIeG3dI G2kdAASEPkl4/l2B4pMCXRRa/VN6vJxgybNP5520DJuzXdGJSjZY5PL2L9sYi8MrZsdKXu5uBvO othBQUHicJLzLASkfsqIqOxDqQ== X-Google-Smtp-Source: AGHT+IE4XMWCRo3zMaE+9a8gR9bTeN800JXvztmc6v9Xr7sz0lD3zlNhQ59QeV7lPxe5ncZAuS2TtQ== X-Received: by 2002:a17:902:c942:b0:216:4c88:d939 with SMTP id d9443c01a7336-21f4e746803mr74840445ad.38.1738970735073; Fri, 07 Feb 2025 15:25:35 -0800 (PST) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21f3683db30sm36005905ad.138.2025.02.07.15.25.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 15:25:34 -0800 (PST) Date: Fri, 7 Feb 2025 15:25:31 -0800 From: Deepak Gupta To: =?iso-8859-1?Q?Cl=E9ment_L=E9ger?= Cc: 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 , 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, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com Subject: Re: [PATCH v9 03/26] riscv: zicfiss / zicfilp enumeration Message-ID: References: <20250204-v5_user_cfi_series-v9-0-b37a49c5205c@rivosinc.com> <20250204-v5_user_cfi_series-v9-3-b37a49c5205c@rivosinc.com> <782ef14c-e7c4-435e-adc6-9559ce3cc06d@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <782ef14c-e7c4-435e-adc6-9559ce3cc06d@rivosinc.com> X-Stat-Signature: gawbd7e1fjeunw68xzgbfcyjhdbmaqeb X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 442BE100006 X-Rspam-User: X-HE-Tag: 1738970736-691948 X-HE-Meta: U2FsdGVkX19PgQg5lXrNY1nfZUxNUXXFyTSKRpe1+MqU9EJdrA2aKWnrB7Ql1QsnkSiOfao+WfSK0hCuAjiw7mZ7A1Ug6eC8s09KgNVs8XS7ReElhlWXReNu4c1gM2eZn91g8lii2MnJR//iKhvol7Q6bGLfjem79Y0F4vzJh3V3UF7/+4AXFihQpVPsi+abFRoH2376FuVjoMUgt4R1lx9UbfJuIdeXath+072qfu5i8E8tXV8kGikwPZBErguqtfNOpevT4sqR045mi3272wXOt2sWqDJi9/HaF3oril3FMU5SETGgt1GBVqdBOzzCD0MUs6PFhVTehTbEUp1y9cuyqZuigqybiSRMXUN9e72iABySedVVl3eoog2Lw2K0zPnpSby62rk9AhconKUwmbai/GTRVjap6N1HHLrbWKXJtiWGZMn/O1oVNIOLqUbFDkswgJfA6q0APW8JplCreDlcP/JowTW+lKQqkZgC5jcpFLKJyKnEIiDEcjToGlEI73axwrMRlyRFnJtDoL/6J+nlI+ZCIpIOQuEHCKHnvOtyYyamHaTxa9jraLk9bBw8H5/JneTuc2gppeb0MI/5Rb4BAPR9fX+f7GhPvOC9E/Ra3moQhruCawdn0u5pwn0SEXE9wX97zoD4eeU9yboU6hDtiyVswf09EChRV13nmmX7xhytIzfgtFTBZfPIXNmt3xKzZeV897a6gsMhYu5QtgH06qm5oUbr1DLonCemgRbflOShZap5y9qFfTXHgej2R1H/+vsx/NUdvbjO1zuauEwEdJ1L2Hwz08vGlzl7iKpGQjvgjZwgVtRxlRbUK+IndWs8BFnf93QadL4+VnNZPMDm94eyoz7gMxT21oOHTZWBt9UCPsCvx+iu815A5pS0LP3vd/cV19+r1YV/anPHWdw9U/mWPlSXk+QUh1aSwKdxubwB/EyJIzWza7OmFiWsfqj8vYzmYKMlkvZGqJC CXBzLD6H xngp7Nj/ofV1p2HKYJXvUcuY/LB+gnsOncAbhQ1f71HW/HDqfccMTxIQUyWdKsxKqKetpuRvXPKOH3LK4kX6e+n5+s3Lx+MXLUfHrdmEA0iuHjV7dp9Plg1/cbiPnPtjisKg5K8iYTxAtqumDoLyjC87d/YIrRXrZg7hxDxg9lp71jcJtIGBwE8ScyfxJ9AwFavhFKrunzDBW3FvYOYmxrccJeEIsxjqPVuyMp1t+8TkXh7z2Mo3AhFdHIuNZKb2BgF56NahO8hWxBE8HOZVT+x4my7eX/FAhf1A5ZzapgcVNQj++34A9fAVWpIhIdJc2xXV8HJp9BsmgCQiudrmurKQVsH9fyHYeWpS4YOI/xsviZY8c5oFxsr8g3lGRMwdKr4c+S6KTqH5E3OfF+jjPSfOJf/G1aGYEId5yyZJzywKZiW7vhv5JoiF81OSee4kKwSBh+82sSdl4110uCNnf8hQXBIuiqgWQZq3R/9PJcLVh+mnhOG4ESmCbuoti/vj9vptJdj9g6zYDzCmIWx/isa+NOvOovsAqwtOdwIj+uB5fAU0FnHQwRS48cQ== 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: On Thu, Feb 06, 2025 at 02:50:29PM +0100, Clément Léger wrote: > > >On 05/02/2025 02:21, Deepak Gupta wrote: >> 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. >> >> Signed-off-by: Deepak Gupta >> --- >> arch/riscv/include/asm/cpufeature.h | 13 +++++++++++++ >> arch/riscv/include/asm/hwcap.h | 2 ++ >> arch/riscv/include/asm/processor.h | 1 + >> arch/riscv/kernel/cpufeature.c | 2 ++ >> 4 files changed, 18 insertions(+) >> >> diff --git a/arch/riscv/include/asm/cpufeature.h b/arch/riscv/include/asm/cpufeature.h >> index 569140d6e639..69007b8100ca 100644 >> --- a/arch/riscv/include/asm/cpufeature.h >> +++ b/arch/riscv/include/asm/cpufeature.h >> @@ -12,6 +12,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> >> @@ -137,4 +138,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_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFISS)); >> +} >> + >> +static inline bool cpu_supports_indirect_br_lp_instr(void) >> +{ >> + return (IS_ENABLED(CONFIG_RISCV_USER_CFI) && >> + riscv_cpu_has_extension_unlikely(smp_processor_id(), RISCV_ISA_EXT_ZICFILP)); >> +} >> + >> #endif >> diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h >> index 869da082252a..2dc4232bdb3e 100644 >> --- a/arch/riscv/include/asm/hwcap.h >> +++ b/arch/riscv/include/asm/hwcap.h >> @@ -100,6 +100,8 @@ >> #define RISCV_ISA_EXT_ZICCRSE 91 >> #define RISCV_ISA_EXT_SVADE 92 >> #define RISCV_ISA_EXT_SVADU 93 >> +#define RISCV_ISA_EXT_ZICFILP 94 >> +#define RISCV_ISA_EXT_ZICFISS 95 >> >> #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 c6ba750536c3..e72de12e5b99 100644 >> --- a/arch/riscv/kernel/cpufeature.c >> +++ b/arch/riscv/kernel/cpufeature.c >> @@ -333,6 +333,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { >> __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(zicfilp, RISCV_ISA_EXT_ZICFILP, riscv_xlinuxenvcfg_exts), >> + __RISCV_ISA_EXT_SUPERSET(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts), > >Hey Deepak, > >I think these definitions can benefit from using a validation callback: > >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; >} Yes this is a good idea. I'll add that. > >__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), > >That way, ZICFISS/ZICFILP wont be enable if the kernel does not have >builtin support for them. Additionally, this solve a bug you have with >your hwprobe patch (19/26) that exposes ZICFILP/ZICFISS unconditionally >(ie, even if the kernel does not have CONFIG_RISCV_USER_CFI). > Yes good catch. >BTW, patch 23/26 introduce CONFIG_RISCV_USER_CFI but it is used in that >patch. >Thanks, > >Clément > >> __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), >> >