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 B2851C3DA6D for ; Fri, 23 May 2025 05:31:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4ED246B0093; Fri, 23 May 2025 01:31:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49E9A6B0095; Fri, 23 May 2025 01:31:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3659B6B0096; Fri, 23 May 2025 01:31:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 16DA26B0093 for ; Fri, 23 May 2025 01:31:26 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B85461A171E for ; Fri, 23 May 2025 05:31:25 +0000 (UTC) X-FDA: 83473049730.10.13218D9 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by imf28.hostedemail.com (Postfix) with ESMTP id C7D06C0003 for ; Fri, 23 May 2025 05:31:23 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3O01603b; dmarc=none; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.180 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=1747978283; 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=2ZZoGehI751WEnlyiA7Yu8/Xg1oNedSIkF4OaPbny4E=; b=idmu8qXeFXNAryw1AsyACvyLqWNI5bqpXrvIzPftp3f4ftrVQQclWaeJophFyhgjMQnDpe l/ak0IAEly/BVv+WghblT77cwlNv99w46kz3hcnUucMD80FW3BfFZ1OsLorHBC3YolF/wb KpOwhPAeWdMtxd0rsNn1ccptK1QH/so= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=3O01603b; dmarc=none; spf=pass (imf28.hostedemail.com: domain of debug@rivosinc.com designates 209.85.210.180 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747978283; a=rsa-sha256; cv=none; b=wSgy9Z+2EWkCTIzUIifcjkrkBUteKmwxCEGP4jF6eNq/XuXp99cqpYTYA0fZeIiEPvZkxC oitM4dqlEkgckFkSg2R1miEVTTC+wLLnDGhiaipAV0Z8aGDvcQAMAJkJTK/ePUVf/MFHRp kGMuBilQK+FzXzqSzBcjo6hZdlCSCx8= Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-73712952e1cso7978138b3a.1 for ; Thu, 22 May 2025 22:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1747978283; x=1748583083; 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=2ZZoGehI751WEnlyiA7Yu8/Xg1oNedSIkF4OaPbny4E=; b=3O01603bLiqm5JyZits1jPe3F4OZuooTStZ85ZMiKLYOlZ1AhMD2XVONu71IMhjnUU yH8qdhCUEbmAfnGMrLSPtisjZHj03GuKZylqlsgSrExFbYifaBsaw9BEx1OeYHWAohR5 qHTEEzY0H2BbJRUJ+B5U7OxAD+eNk1LoNDiXudUdWCaqv/PuGN/yh620zEWoNx14snK6 xWXmQzIJ08capgUFg89oKjkUu1zygKmUsPtCIir1OUjnYTlQLtKWWDiK5n3NlhTKMo2C ueRKovQP9xEz+ubHQ+wpXEr6GrKY3eAmzlHU4T905BUiMPywfeiNibIUYkBYDhytOYeE b1bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747978283; x=1748583083; 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=2ZZoGehI751WEnlyiA7Yu8/Xg1oNedSIkF4OaPbny4E=; b=oNGm1LSA+kiMpvEI9+WBBeGTCXMf9TsosLS154L1Uu7Ziy2hsdxO2cGwTs59iEjzdo 4OTcyzzCMjfEMX5HiszLgV+LQcNSEVOviUMmSHEvLxATMVoQnrLmTWl1w4W0+IWCU4w0 EsTiIHxs8plSOa1J3eUeomU8T3KY/EyjZBp83m4YXLthQHq/TsNeS3SHAyTBNeoSjlbt Z4LlHxrFRvwVjyUZjSfM0sMke80mtuqcmuhXDlW3T8UyYprlQJyt10k0IMPPOPJsGqcr H1tVB1AcQ2oqnuAjO2E5Hl8/JW8IzwsbfAYdWnbgKRuWkepoNm05Y5jE/rJ23FNQ0um3 Lw5w== X-Forwarded-Encrypted: i=1; AJvYcCVY6BruqHMJ67vAwI11lSUh3ZDhc56b9KO5DnlnCq0S2cXY5EsMCxUub0KGLCReMHZBYH5Ig9Om/g==@kvack.org X-Gm-Message-State: AOJu0YweuJU3G6tZRksl65I4iVLKUXKyMMbFC0biSspDm7pr0M2Gfn3u HlQS5dOLjQyM8j0NiHZPoeg+S2Lnd4ixIjLe6h1PKr4gPFE1QJb+zqLm1XYVPC+tHJg= X-Gm-Gg: ASbGnctdsqkZd7fYo7TrKxe9q0KhK4nVDOdrUCZSg498ATWe7i6xLyxKYoYy1WuSeSz iRImCHnU3tNOh5NXJlBND+BEuFb25V7y4TscoW5cjQfq/B4gQzp/ou1LfeDx4fgi52XBVU4kvbZ cOJXcd67qDLAe12OB1RBK7WO+KnW8ctsZvijMnHkb5HEriy1WETJeOQV3+uzmvCzUeeAwe13k0o c5dlwbuEmB4BRZpXSEmtQDy7+HbJerr25TdT0TLeGLce1JgvH1o1ENWwVg+C+GjAdCAXenzZxpk m8rcJh9Zpc9DcfQ+ihYXCNUhqc/e6sBqvB34p554Vo3Iv+4XNZeZc8likqX2AM2RIe3lbs4T X-Google-Smtp-Source: AGHT+IGd2D2FcDb/KwfbMJPCpLhAMjanV40kfX/RpFqLkWrkOR6PoOiVbMKoftU4GjTcvHCjealQ7A== X-Received: by 2002:a05:6a00:399e:b0:736:50d1:fc84 with SMTP id d2e1a72fcca58-742acd726demr38699475b3a.21.1747978282621; Thu, 22 May 2025 22:31:22 -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.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 22:31:22 -0700 (PDT) From: Deepak Gupta Date: Thu, 22 May 2025 22:31:06 -0700 Subject: [PATCH v16 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250522-v5_user_cfi_series-v16-3-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, Zong Li , Deepak Gupta X-Mailer: b4 0.13.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: C7D06C0003 X-Stat-Signature: tfagynngkyayx5qhfygmhajbzkdgsf3w X-Rspam-User: X-HE-Tag: 1747978283-351477 X-HE-Meta: U2FsdGVkX18OmFqDKDMOc2dlFSSlaFgEYsYggClE9DIsmW9FQ0CP3iyBQVJU0KXRM5ApNT49EBt7daN+x0qvdEA0M5ucPoNgXAIQvtaOP5eSWXqrS/Sr58eE/ounq4/Hd+YvNbxLTnx9/VXHE6JKqntpIognVKX8On/p9tLhTA70daIUtRTEKIAmFuMzszQhMiJ87F/q0aoQzuaI8pXQoxHIz/ezaEgUkKgJ4GYCr4bXqxkShoL77eozhyCsxKal/OcEvLTd/Rtw8o8gvpcpG8w9igDeqIygNo0DJHGhRKjfLcIoVqzwcJl78WNMSt2pwo+qGmLHKqJK1y70SNIMetIvCkcS840SQb/ovueYMYYDeYSO65/K5Y25vPOdn3aHAnK5GQGp0vCLjsfuH+9ATUxcjH1z/QSVK4ERoHwh8FvcgcE7h65pnw622cvA04pxaHUzts+IViwjpbgMBsWX7IJatfRoZAvf4wx4XuRhSNz5z8zfwRurVSuCKOoBn92N5s+0cMyBWlkNlU37yso9a1tIqWs3okzuhdikGRsGKV6EayFRirFFNnZfCJnT7vgVbGNYcTrOESJAmEcNz0Q0yygnDnGlrxAxYCa/RxoFOhBe62zRQZ8do85JtSgiVFwOivIAFL4exGzLJPl9sVUEuXqGx7B3R9UPwHsuPBDtyr7eXzaXTyI+5t9yY/tWmAg274rrO6ZMYb7sIL+eHKE9HqVG/yo0xAGJPh5f4RvzsNwNTjO9uiiJp0XSAJY6YHybeQEIXvHeQtEOY8HEGLW5Dw5Nkd20bcIL0QY6NtkFtAu5J0APzUd8LBStEOXfesPa85+XOG3f/M7Sk9bSLbrkEeHlSmB1BDzOvDa3K+K93c3Tg19P5ZaBQgDbwjaqU3tfQbkA5dARVgwFpEeLOzS8vLWJc9gAVPT4JH7G3Hmfp+SAlDob760mprL9FuFSz7vDFgOonJUnWYqbODXZtmt HXGT8Cu6 Wg/OeEgyvagTftH7kiCjw5ncly5zAJ0CTgs/EH+JX0chZTVcwonKa6gcjtI+DflFwHgOfaCS5+D6DzrJjuu9jD+0KDZxdwVmN2EZnl4OzZNxS0F7/kWzkhXdZD7+tOqbFoPjlM838nsurNn5I29tURHeLR27rpsI3wOgXCwhs7MJHZ33/1LRvThk22yCyMW+Tzuu8bxwsqxHzVn+9De+Vdzj5FzLobceWLQtC67X8ism8LrzRMp+pVTb/nwuu/q5tUPoN7yGnYdqzbFSjUs5cxAFfGeCdPnWQjEyQGSxI5uW0sQJus2M7A8SypzUUMmHN2aDEXdEuTu/8PpWHByKYINSz98ctZ7lJLGgmp8b16bbsA4HgOrR+IxiR79xPLVNOt0jUrLxWFwkupGQlN8CrqqEVCD3vV1KxAQ2rHqBzQ3pgVK6ySG9E7yy1QxtwNp3jEVR46bOTSQbohiSb6NcTELJ8X740t4Gk+AzuA05L/pNXNVK4I/9Fe6hrWRG2mXqRyx3R/ohNt8IKQbg= 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 | 22 ++++++++++++++++++++++ 4 files changed, 37 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..c54de1bbe206 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -258,6 +258,24 @@ static int riscv_ext_svadu_validate(const struct riscv_isa_ext_data *data, return 0; } +static int riscv_cfilp_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 int riscv_cfiss_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 +462,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_cfilp_validate), + __RISCV_ISA_EXT_SUPERSET_VALIDATE(zicfiss, RISCV_ISA_EXT_ZICFISS, riscv_xlinuxenvcfg_exts, + riscv_cfiss_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