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 B3EC4C5B549 for ; Wed, 4 Jun 2025 17:16:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B3FC8D0031; Wed, 4 Jun 2025 13:16:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 364EB8D0007; Wed, 4 Jun 2025 13:16:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1DE178D0031; Wed, 4 Jun 2025 13:16:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id EA5708D0007 for ; Wed, 4 Jun 2025 13:16:25 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 8870580288 for ; Wed, 4 Jun 2025 17:16:25 +0000 (UTC) X-FDA: 83518371930.14.5782A4B Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf02.hostedemail.com (Postfix) with ESMTP id 87A2780011 for ; Wed, 4 Jun 2025 17:16:23 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="uo/GfAbf"; dmarc=none; spf=pass (imf02.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.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=1749057383; 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=sUGoUtIld05Wk8eIci48mv0pspT1UjRrLoknZHN50uHqkfCNXXUrLSE8UxPVG3FPzXCPUW I89lpVU3gqxIPmp+JwDdVFAU7PNc4R1pnyXoIwMzz4rXWlQE0I1yJKcKWIAPekBeJ/3dkM 5/RS6FnWVjPP9cbA57i8o2coXj5bNj4= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="uo/GfAbf"; dmarc=none; spf=pass (imf02.hostedemail.com: domain of debug@rivosinc.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=debug@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749057383; a=rsa-sha256; cv=none; b=psDpleOwuYfF6JPBsx1fv9eNtSJNPjKizrQVM967i9e0tU0a9Cw7TyZqY0Y7B/XprHhhmh F1VgNgCpiR7MROVg+CrmtnmY03MdFdiJ9uthkhGI9Do2+AJChWl4od1DSpdLPd3FfZeBaW Xi5yKY1FqCWJPY3F5OUdHPg7fgMUMlI= Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-b2f11866376so16644a12.3 for ; Wed, 04 Jun 2025 10:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1749057382; x=1749662182; 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=uo/GfAbfi0O3swgUjtt/MU8n/2lbPjanyd5SKYKT6DO1JmJZQBKhXgY9aXLka4A9ot k+Ewvd2tkHl8EYMy4akefIKxgm8s5C+p4i6og2PTii4FeRJZcxXJnDRFgxSthhqWoLzI 6wqe39qzsW1UzXGO5t/aU28CH0UXRlgg92szbW3ES01oFdSbhFtk0ZARjiNs4rIH8rKJ aWaAot2NFIUQFogUrYqUG5ctwG3hO4JMsAJ8xW54j9tFsiZ1/5che6TjMgxROEhBUdwt djdlKZSrBGEKroXRW1g3RaqWGNMh6zZzRhTJF2ySlf8156gybeRteq6D3FcxCV864hvT EaJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749057382; x=1749662182; 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=qpjBL8H8M5js9uduLL7BPr2qizj9K4tEbAwQL41PdacE3cLDOIp+3HrQCIdKcpPqAb HFUsa/P3JLNL9L4xAw//NrOw701q4JPV8N8RIkOG2h5maFOHs1n/9JZis8aU6CfxYW6H +/VVYx3it8KJ8FQHkE1gARnJcbqvGzBgZ2I48e64HdJYOefH5ALIiGgqpoI1FAcppYN5 siwFoNwmW952lADrtrZbmUF4PJ9gSIEaxBESeDYrFyisWmnqBPLldaRGNy6ZotCRN7Xa /GQMQbCFWqTI+NCeRlFBdy68w8FOsEMLFPn5GKyF79g31gHlqHzkxogflAgh8uy38Jwv 6mhw== X-Forwarded-Encrypted: i=1; AJvYcCXOclZQ/VbcwRiqBuq7FLJdAssePFat5smK3jeHCVMoihd8aaCpylsiVYO2HhsygKFhnwo7AEauOw==@kvack.org X-Gm-Message-State: AOJu0YzvvRMNvKFJBqiAfjHllOCOThk6gXKcyOeVrtjwUKZGhO8OfF5A Z3k65wadsyzfrAiEkhHFkeyRyChPO3IfOf8sPgafgiawemZbqhbPP0jWBPhgCbhtUOc= X-Gm-Gg: ASbGncuesmTUa53RYXhvnyymHKVRDzysUNCkbLZDLpAi3dDy0LZylZLGiCxBNHSt6wR lGM4A9pRQySW3nKj6GhK9S+x9joBJBR1QAQypBICe/IWCEpyZdg49ntp6nPc5EuhGXZJL9VhE3y 7VtqbiTUFJv+1cQxbM9BBUvnQY9zPgRiVNPq46D9fe1oRJ0KueHCnuxAXxqiAy5hloWBa+rlXkt 2hXce+sv4wfFzpTppw0i7mBYSEjDjwvp0nTM/Lza2V6RRcC0S2u0F81zlnie+B0V3rCTJIiDZNI wlASpJpUv9JsSSg74gVj/ZqBWLMedkRT2WAX5fbPEVl4K3VbjXDMk42SyrwObQ== X-Google-Smtp-Source: AGHT+IFlI3du6uAs4xKMSeHrsCAE9HV8F985B1I10na2c+A//L1Bd5F1huM4LJFKUEO9PRurphiymg== X-Received: by 2002:a17:90b:48cc:b0:311:2f5:6b1 with SMTP id 98e67ed59e1d1-3130cd3c193mr4732650a91.22.1749057382230; Wed, 04 Jun 2025 10:16:22 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3124e2e9c9fsm9178972a91.30.2025.06.04.10.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jun 2025 10:16:21 -0700 (PDT) From: Deepak Gupta Date: Wed, 04 Jun 2025 10:15:27 -0700 Subject: [PATCH v17 03/27] riscv: zicfiss / zicfilp enumeration MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250604-v5_user_cfi_series-v17-3-4565c2cf869f@rivosinc.com> References: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@rivosinc.com> In-Reply-To: <20250604-v5_user_cfi_series-v17-0-4565c2cf869f@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: 87A2780011 X-Stat-Signature: fdsmqancp8xygzafyuszxmyy9jtieejr X-Rspam-User: X-HE-Tag: 1749057383-638814 X-HE-Meta: U2FsdGVkX18Hg0x+1qGDmO8j4fbFZ1mcG+OE33I5k+BpABVhStJwshN1B6S6UkT3waipV0IEaOMa094mhyoAfcSJkwl73l3xfWE7PTn2LFCHetiYQAJJRW2XLTsN915Av/aTF89pHTfZFJOhnDB+e3qsxdHTqyg72fZtn22g188DZajT7RpKHpyVCvaPB1whz00ndL+vu5hjhZl0TmwgZcWfZ0Bne9z0VOOItHFtLlms90mrIvoKL7/+pux1oi4Vt9AcNO17VMOUYshoWxOWPLj711BFcYqR6Hu5czHN1ats1XiapPIvOOjeFmDumJia65tS/hu3E29dyz1+oemF55yeBrZXmzrEltyuK3WnNp+gJfRuBplvB+9N+y7yFDLTRvyMcLE2ga41tKZ2FSSygp42zws/cXfmBYoKrJJOhp4e0iEjC6+g8b4GzXGQZ2HzGw7MT0rgWAVlnPNjPmNRG/xXsUQOrt6vNIT30Xf+m2skD/e5uKEwRXhas5tu3J/yyP2bzkKvF62kV+YqdDqsRMOjEa6tHbUxTI0bHL4SUG/b1kdHelytOir4qWSTI2f1ncjjSnyYG4p/HrXyi3j2EhZlDwboiMK8gdk8TD7+YZ5jjdQoVyjI5aYCR0rlf4M3VkGgY2ggkNpohBlOhxn1ak9gjcDEPLZ1VZ6zOUlH4J5I24748/RNLDxk4N495A5hZpqXJzVg+knrhtST6vWYQCUlSx0am1Q3DDfEwXLqAK9WqCn1vOnB6U4Ps+MBK2Lox4vQ9evqsja6hWRi8ICU/Sws51WssVRuMx+/bhJK4SeAagY8ZSr3b27vqLlXUcO8XT5Dqx9ocBx4wyFIqFKyY/hXoVWTiR1nlfTdwTA9XmVftiTTbWe068jDmj5JRIxcmdtQFZwsIUNIq3sgEQN6fxDi2osWz1bAwiIJeJCLMmoWyGmNjAIdhOaeLaHnZqrjAL5sQ1puKEr5ybl/CiB g8AQosCs F0Gc+x7Dndl6VR+u/x8F0LTaEkqbnkmBl4/EvReN6ysTRVKoQfWsoLN0lqG0Z0dDVz7pVBN48pZxLm9XiksR6SbkA60TGgwXxmBWvq9m56aTCN0fYgJcUwbVp74lKQKd6B/LLFD7xjABQBxtVbbJdHeuMuG9kiZU7UVNuJLtG79A1ejWR0oditwwwcIxWcOKl4DvOY7pwVxILEWtgNOL4Q8bMJ9GUhSYLaAKjOXlHAHG2mbl/PyDenQ9MfIvtNZvFEjtFfRGoGcX2udW54hJJa2ZLd4QLkluYAQxKiGiT1N4LpusgjpQnoEmFisbV84nlwxwbiaDJ9M1tNlTZiIWeyrPeX0sE9SPj3WVNhWsFxe/SUB0eQ30Az8eWDkBtp6Vetxvr1wLy/uYZvygntEVZp40eGLCIOOm4z0VHXzSPhgjJHWSq7hiAWaUPxVVvlWoCTaNKK1ZvZFFrQkB2FgeYCMbWZE1fdFjPBVGM98AGVE66rkKkO5pyzZwKqlGyURniZ24zvjnp6a+DbCo= 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