From patchwork Mon Mar 10 14:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 14010193 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 F0A46C282EC for ; Mon, 10 Mar 2025 14:52:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CB0C280009; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76603280001; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50B29280009; Mon, 10 Mar 2025 10:52:43 -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 29EA7280001 for ; Mon, 10 Mar 2025 10:52:43 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7C0B51610C4 for ; Mon, 10 Mar 2025 14:52:43 +0000 (UTC) X-FDA: 83205933006.02.2D574A5 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf12.hostedemail.com (Postfix) with ESMTP id 22F0940011 for ; Mon, 10 Mar 2025 14:52:40 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W/A7AVaH"; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 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=1741618361; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=1uhCS1LoKx+KdLQOKxDRcFlaoV7KNA4wH717olXIocRaiejF/AdQKykpeao6yJ43OvrXO7 wccYsUJihsj8mngDGZQ4DiTIGInL4P8YbknTmkU1/FeGD5zs84hil9Ey52+FgWgLFftFmN cIVSn89DgT4dlJXYQr9uFwjuHV+7jxc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741618361; a=rsa-sha256; cv=none; b=nqa8+2ogTESaQwMSWwm1PAqeNJcuLx1Vnyj2sFdMbh9Z+0tNTfizwWTKXOwegEsrsrwg/X R4mqRAOy4539qg4vQI9zvOMUYcrD98EmRjX0P2Oge/D90uimsGO0Xok4csmJjNP0kSTVCk f+7k7ELjLei3AbTd2oE6q2FEYvrmY4Y= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="W/A7AVaH"; dmarc=none; spf=pass (imf12.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2241053582dso69026125ad.1 for ; Mon, 10 Mar 2025 07:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741618360; x=1742223160; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=W/A7AVaHcdByMHTsbDmTca43bJE2my0ZAlaRW2PKDRt//4AC/vM8iE1vaeg50aFQyp wbtbUMw6yAeQCBwDo1l6xjp/uZv+GFfXjObOaWZrmKaRLgsDqGjt9YsK7yZc3P3DUtJi SmdZPWL61027f9od/etF3mox8mDld2vx3LWXI4QiFnZ1JTIFV1C822FmMhl6AwCTmMl0 9kGYwUvQ3yjInT7jg8+hqn3bbrKIDhEJxQNgoq/52r2MlvMy/JvHREPIPbgJ8IqyeuVc affVHVzQnBIFIR/K4QaR8Ew1euq7G7U9b4Ug+FlfhONDrDF0dk7uufAsCog+hHp9VTdr YkcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741618360; x=1742223160; 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=dbqILCM4sqAsqnZWR3n0haWRm4rdBukz3/+QEOiXjzw=; b=pwqX9YhUnN8ADEZ9EV1cnursk1i70Uqwnzi/W5DtCGm7E3MNsl2qEJPG4fhWsJ8GEk /hz4fBKNIqL60ccLgdgh2Rc/mWsLTcf9WQbig1/Jv8Y3QvIZ3JdNHzubOCGkgdRqhMWf pJYBqtj2/kRxgSg/bO3/XkvGdeOFFyxcJQU5AuGKC4PNRscMxnWYS8WtL9wDY1E4s7XV qmyDpz5atx2Ubmm3uzKIqHs8gpgnLU6ixR5yI3PSF8pROBvVUClpDDbfSNpfx6ou+yf9 H8wccUoqzzRkQrAKr7kIi2OH/9WhvlPtq/mt2Ri14tp+nCe1TJSSg2ATKah69l6jaPD1 bpZA== X-Forwarded-Encrypted: i=1; AJvYcCUa8KY9gNdtEwJ3BNOLEgGXy06sQw0TKeQ5XZTYODEED+7p9Jsg3EyRWgGfIiJsBN1+XRGeKgwLuQ==@kvack.org X-Gm-Message-State: AOJu0YySopQjgLeT5wTumxR08omJENqVefz5xayj40VsJ1jH+fTsjBo4 kGcKaCgOK+Ccaxl+FzBEACRnAl177PoriHq+2atez2DOpE5+07Duv+K0EBZ9ivw= X-Gm-Gg: ASbGncuSHelMMY8857My3HUF7G7+cSFvKHzB3q6yycCIF0pnX1ydBzyp8Z4tfx33NG6 FutiSStTxRXA0zzzAGQSjUvwQEPSrX5IG1XFQ4Rdy4PuV5k0nzmKchwbwyLFsiWN0s7JjrplDUP TE/WgZ9VMuUn48vbM4t2sPlO578mLw8jKXxJ/dFgif8Y8cmxKJ9Wi+hJ0dpKQzW4eK61fLKD2d+ OEhGjmm/AeVEXRNlL1z61LoQTvWBw4RWI0n7oQjb60kzdTnNkkhzkEgieh6w4AZuA5eTj6V4/ft IKvQhoeh7u+Mwc0La7vgjCHHwW7gwUHOOPbuPkUU0gY/H2o7k92EiLA= X-Google-Smtp-Source: AGHT+IGingfz3mCoLXCx4AWjWHsD50K0dzh2NK7v+KMvVV2K5wL6QO4M0vSkH0GvDvftQkvXnd4PuQ== X-Received: by 2002:a05:6a00:b4d:b0:730:8a0a:9f09 with SMTP id d2e1a72fcca58-736aaaaca0fmr22178030b3a.18.1741618359953; Mon, 10 Mar 2025 07:52:39 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736d11d4600sm2890275b3a.116.2025.03.10.07.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 07:52:39 -0700 (PDT) From: Deepak Gupta Date: Mon, 10 Mar 2025 07:52:25 -0700 Subject: [PATCH v11 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Message-Id: <20250310-v5_user_cfi_series-v11-3-86b36cbfb910@rivosinc.com> References: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@rivosinc.com> In-Reply-To: <20250310-v5_user_cfi_series-v11-0-86b36cbfb910@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 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, Deepak Gupta X-Mailer: b4 0.14.0 X-Stat-Signature: 3qu3diax8gwuixp68cyez7m3t8boprqx X-Rspam-User: X-Rspamd-Queue-Id: 22F0940011 X-Rspamd-Server: rspam04 X-HE-Tag: 1741618360-280695 X-HE-Meta: U2FsdGVkX19MHRq2srrDVU+TtiDl9oJ1GPNh7FGUrzvxKKMDe2jZUCxGa7uHk8mLNziVBAT2T/ZqWtZIn3CmUQearlMEs6uJm+cd+tPyZvEUgkf5jCN2LUJYKJfAu0YwMwVOBlPCJd6rPtHge2SNe7w8RoztQIsCVGAfTICv/QUNC+fBwAgLY+wyuDkGlZ2BWOECrpV+Y6McfpdPcHb6bk+3OoGpgZ5q8zKN1EB0xY+PBYmynZLGrJKOuP0hf1uddGx7gOuzNkkPaLKtqKQT4SsiKZITRBDZ0YJeoFXy72vf24sKYLuLpFWIO2GF5KCgIxvonPN4F3abPdMw0Sj38jeLuo5G15Z4gZE1qrJ1nvWEnRWw4f+f0Wy+bi7yy+rFlrZYMa9h9g41CnSS3tQVunnjjaFkSLiZs3eY9I4gbP5KC2lgXHRLlx5bsyjJZ/T7oOVfPu6P9rbsDyvPPn8yua7Z0a5YVn1c/IkgJu7sEOnswKw0pvDelVWH1ZV4FZqAKd9CIXmULt9JHHNnZRV6yejdgpAB747JRrz34WY1HFm/aPTInCh4iRP8ucHftfWD1bMwY0dJO+LUPlwTgHFGw7agQp28hWFlB8FWC8kw8N+AaKjEkpn1bJFeHhWMtVKOEARoBQp/rIYBF3kAy8PPhZCkI8rWYe/RB4rnTtcCa/1l31972OViViVT2L859meug79J6N2IdLVWzpha5bN/1th7Id/aoP9u/EC/Ogg1DO+C6cGjEa4IXsZGjIVQDFOIvMQ3SWSQxCVTPVqpki399WzLdIJJKUqT//rc8dy3bST94p1ljdM5OmDXqPg/JFMlIdOGM3B5CXbfzIF7/FspJTjIPIW2TkDOYfuNrYqQgTtIQSvrEATIveXPRzQk+nRR3MQjGm+XqjaIRIzHNCdYeVTQl7SRqK/dI1mrOQ3mcHENKRiI6MZKQdjto+rUdwQLTPCnH4sB9ADnOSJ4AYb eoGO00Er 9yN8vqA4+cd8Tn4NG6QPayPxKioM62b4q3zRLPJA2cc+0K/Utj/KaUBBe/VAdEKz0nC6k0QOR8aUfXgQeQ9sD6/y2vmaSFhvAdh1x/C0adI5HhyklXX8n3I2v70JfB6+Im55nZK5867JbAQLM2aWVxZMSMPo/nrnru/iN+KORC1dOn6txV7mijMHMzUJvsTeE8MxHKrybyZ3PZow1P63ZF5t21CSaf3cMhozD7JokPRdQNzdDLHYgfQ2aZV010//ClM9rwZP0N4cNR3b6ckz12PZu+eP1reXsMloER3JFMwiww9SyJ0HqDvjaXt48VaLIsMWJ0qOEVXFsfEB5d4/8NZK9Yox64GfWICB1f/MPoE/1sCNhlmCHSiSIBW/FR1kquh9UIq9Ptoh6Wh4Sa8ECKoflalyhdW7eWrhBFqNDIhgu8mOHAPSZ82y8I9vsEah9lWezBFgG1TPBiSmjvxtBq/7y0wa0WagSZ6C+l+y42KdH2R5hLq7hdU++Lg== 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. 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 | 13 +++++++++++++ 4 files changed, 29 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..82065cc55822 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -150,6 +150,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_zk_bundled_exts[] = { RISCV_ISA_EXT_ZBKB, RISCV_ISA_EXT_ZBKC, @@ -333,6 +342,10 @@ 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_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),