From patchwork Wed Nov 22 09:42:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13464410 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 34A54C61D9D for ; Wed, 22 Nov 2023 09:44:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0A886B05AA; Wed, 22 Nov 2023 04:44:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB9F66B05AB; Wed, 22 Nov 2023 04:44:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5C0D6B05AC; Wed, 22 Nov 2023 04:44:55 -0500 (EST) 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 9179C6B05AA for ; Wed, 22 Nov 2023 04:44:55 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6E65940614 for ; Wed, 22 Nov 2023 09:44:55 +0000 (UTC) X-FDA: 81485106150.09.68C9772 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id AF35480017 for ; Wed, 22 Nov 2023 09:44:53 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="p0Z/U7xM"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.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=1700646293; a=rsa-sha256; cv=none; b=jVcac4uDLB/gJmguGUJpqJqu3IB6jo5Ux6jguyyzqFL64Vml+U2a8DidjgXSYbwcG7Bv0W l8AeWpe2RlnROodG+iHZC+mBJv39ZfylSoG7TLEH1A5HJLNnhHr907CDF4MK0I/FWL4QP7 /l4chSV6K8ITLw9FQ1/V7lUYv04Imoo= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="p0Z/U7xM"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.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=1700646293; 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=V005LwtjUfEy1OzahQ56WzeSFrnTdi98gEeViD70LKc=; b=1AvF7/gl2fcB4I3eYIktbBHqPVw/R936nHGrleBGQkqWhbx1AT7QnJuTjygqgpDfBQWNsD JVSEPTbZeQhtxBF0HhHfn+dNA7M13YS+r/CHj2tPUJGbuQFyn9zpzxuulWRji+fj84rWUY pFWIgQ22ji355yP5Gtb4t3Qk4qmF/+I= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E168361CCC; Wed, 22 Nov 2023 09:44:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6165C433CD; Wed, 22 Nov 2023 09:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700646292; bh=HrTZdiDMDN2AL5+FFpvaO5U1EqVinVUtyfSdqXL4wYA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=p0Z/U7xMPKgM32RdtDRReCBHmtw+qLgWMkmr9fAlX9sTPpSTX1kzT1b4Ax8iNZTQ1 SDpqnAv/m3xI6cskZjeIJXtgnHudh+xvZe8lSAZLVs7RjUByzMaLt84cVni6atFfi1 +X3DScY2qReqW23WxMSFy7bEE8mBc2v/XGgaKns+PNuVAPlMnGMDRcv9OEpAI4D/om CpDnm2ALUXUkqaRpqSUp+bCmc6Y3gqo06ZtP0UHlplrxt73e4QcDOclNWVf+LnjHaN QXl+y5Ql95Ai80nNQ7l/b37t+jrxyuqXFBUhUW9i2y6qZpxx91LF6ySTkMQLR3is6Y lXvqWl1Km6fLA== From: Mark Brown Date: Wed, 22 Nov 2023 09:42:26 +0000 Subject: [PATCH v7 16/39] arm64/idreg: Add overrride for GCS MIME-Version: 1.0 Message-Id: <20231122-arm64-gcs-v7-16-201c483bd775@kernel.org> References: <20231122-arm64-gcs-v7-0-201c483bd775@kernel.org> In-Reply-To: <20231122-arm64-gcs-v7-0-201c483bd775@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-0438c X-Developer-Signature: v=1; a=openpgp-sha256; l=1992; i=broonie@kernel.org; h=from:subject:message-id; bh=HrTZdiDMDN2AL5+FFpvaO5U1EqVinVUtyfSdqXL4wYA=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBlXc0CojGZj7s7XLMcN8F+/cIfToo5TSu1/o7Jx iRDev9LKKeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZV3NAgAKCRAk1otyXVSH 0IzPCACBRiVUTa+NHQT8XYai1y7/yLDxXJtjiAwGWCackHesESEtvValhKUigkGVJTRmqHLXptp cfwVGt2mctgc4HJtz8X8e6HP2UNCAeeD3OzagUJnZaDRGgKuFx6WxtnBaxjDKorTWBOhf6WqttU iV+LqXArWC0PbuMC2DgqoQwv6zSNVIeG0//Fhbwj7qd/pve5AUJV5aFS8zHE0FBOSbKfDl5y15z Xn+yX4gbWJIf0xIN4DDjLjwN3Jl0uM2gMo9nMACXRJvrQLhHqw3BjMF7ida4CqfIiVvU/BTHlpI jlGGSl6tFko0XV6J3tsrAJW+uVFoylFuxbpJ/cMFFFqzZs5R X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AF35480017 X-Stat-Signature: rcyhokzwx7i3g6cf6dkfjuj7gukqmzdw X-HE-Tag: 1700646293-900307 X-HE-Meta: U2FsdGVkX1/WmSaTV83J6D/nDgnPB2r9lTiccvyK1JHhxoG6X/uFCd3GGOlUcOMywsLAkdGvBeXoBehBuOzJVuOMduG9KJBYBXm5z4N8cmra9mwOzBFM6WwMj3fFKmB4ddumYoj2ceWj8yELgZYCpjJzhHTyoD9kLdGZNNQEJnqGMATPrQSGwu77e8GNyvZezQmvoDxSULzPx/qmgiHY2PurIoLzTvNIECe+EaqII3ka31S+uPWRLIXZv0x8ArwjgEZkdxgX7audzXOny75c2WZ9oaWP6v8Qiygzt6ImFQ7C85oamou+GQmaR5LvOLn7sHO5H5K0q0f8QXP4Ltrp5hIuspiYB0aatFHyKcq4y6vBCnYXSpGambyKafXhoCaAFz08tHAKgJHj5+y+QGnCcQ8cQwPZlescXUpBpOlVxEKGdHR5LpjOL1oKKRu3zWwBgv3SjkBQIMlucRYUxwzDQUz7zuYzAlqoKkRx6t1w06XaXBgcW/T7HcdH19Qe5I21KRod6sfD/M/nRunDaVXIY9UIFeyzOEsWybwjvAuWs5+Bu7kcV1LbeHoboEc7mYIvq9V/vp3TYtxnDY05KgFQ8e0VfJMY8uFxOs48x02WPrDLCOKQwgZWsmEdxJRnpOXIWnAXDAx7Nqs0jKXvd0u4arPL3BLTOZA9qC9KgloD1fc0lJl44WXtnNb7JSoHokf/rakeGOqHziKZqyoWBaKfBqSRLaANvaiErg1O8eWCCYxCUogGgqkemdQm0MD9A5W/+YRagXSe1JHwVklXUrA97sdjgobSJQP6Gjl70RDNLUu0JYVZf9rFig3Iwc5DCv+y1Y+kZLpzDmgmz48LrbNsUKSU/BSbYN1kkBl9Dmff9t46zNkd/oyaFWuRCiSIZZPoeqJgwstgXI6Uw599dhZvC9UpMis2dg9OR6NJTUm5TZgRCk9MhlGWaA/zW7hFekyuYp/f1NQIUTK/WbR+Yv1 P6zUw/2S ZahF3fSpcJfVnLXnIDMCknBuRJJiMNWa1BJUw/YQrjOmIMDvMNKVQYxazMN8pcxxObnyJPiAkATMiL/elovZpmY2rBSzqB4u8tgtrh9FQxiGgBb0vMNhUXIx2XwVLg/5IpavE4MXqGm0/hd2qdLLf1q9uG+UCiTSLcAxob6Zh1jTrYuBCS/RrqndhSbbAmT07Cw9O14TARwHZ+ZQbNrr/a2SLCiOB/oTjDS7nvj51OvjAGIGOhXr0zY9GtFDRKrENjU4fVW8V3+922EYtuaiA2hYEvoFITvm7dXB2smYSPdkDMasDM7Gl1jZGg9cWlvx9tNEc 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 65731b060e3f..e2282f310ad7 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -418,9 +418,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 3addc09f8746..cc059ba39d58 100644 --- a/arch/arm64/kernel/idreg-override.c +++ b/arch/arm64/kernel/idreg-override.c @@ -99,6 +99,7 @@ static const struct ftr_set_desc pfr1 __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), {} @@ -178,6 +179,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 "