From patchwork Sat Feb 3 12:25:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13544140 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 60043C4828D for ; Sat, 3 Feb 2024 12:31:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBFBC6B009E; Sat, 3 Feb 2024 07:31:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E48B26B009F; Sat, 3 Feb 2024 07:31:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D10326B00A0; Sat, 3 Feb 2024 07:31:25 -0500 (EST) 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 BFA026B009E for ; Sat, 3 Feb 2024 07:31:25 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 8B2771608EF for ; Sat, 3 Feb 2024 12:31:25 +0000 (UTC) X-FDA: 81750428130.06.9824D68 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id BAFAA140004 for ; Sat, 3 Feb 2024 12:31:23 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LBzqHFbZ; spf=pass (imf09.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706963483; a=rsa-sha256; cv=none; b=eTJ/o+TpX3pPC8KqfuR7Z5NeFPM++hG1jB78K3t5leFT/bQRtAMGwxF7UrHEqgERMoPK+M XjWjEitaJAiMVf/5fEBguuCwjjgE/WYyrEZJgXaaXz9P38K/bkp3tloQgr/sldgnbSoTH3 yrmHj6tnc/O0iFD7QN8V+OhTupE0fEs= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LBzqHFbZ; spf=pass (imf09.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706963483; 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=CScPA82aFIDwFh9o7AGcvX4EucuIc1cZxp6XfwNf+mI=; b=SQa2UJOYfsJrGGMlJxPel5wBRsww75M8ccas8xcJzIlYFgj6tF+vQsvQVXSN49+BPrT1hT dlQ6kd/+5Ndb1SHrXq4meUQUSvodpfg0CA5v7Q0pSn8pM/HiYsas8a3o+fXY8ftBaLbo7f ZybiHouvDoByKy7xik5B4Xc9wIH2Vkk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id DC82D60959; Sat, 3 Feb 2024 12:31:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76763C43390; Sat, 3 Feb 2024 12:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706963482; bh=SOryHjVIlgZ1JzHo1eglrB3GwKsbU4uOkVzAaVwK36o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LBzqHFbZSf4IojU2mYT5PdaKo3RqZ98lYCkCpHUmMGBQDlnrFqzgAhvm4yy4Osh/Z 2w/dLtyyR32j82cfU949TKIjVFY1mh3yO/UlyinHvXR9RRq/Dh/Yu+XcdUm6xEyULV nllxHfO8Qun8oyPC60Q9rsJxl3U2/bYfqvpxHw6BCY8xTnFq4xbK5LAwuvogYh4yGk au6CEmtQnhy/hpMlH6HjeylGql3e8pc9Ykdofk51Qi4ErIfq34VjGKV2TS270WI7d8 seMs+Q+/7N8R3iBTtgfjWVQqWMUhe3lRcMt3vbptXdF8k2l2aLntzUhJZbp7P1SYna vu3XsnNmYM4cw== From: Mark Brown Date: Sat, 03 Feb 2024 12:25:41 +0000 Subject: [PATCH v8 15/38] arm64/idreg: Add overrride for GCS MIME-Version: 1.0 Message-Id: <20240203-arm64-gcs-v8-15-c9fec77673ef@kernel.org> References: <20240203-arm64-gcs-v8-0-c9fec77673ef@kernel.org> In-Reply-To: <20240203-arm64-gcs-v8-0-c9fec77673ef@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 , Florian Weimer , Christian Brauner , Thiago Jung Bauermann , 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-a684c X-Developer-Signature: v=1; a=openpgp-sha256; l=2001; i=broonie@kernel.org; h=from:subject:message-id; bh=SOryHjVIlgZ1JzHo1eglrB3GwKsbU4uOkVzAaVwK36o=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlvjDclBuniik/q4u/ervUzd+okMuWp5AjhSh39Lb9 9Xsh3cmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZb4w3AAKCRAk1otyXVSH0F5OB/ 4uqaKGanf69ot/yRkqmGZUZo+A1IPA+Hp6Hzc0E9LVUH+wkMK3HYompmNM4Gv59SoAyj0VHtXefAxY l2iQ/eNIjwYSbUBBMqUWCm95kwlHsnTjYGNRmOLBda027Hz3zGNo3cmmISaIWI+GCt4oCRUEX/0E/n TXPNIEy5QwDu+ZJxJ/22TMNVaWHl5P+fzxzp/BA00Gd3gWgLa2KlkNOihJ2gRLwsQMybU/O17hTzqL r0eLU4D++pmUwwqO+75ravav8mrgjy5ZQlEPZtpl7ym5vzIdSFxOOq+NlrU5H0uNRv95hz4w7R4hDP 3zt3co1Euu5EtzjSu+2Ham+nO8Av6o X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: BAFAA140004 X-Stat-Signature: qdbrkxfmg87s1arb1p7zkxjjdoh3qr7w X-Rspam-User: X-HE-Tag: 1706963483-981329 X-HE-Meta: U2FsdGVkX1/ZkSqUDbDogubngF4uEn3UYALAHO99GZ0EVkqwlB+0fRiiKRquxuSNAH1HtzdbzXC3v9sLWtQmLFj04FTySk9p7FkGH1pBl9MgGngfbi/atrB2C5kH22bsoeaq+4egydxJJkaGsF4KzldXGvKC96QVybgSA8f7vyjMt6PSzhbut0MS9pKqV6vYQdV7PIOdmxwXFz6yeEmhtG7r1OJ3UblSY9CHAWjNpzeVTFiHqffK9CaJ/1Dvup8hlst7VOyBuk9Lnr6lYBLGbHwqoU7ICZHe2nnAqSj5v+iqzDMzaZbBsyTRGOF/751sKBmE+o23pZAXSRle8TOJEfynOnQz9J4COwTAKgM9bExiIPRs7zGrzgY1+GM9MhcqmBS0dYX4e7MkZejhdeVWcP7YM2Lj9Hdz/upUE3D98knnKmJx5mrCfnWWMva+OGQbqUwRLlOEgR5U6XLgOjHY2Ah98MEQOizE8HKQ1dcoh3L3p3iA/0dNC+jZelFQZvu3raEkQZl45XhuFGrQbJvT+dQSIWsH1wgJ5zaoOrnJokCi3eYwutCUZGDWAO2fB/zHcnSnu9+wKR/RBDkgIqfrb5apAVBWw69LHxihYG586rKhFnb1gOrA9CxZaZMU4RZI9pbkAMacmYIndcxLPMQZgBKu/Ukz6bNVvCPyOQYaw9WQOUOeBGb+Lnq7p0PF0Ci+bk1+0U5pUEzKzwVjROfS+0bxmCAH2DTTZDNFpQR0HtJ0j3ChBy3ZMJzj3Rjn4dBOANuXSMwKZrEov1KTk3z149X1AE+rBoOyYLZAkaJWmtPMpTd6XHiCLUsd1XHurNLC3CuguD20X5BhXAARK9BUM+2X8T3J2YJqr5dC55FjWk5P5kPsDcBtz47Tgk5MCON5+kZ97Db0XDLC+ILk5Eqzh1Kc69FXrbiZYsbmJDnOhnBkCf6l6YOBhMg21v3TuO1oLjNAEh6RNsIhqbz9KL6 HTkwA+f8 o49ggp8Sc6dHPoWc2JjGa9+HQCW01sPJopM+YYBpenKaCBpPgWwxf1d1JGrO/eQdhlkCc9UyrhJlTfD74ak1lvXpPuZQ6GEhEnSgftLMOvCkKAO9n9gNAil/YLBFm+45kbjRKW0u8qZcruOv6Vti9/2zvoxJ9C5LigO0q+jlzF/B2bKjzKGNrndLHG57wJNZJskrgmlqbraRs51uTvLF7vvz/zIbbFD69PtKSNk9vaKQ1cbjvaz8wi8RFtU1V6IuPj7RXH422HdEa66AuZ7pGOJAFZXraWmMiYJXaunax6lfaFLpUecWGSEOh1+/jzY7t4mkB 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: Hook up an override for GCS, allowing it to be disabled from the command line by specifying arm64.nogcs in case there are problems. Signed-off-by: Mark Brown --- Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ arch/arm64/kernel/idreg-override.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 31b3a25680d0..e86160251d23 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -429,9 +429,15 @@ arm64.nobti [ARM64] Unconditionally disable Branch Target Identification support + arm64.nogcs [ARM64] Unconditionally disable Guarded Control Stack + support + arm64.nomops [ARM64] Unconditionally disable Memory Copy and Memory Set instructions support + arm64.nopauth [ARM64] Unconditionally disable Pointer Authentication + support + arm64.nomte [ARM64] Unconditionally disable Memory Tagging Extension support diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index e30fd9e32ef3..00bcdad53ba9 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -110,6 +110,7 @@ static const struct ftr_set_desc pfr1 __prel64_initconst = { .override = &id_aa64pfr1_override, .fields = { FIELD("bt", ID_AA64PFR1_EL1_BT_SHIFT, NULL ), + FIELD("gcs", ID_AA64PFR1_EL1_GCS_SHIFT, NULL), FIELD("mte", ID_AA64PFR1_EL1_MTE_SHIFT, NULL), FIELD("sme", ID_AA64PFR1_EL1_SME_SHIFT, pfr1_sme_filter), {} @@ -190,6 +191,7 @@ static const struct { { "arm64.nosve", "id_aa64pfr0.sve=0" }, { "arm64.nosme", "id_aa64pfr1.sme=0" }, { "arm64.nobti", "id_aa64pfr1.bt=0" }, + { "arm64.nogcs", "id_aa64pfr1.gcs=0" }, { "arm64.nopauth", "id_aa64isar1.gpi=0 id_aa64isar1.gpa=0 " "id_aa64isar1.api=0 id_aa64isar1.apa=0 "