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 791F7C001DE for ; Sun, 16 Jul 2023 21:53:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 123B86B0082; Sun, 16 Jul 2023 17:53:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0ADA46B0083; Sun, 16 Jul 2023 17:53:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E68D36B0085; Sun, 16 Jul 2023 17:53:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D618A6B0082 for ; Sun, 16 Jul 2023 17:53:48 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AEC591C84D9 for ; Sun, 16 Jul 2023 21:53:48 +0000 (UTC) X-FDA: 81018827736.07.3FE1BFF Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf22.hostedemail.com (Postfix) with ESMTP id CBBF6C0007 for ; Sun, 16 Jul 2023 21:53:46 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=B3WvwLPa; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689544426; a=rsa-sha256; cv=none; b=27OS3LwTKUumBQ91SKSCuzZGACiDcMzwItEbn8uBjXLIayl3e+pyyG7SnoElx/cVhLcuCR DYOwRS1pzpqTHA1Mw2bWFYmfMxs7e9iLg7YoUDqFnKeWqkATnvSDBDNDRnlLd1e7HCTYKe +598zOMYRfOGtGcbN4sBWl84em4W3dQ= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=B3WvwLPa; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf22.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689544426; 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=EXXsHxINrrFfFlCoyZXRZf7ruyCOroLGFsUcAXKHD/8=; b=PHLfiW8s++g2zsLGuntTwVexKDJW+h9LXIlRAi4wqgCpS94UDmsr6CHc51t1Enli2n30xP MYHiGI++h9U7f8oYp4kPnzN3rvPwYGoqqh4eAPJNVYRaH6zP0xt3+9Q88XH/gevTYgwBjz PhATQDxg2QLQVgu9sOEtrun9dv8XVdo= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1B67960EC3; Sun, 16 Jul 2023 21:53:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9FC2C433CD; Sun, 16 Jul 2023 21:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689544425; bh=5itbN5XsI23hSHpvwvYCaA48pJH6cAkdAvMEghq3bJY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=B3WvwLPa0kPZ05606e24d+wKXy8XvpvoWS8YyXrjOnIukFSSQjhJyUhJjQ5PzlGRO 4fopiqdU0YF7x5/huJrF7KQ1A3IiNvr910mVOS+lL0aHGqvThP7j3SBISVrQihTTVN KEK6mooqm4aeC+0i9FAeSvNEzSX6rjL3UmKdWHOUkmvJYeBnz5mEBlDTvMnwRnj+bT f1pEcJrT7JyJS7kWKg3ntcxzSmPf160RwTF7Oe8QMN9pjhEuAmQMG89D/9zH8fjwgd 7YM/JEc3IOzMz8gZQmhtML7z2GKqPNIx+KgdLFhahrmLs+wlctaioJTYMx0LrobbP7 6FKUm+ZYqoDSA== From: Mark Brown Date: Sun, 16 Jul 2023 22:51:05 +0100 Subject: [PATCH 09/35] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230716-arm64-gcs-v1-9-bf567f93bba6@kernel.org> References: <20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org> In-Reply-To: <20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org> To: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Kees Cook , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy Cc: "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=3031; i=broonie@kernel.org; h=from:subject:message-id; bh=5itbN5XsI23hSHpvwvYCaA48pJH6cAkdAvMEghq3bJY=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktGaWtHOw3enM4B5g54amxlUgz0T6xDyKMI+X9aWP sDgDapSJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLRmlgAKCRAk1otyXVSH0DjsB/ 0ftgZjkmfkC59iaeyPxrKWG/EPzbWppuZtL8wn2nYjEI3bKdPsmO0+WXETjIu9YHQORgfIW30ICk9U HmPWiGbezKYCwJ/zM3zsqbeXD87zxToeeKUH4htD7F9lMAbpaK9YOLJ596ay8x5+rjIlXdxvxnSv+V WBhYXp4H998g2hwxyzNly3XnI0XFqdKO4B1FhThymySJjhLOLi+08NAoJe+zsNJD4tHL+IF/J2EoHB WL4/ADcAuOeBMtWPKBRFOodh5DaZ9bZu1dUrVcFM1LJIJLtiPEyxaL9oa1AN7vV4WoDQod9H2+4gOB /CLOY7fL0loYFvUKiTy6SeyWF+d9AN X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: CBBF6C0007 X-Stat-Signature: 8s61rfwork9fdfw7r1557i4j4kgr5npa X-HE-Tag: 1689544426-652017 X-HE-Meta: U2FsdGVkX19t65pbcfmsspBJa12UyZIxznqZweGMX3cv2GtLp8KIjS3hsqp3Wz2wbguYyiHY2n1j92fUPDiEKGthYZ1cU2kUBYQJRJVhfXeNglRCWwbI1fE9trHyORJ7jnfL48sqbVClgr+fD1E2fcUGXvQjNpoAz/BR4NUiYm1MiJWYtClEsfYcN/vjFDtgXymnIeh4IlNB0c+HiBEjWKPwvaEYAJXOgG5op+caazGy6Sd7ooHCuEtgRkwSYOwvvLvSIpxs89dBG+U8d5qxeOiV8dFRm3rF2O6CbYLckbAWa+Z7CwqC9kQVeO/aHEz8GGuNRbsN94XwiXsDF+5zSZy/+/6r6iPTw9DusN4qPYmU3ARTRCgsrBlH3yWqqZPuZ9MWZTYK5kXVban2KVAnRRxPfntSr5vOMQ/8jWNNGzNiBQrukeVeMGeqAdE6s3qKDjcugD1jLLYWwN5mr9lvKmz5zt9BNp6e5i2RK8hTIl5Flbdxr1GHyAgJKeS7JvEL3U2uY1M80kamddf6a0Dy0uywn7T1WuDP52RlNJnbHZHiEKxtU8TgqL/+WPVgsmNzYyRr04c2EvmeDKcBc6VYpJN3160odaPfENqfKTQrcE78Gj6vzIFl0p8BCsBLLOuvCsH3VMhu+Qe+beKZymeJARuhHvL8aQrV1wCtKMKek8oy7RFZi2RM5nukb0cyq1b+f1yheEXYps1ZmGe8dy8gLE43WOhUWXFbS8V5s+VvAKqPNR+8QeRDz+286CohtaW7BUYllJMmqE4XgMT61rozInDTcmeXqMefy8SbxU9Oyl0Ht4Sb4MoX7PsfxgrxmwF/5G851p6NI5/QNLhjebe9p0Hc8PxuJRoCAgiQqtHFTv1mwt6u8XDmA8mI915lc1N3DrqSy1g5BjECYFOlUq7Obh/Vuxn4C0olTuLguq7IFkV/DfJV+PdH6ZFnWNpRu5uh4cjHCVmzO9RwmY9Nabw VQTQYS2t 2BrdqCqzix42CLaifkCuaJ6IpD5dkfSmL/QOGaf2dUHbyfIPGzCbTQLv2uFso/7rc2k4pSlPlJ0Ra8q6rUGrf7wHIX420bjXoOeHQ82srVy4xFoWHvl91YMnhLH8uRQ/AamJ9JqPoLYCdanIeq7hx0lWc/bQlWfIPRqAmi2cyi57TkM07zkDxL1iseJNEX0Oqml4bk0Jibb2bfRPviDOUGkV0k19JPeCyo+NYQjCZEQjO/80tokLDME8rigHbo6/R+f53NiqmFkKdjHqJFmZ6AWDtHJf8PetJksBr7Ql948BS7ykAoSxjwgfNcbLXNrBZq+G4BgAERLdN1z93lJaG+m2TDxulKNssH7Bra+QfEcYYMVYwXs7CBupnWQ7NUYmfcVavGOiMkOJKNltOf+B0zXECGjwC2yRORogUsp/nCyF7PHE= 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: Add a cpufeature for GCS, allowing other code to conditionally support it at runtime. Signed-off-by: Mark Brown --- arch/arm64/include/asm/cpufeature.h | 6 ++++++ arch/arm64/kernel/cpufeature.c | 20 ++++++++++++++++++++ arch/arm64/tools/cpucaps | 1 + 3 files changed, 27 insertions(+) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 96e50227f940..189783142a96 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -831,6 +831,12 @@ static inline bool system_supports_tlb_range(void) cpus_have_const_cap(ARM64_HAS_TLB_RANGE); } +static inline bool system_supports_gcs(void) +{ + return IS_ENABLED(CONFIG_ARM64_GCS) && + cpus_have_const_cap(ARM64_HAS_GCS); +} + int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt); bool try_emulate_mrs(struct pt_regs *regs, u32 isn); diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index f9d456fe132d..92e730027d84 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -254,6 +254,8 @@ static const struct arm64_ftr_bits ftr_id_aa64pfr0[] = { }; static const struct arm64_ftr_bits ftr_id_aa64pfr1[] = { + ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_GCS), + FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_GCS_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_SME), FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_SME_SHIFT, 4, 0), ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64PFR1_EL1_MPAM_frac_SHIFT, 4, 0), @@ -2219,6 +2221,12 @@ static void cpu_enable_mops(const struct arm64_cpu_capabilities *__unused) sysreg_clear_set(sctlr_el1, 0, SCTLR_EL1_MSCEn); } +static void cpu_enable_gcs(const struct arm64_cpu_capabilities *__unused) +{ + /* GCS is not currently used at EL1 */ + write_sysreg_s(0, SYS_GCSCR_EL1); +} + /* Internal helper functions to match cpu capability type */ static bool cpucap_late_cpu_optional(const struct arm64_cpu_capabilities *cap) @@ -2715,6 +2723,18 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .min_field_value = ID_AA64MMFR2_EL1_EVT_IMP, .matches = has_cpuid_feature, }, + { + .desc = "Guarded Control Stack (GCS)", + .capability = ARM64_HAS_GCS, + .type = ARM64_CPUCAP_SYSTEM_FEATURE, + .sys_reg = SYS_ID_AA64PFR1_EL1, + .sign = FTR_UNSIGNED, + .field_pos = ID_AA64PFR1_EL1_GCS_SHIFT, + .field_width = 4, + .min_field_value = ID_AA64PFR1_EL1_GCS_IMP, + .matches = has_cpuid_feature, + .cpu_enable = cpu_enable_gcs, + }, {}, }; diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index c80ed4f3cbce..ab582f592131 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -26,6 +26,7 @@ HAS_ECV HAS_ECV_CNTPOFF HAS_EPAN HAS_EVT +HAS_GCS HAS_GENERIC_AUTH HAS_GENERIC_AUTH_ARCH_QARMA3 HAS_GENERIC_AUTH_ARCH_QARMA5 -- 2.30.2