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 8B364C6FD1F for ; Fri, 29 Mar 2024 05:09:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DD6E26B00B0; Fri, 29 Mar 2024 01:09:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D86486B00B2; Fri, 29 Mar 2024 01:09:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4E2C6B00B4; Fri, 29 Mar 2024 01:09:56 -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 A603C6B00B0 for ; Fri, 29 Mar 2024 01:09:56 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5E88D1410C4 for ; Fri, 29 Mar 2024 05:09:56 +0000 (UTC) X-FDA: 81948899592.20.150FA15 Received: from flow3-smtp.messagingengine.com (flow3-smtp.messagingengine.com [103.168.172.138]) by imf26.hostedemail.com (Postfix) with ESMTP id 4FE05140015 for ; Fri, 29 Mar 2024 05:09:54 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=fastmail.com header.s=fm2 header.b=D57deTiv; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=kT6itmYs; dmarc=pass (policy=none) header.from=fastmail.com; spf=pass (imf26.hostedemail.com: domain of sorear@fastmail.com designates 103.168.172.138 as permitted sender) smtp.mailfrom=sorear@fastmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711688994; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=W43fkf1B1Zn+9lZ0QAk0C2vy62l6S5S5PZF98K77Zsk=; b=yNbYbyMTMmwU4r/34sfiSyVa/RQXos0kQ5bhAeQcut3tm/0yV7Mi8Hn5yx6ecY9wPVF6OA nK1ACv6K2l3AwYJzVuhexy7gcFurc8WSe90kgdg8IkPEmbg6w5oZVHfHOHHekNxfP60SAV NlVl7T9Kjyw0ha+I+3wXP5bdpzqyDQY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=fastmail.com header.s=fm2 header.b=D57deTiv; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=kT6itmYs; dmarc=pass (policy=none) header.from=fastmail.com; spf=pass (imf26.hostedemail.com: domain of sorear@fastmail.com designates 103.168.172.138 as permitted sender) smtp.mailfrom=sorear@fastmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711688994; a=rsa-sha256; cv=none; b=nhLJQ0CtO5WJKEe4ZFH/ose8+arCW2iLvJcUK2r4F+dXspzKekROLEMS6DhbydXIqoZnNe Y4jEgzaXGKRCXwy8SvwK3UmaprUVNkojzfmNdNa2ZqDkYIsTWhuttcHYB7Iyi5UcWPrrLh Rwqyoj/+kTa6iIh84SRwTxqMExStEnM= Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailflow.nyi.internal (Postfix) with ESMTP id 5C406200405; Fri, 29 Mar 2024 01:09:53 -0400 (EDT) Received: from imap50 ([10.202.2.100]) by compute3.internal (MEProxy); Fri, 29 Mar 2024 01:09:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1711688993; x=1711696193; bh=W43fkf1B1Z n+9lZ0QAk0C2vy62l6S5S5PZF98K77Zsk=; b=D57deTiv3kPkh4S6TPaHl6y8IE aPyCnh9jL6Dgq2l+DIeKhmF6dkO220TK1L/d6RwblDCqSC6mwWHzhmyZuvr7YYSV AzrlX3gJiw/RzCUfZ+5HmZJmJXTocl7CDZGOq4taeeAz/Z8ezaM7BaSpQPB/rZ48 QFTAvfSNCu+7M3lb3xiLCreORf5pYJj+INeP3Ve7AyoIPJ00BeScF6bLLEUcAXSv KtnWDWuUAH7OvfCi1Jj8CpYSvgT6oZq3uWPv0jMpYMSFBDAv9ntlr6DNzU5lq1iK VWZCITz09tR3meh2AOo22um/Z1qVALwF0/bp0ebWh8Hwt74NKQPnHls1F75w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1711688993; x=1711696193; bh=W43fkf1B1Zn+9lZ0QAk0C2vy62l6 S5S5PZF98K77Zsk=; b=kT6itmYsvmUrBvvLfQ90WiLhRKO9jxWWamxe3s0xK+gi 6GjQkDKFP1VZz5Qg4Q3jTx2CQRBVnOG6VAZkIQxCKaWszeDBtuNjqiDSTBblpCOT JuG02yuZLF4cviYSAoTepicLm84FIk60LDxDG/70wXWajQSKxtHm56lcY7VxRpCL vtk5gFfJQZuaJ13892YpIxnR9gKuatf4yu41gFynsNfgh/VSc3uNKTNUs5KjUber cbZ+6vYyqkojqbNr5ioQs6vJbUT/orWH/OYVQMQ/Wkz+nBmKaN6ByO4pxcVeu5Gk MxhBih0FnRnPQnh+IYHvDfFZoCOhE8FIDTMaoexCsA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledruddvtddgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvfevufgtsehttdertderredtnecuhfhrohhmpedfufht vghfrghnucfqkdftvggrrhdfuceoshhorhgvrghrsehfrghsthhmrghilhdrtghomheqne cuggftrfgrthhtvghrnhepjeeuheegtdeuteeghfehjeejiefghfeifeejheduvdeugedt hfehvefggefgkedtnecuffhomhgrihhnpehinhhfrhgruggvrggurdhorhhgnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshhorhgvrghrsehf rghsthhmrghilhdrtghomh X-ME-Proxy: Feedback-ID: i84414492:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 1D6E11700093; Fri, 29 Mar 2024 01:09:51 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.11.0-alpha0-333-gbfea15422e-fm-20240327.001-gbfea1542 MIME-Version: 1.0 Message-Id: In-Reply-To: <20240329044459.3990638-5-debug@rivosinc.com> References: <20240329044459.3990638-1-debug@rivosinc.com> <20240329044459.3990638-5-debug@rivosinc.com> Date: Fri, 29 Mar 2024 01:08:12 -0400 From: "Stefan O'Rear" To: debug , "Paul Walmsley" , "Rick P Edgecombe" , "Mark Brown" , "Szabolcs Nagy" , "kito.cheng@sifive.com" , "Kees Cook" , "Andrew Jones" , "Conor Dooley" , =?UTF-8?Q?Cl=C3=A9ment_L=C3=A9ger?= , "Atish Patra" , "Alexandre Ghiti" , =?UTF-8?Q?Bj=C3=B6rn_T=C3=B6pel?= , "Alexandre Ghiti" , "Samuel Holland" , palmer@sifive.com, "Conor Dooley" , linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: "Jonathan Corbet" , tech-j-ext@lists.risc-v.org, "Palmer Dabbelt" , "Albert Ou" , "Rob Herring" , "Krzysztof Kozlowski" , oleg@redhat.com, "Andrew Morton" , "Arnd Bergmann" , "Eric W. Biederman" , Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, "Christian Brauner" , "Andy Chiu" , jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, "Evan Green" , "Xiao Wang" , "Charlie Jenkins" , "Anup Patel" , mchitale@ventanamicro.com, dbarboza@ventanamicro.com, "Samuel Ortiz" , shikemeng@huaweicloud.com, willy@infradead.org, "Vincent Chen" , guoren , "Sami Tolvanen" , songshuaishuai@tinylab.org, "Greg Ungerer" , "Heiko Stuebner" , "Baoquan He" , "Sia Jee Heng" , "Yangyu Chen" , maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, "yunhui cui" , bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, "Alejandro Colomar" , "David Hildenbrand" , "Catalin Marinas" , revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: Re: [PATCH v2 04/27] riscv: zicfiss/zicfilp enumeration Content-Type: text/plain X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 4FE05140015 X-Stat-Signature: n7dsw6tcoppppeq5seauqa9n5xbdrw6o X-Rspam-User: X-HE-Tag: 1711688994-78771 X-HE-Meta: U2FsdGVkX1+9BlzvT1diPsHCxcK+v1WOlQwSIWErm+qii3Mgfg/a/RmOZaiA94lGCwnTEjndzDACtJbc+Yjm5rFyMwl9NBDHlOqQESEAO6LEP+sVgE7p9BxFVO7muPWqjQEhucvzLodj76ekDjYE6P/Jz9+0JgDULu+dscejTw4YXBo0c146c8+X06l5kGniY5oa+oaRETf3+ATmizqTkLe6GeCLufRVxgLbEXsVYGefjUhSVrewjRjsmkskXCHdycgaa9XmooClA6VDcLYhvFU8HMVgtEBJbfzXB1/6LYtwedeTh9jUSn4juWGsY6IWivQFo2UdSgIcYd1i9sRHn1Rnd9c/FwUCthRIdvERrcdNeFryXyBJQeQ/cU+//MtPIZnqn6L4qAsruqgJ2dGj5ywk3ruCV3hG+E/bZE+sa/wo+U0oVL23A6/J+Hi345use6FBUkU9QpPaCG38zf3UFmESEQR53Mxdq9hvpvpf4QM+UPMX9NmrerU4HNIJcoZODYbPj7V5n1tOi3QfP0z5vL8FuRkt9VwHVL/VMH0tLhvVTvG5nprbvS6QWvE0Zf+PyniskAotVkz+QL9mWGD9YXcp99gfr6bjKXkFauzKPqftkKFkUACriGUGRzf0sDz+pAK2VawtLMg2h61DgwIWrL7SGvo3oOAvdPAiq2wTu3cy6PpH9BUfmUhyACUbdSY9kCYH/ng9bGU/4ubfnSkiXLReLLZjK9Gl8UNhM2aoWAo8S6BUgWmKspvs/bOcExAAdX00P45TH33v+UAEGrc9f7q1/HxZXwyOsgNyi5ZWpDVC3GQlhtMvFMkg1EJ4YAj3DnRo0OtFGgc8zye0qeExSDYYnvVlYBeOuxNfmfdEk+fqgOv41mVR3xTMIIgyNVWUE4OiLcQFtddvVLOPGmNF0ImTOs4LfAh+C4NUJrHlDMuxLQADrTseRk32pRHB0UC/9DtMGXZsIy31Ql5PHaY 4oraGv7k WV7XOQle5k7i7J38O2HEAmiFSnKXNIEbiqebIdKmhkwuIvbUCvpvW/3bLoOxk4r7CzBf/q4m9Rlbg4yzJv+gtOkbQpPwr73HcgOJNRVP4X75NhSk1GQlt3rDAd6FT2x/859Mzw6lXL7Py7XZV/JJBAfJhoTpcKtQBT/KA3f90xKYkK9/br3JeYeoLUNAA49eJ3I8NSFojW9HY2h8IdBy8Ict8I1cfvcZhCIvD1jRhe1o5UgnwHQyo0IizTbK8DjV5ZrJonjONGc6LzSDPSAZNjmo2FobcwlgDGeHel6MAIfhOQjgjQvavbknwKfIyMRlQqZxY9W0PTk0RZwQHKWHgA2+sFXFDV2g2W4cDhkIjlgF9qKtgSObjDhmo7/mNiguGI/w0tL2S9HmTEBN8rbY+rjRC3OeEVxSJ24RwoZ/siBrvZNUzI80vH6Bv7970scLdd8kDgYszlyqPTxE= 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 Fri, Mar 29, 2024, at 12:44 AM, Deepak Gupta wrote: > Adds description in dt-bindings (extensions.yaml) > > 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 > --- > .../devicetree/bindings/riscv/extensions.yaml | 10 ++++++++++ > 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 ++ > 5 files changed, 28 insertions(+) > > diff --git a/Documentation/devicetree/bindings/riscv/extensions.yaml > b/Documentation/devicetree/bindings/riscv/extensions.yaml > index 63d81dc895e5..f8d78bf7400b 100644 > --- a/Documentation/devicetree/bindings/riscv/extensions.yaml > +++ b/Documentation/devicetree/bindings/riscv/extensions.yaml > @@ -317,6 +317,16 @@ properties: > The standard Zicboz extension for cache-block zeroing as > ratified > in commit 3dd606f ("Create cmobase-v1.0.pdf") of > riscv-CMOs. > > + - const: zicfilp > + description: > + The standard Zicfilp extension for enforcing forward edge > control-flow > + integrity as ratified in commit 0036ff2 of riscv-cfi. > + > + - const: zicfiss > + description: > + The standard Zicfiss extension for enforcing backward edge > control-flow > + integrity as ratified in commit 0036ff2 of riscv-cfi. > + Neither of these extensions is currently ratified (the public review period started 15 hours ago) and the git hashes are unlikely to be correct for the ratified version. -s > - const: zicntr > description: > The standard Zicntr extension for base counters and > timers, as > diff --git a/arch/riscv/include/asm/cpufeature.h > b/arch/riscv/include/asm/cpufeature.h > index 0bd11862b760..f0fb8d8ae273 100644 > --- a/arch/riscv/include/asm/cpufeature.h > +++ b/arch/riscv/include/asm/cpufeature.h > @@ -8,6 +8,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -137,4 +138,16 @@ static __always_inline bool > riscv_cpu_has_extension_unlikely(int cpu, const unsi > > DECLARE_STATIC_KEY_FALSE(fast_misaligned_access_speed_key); > > +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 1f2d2599c655..74b6c727f545 100644 > --- a/arch/riscv/include/asm/hwcap.h > +++ b/arch/riscv/include/asm/hwcap.h > @@ -80,6 +80,8 @@ > #define RISCV_ISA_EXT_ZFA 71 > #define RISCV_ISA_EXT_ZTSO 72 > #define RISCV_ISA_EXT_ZACAS 73 > +#define RISCV_ISA_EXT_ZICFILP 74 > +#define RISCV_ISA_EXT_ZICFISS 75 > > #define RISCV_ISA_EXT_XLINUXENVCFG 127 > > diff --git a/arch/riscv/include/asm/processor.h > b/arch/riscv/include/asm/processor.h > index a8509cc31ab2..6c5b3d928b12 100644 > --- a/arch/riscv/include/asm/processor.h > +++ b/arch/riscv/include/asm/processor.h > @@ -13,6 +13,7 @@ > #include > > #include > +#include > > #ifdef CONFIG_64BIT > #define DEFAULT_MAP_WINDOW (UL(1) << (MMAP_VA_BITS - 1)) > diff --git a/arch/riscv/kernel/cpufeature.c > b/arch/riscv/kernel/cpufeature.c > index 79a5a35fab96..d052cad5b82f 100644 > --- a/arch/riscv/kernel/cpufeature.c > +++ b/arch/riscv/kernel/cpufeature.c > @@ -263,6 +263,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = { > __RISCV_ISA_EXT_DATA(h, RISCV_ISA_EXT_h), > __RISCV_ISA_EXT_SUPERSET(zicbom, RISCV_ISA_EXT_ZICBOM, > riscv_xlinuxenvcfg_exts), > __RISCV_ISA_EXT_SUPERSET(zicboz, RISCV_ISA_EXT_ZICBOZ, > riscv_xlinuxenvcfg_exts), > + __RISCV_ISA_EXT_SUPERSET(zicfilp, RISCV_ISA_EXT_ZICFILP, > riscv_xlinuxenvcfg_exts), > + __RISCV_ISA_EXT_SUPERSET(zicfiss, RISCV_ISA_EXT_ZICFISS, > riscv_xlinuxenvcfg_exts), > __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.2 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv