From patchwork Mon Jul 31 13:43:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13334736 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 9A7E7C001DE for ; Mon, 31 Jul 2023 13:52:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39DFF28004E; Mon, 31 Jul 2023 09:52:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 34E11280023; Mon, 31 Jul 2023 09:52:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 216A528004E; Mon, 31 Jul 2023 09:52:20 -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 117E3280023 for ; Mon, 31 Jul 2023 09:52:20 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CB1CF1C9A20 for ; Mon, 31 Jul 2023 13:52:19 +0000 (UTC) X-FDA: 81072046398.27.FF885B6 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf08.hostedemail.com (Postfix) with ESMTP id AD8B916001C for ; Mon, 31 Jul 2023 13:52:17 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qc9Cd3ns; spf=pass (imf08.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=1690811537; a=rsa-sha256; cv=none; b=zRxUE88XwLan29FAh68vdhieZfRvEhkwCg3Ofh+bVwKo3oOCtrg3OAckN1pPDXOrin6de+ DHKtfQ3BM8hzxxCpDV8mtwAuT9tRZFGcTwQfFA4BFmDcFjh/TrEKEK4bZED+ihAJ6Rs/kD 4wqUbpFjRpf4Xm0xwR+pOWzzKOGa+PI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qc9Cd3ns; spf=pass (imf08.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=1690811537; 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=cBzGeOagmqKjhuaJYBJWsgv97GCqd8TKwDh2bth9VlY=; b=BgbbsByEd+EEiDcQiRw21PBlYj78cqG9ebPPxwmGj+I2kQ5WLA6+04ZHCQ76toHgvJUxOr dKWk8R+hOedZ8qvvrkqedXo3RAnxlW+vIo4TStxVAWyWZS+VPsuiDC//22UDCzQw/3eA3c tCztKBbi9Rwd4XHwV7agw+fz14cVCxc= 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 CD1CB61159; Mon, 31 Jul 2023 13:52:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2BDAC433C8; Mon, 31 Jul 2023 13:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690811536; bh=AFWazg68H0m9wjDZ4noTEGRptXvqnY78FqkUfPNC3A0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qc9Cd3nsgAyvcnwoo8kjfvODViUMK/JrpplYrZmumxrpWFJkJgxfoQAAtQmXEy0Lk +BPICxB2b5iJoYLZwa0Jy5i1GxG9YIrojweNPdWyJVzG1jxxxRPdKVcGGNfBZEQN3d wsyQTHgkf2Uli6I54jqcE+RO9BXn+IUy/XBzVw71H52zCnwD+UnFVmUMjzhkXeisKT ndonCSJ6lvOmOBKfDsHnCf8OPCWOfK3Ab38QA5IevbVuoJI+Nd3ztF9g/4q46sXqwz 4ifG4jd0dqb7O5FLA4kXSOlehpBDXmsKLitwge5sUvbAwDZ3wl385xQYSuc/oRzuY9 NQbLtaaDejXyA== From: Mark Brown Date: Mon, 31 Jul 2023 14:43:23 +0100 Subject: [PATCH v3 14/36] arm64/idreg: Add overrride for GCS MIME-Version: 1.0 Message-Id: <20230731-arm64-gcs-v3-14-cddf9f980d98@kernel.org> References: <20230731-arm64-gcs-v3-0-cddf9f980d98@kernel.org> In-Reply-To: <20230731-arm64-gcs-v3-0-cddf9f980d98@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=1796; i=broonie@kernel.org; h=from:subject:message-id; bh=AFWazg68H0m9wjDZ4noTEGRptXvqnY78FqkUfPNC3A0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkx7wfsdqpq88pf21TmYD/kSPpHacilejyJipE9rew 1epzW+eJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZMe8HwAKCRAk1otyXVSH0HDLB/ 4yUwsgP3uSC4+rw/h+6GLVLLbWnwEshdB3p5ype/gL221KLRVejx6eisgNL+pRT0FoOZasEebBFy7V l3F4UOacmzLSyAjRqciWaUncXUx9KC1IpVzU1S28E79KFcLF2vy+7j7EImZ8BKfvXMTxZGsE/GD1Um 9vmoI+8hK1BDY37dFDU4ybU203laJL21E1mO+eha2WzkwBUpZPwvvOADhgRsAhRugj9ZH2/+OVOO9i nKw/U0a4c7zTjo4m/ynqmyH4Q5Kve+hBrUTt7EX1y92BhSlWCUq7CE12LfbYdf5AFCm0sa+xlUQNy9 KrHgEE14UYJyMKjTyCJ53jOgHgF8Xz X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: AD8B916001C X-Stat-Signature: jzb4bk85mdrezsqyjijpeg6s1ht6e4tp X-Rspam-User: X-HE-Tag: 1690811537-269445 X-HE-Meta: U2FsdGVkX1/kzKmvoQl4HSKuj67oC3LUWK0U0i8neym9+aDTNMghc9MOPPzfTK1YLJgGtsEbAZb0WTiPZC/Xu9ASvjisf5l0gKyOG3Y1aOpGaQrLMO+03iwS5knHVo1cb421WJlYvFV/w4DEHtbQ0YaDM2zGyX8CaZ04yinKBi/3K7kIKTwD9V9MhdbFVWqW+aIA06zOuBzqD6vtNt5abN7x3gvWLpKFbOLk2vv/U3Q6HLZHuZYC3XrMQ6rPKU8GIBUYG3h/VLME23OsjvP+vzmrlOyamhKfQHLi1j3mbbuwCXSKN5n9XXSck4znHjzD9KcXWmh52a8WN08x88lbXU0mQmss2BoSTjAqdtKN5xVoDZuKj31fY7qmzIhjWp9TyaHMZB0gJl36V8oM3nBBZL5Albn9JUHBXKRPJ2WLtFc06f2WabC934fZZpXIT52lU65JfqNzM3h245vmv/PD60s2ykwVLSOtXTdOUM+RJVTfVjQ1Dm+gWFU3ljSpBf5TQMzmmtVrJp09VW+kmdwO7GsWJw6BL4917Y57tqassSbgm136mn5Tlx06Owxj95o8nwVg2OLemjkH7TcOh7IFENwJBvZ8RbMobWGs9xT4j/ty0oyIQvbBUUxsia6cVPze0o0BI+OBSbQsEUPBEqEl/fZe2MlQNWygDfYp2QqH2IDFB6FiYa94qdJadgDaDX7H1w3CWvVmIoEqgFJgyHskkLf63XIAz43pdrH4oNvuW0H45FWFIpbCwBNoxHzM2LlOX8+AN+b8wIolcRzCiqGdCIhdK+vWzzFZh4NTFIzDEmI2qp+FjjT3vwkHTO+m36RTCPKseWAA1jdIgwa6y+q/GEbzp+2Z9CysWxz81W8Xg2i1bfIMbI9g7BxjYQyeileAOWm5Q2K+2jaR/G1Vmr0hccCQjRFkHbIlJieU33G1UZpp2lNESwAvo8IBra63Hl2qvSqUfxCikahTpvWqLZG 0QGUWkih +x3kZos8qXmZu6q7HhNbY+NGD3yEhvrv1IT1UghlJxLhlZGoSdhQx1ceeouQabeLM9/qmu7vo/B5kt+cIBRXOAk7Uq4zpfpeq8KvfyiH5Ku/mMWQSCkC1ghmfVjRi/1m/QSadeDKXxHqdYtp9m7TSvtFcuylJCvI0vRS4fnM0/XgTTrF0IbyY/pJV6m+YMA/YrKd2sBJGZmZg3t0ABrwIU3sQtRLqdMKDubppENm5QUxjxOrDCJYbcDp6AjjVtEERFjtpPz7dYoKVMT77T2ewa1UMfZu7yfkcSHBeXXVmpOmEpal+aAT/MDzfl5D2WSnr8+i+bk5OjDE36TBODboOTJfIW4GRAbWxCtQAduqY6gTLDZg3CJ0QqRQnxO/wHSc8h+R9dBETbCBaMf49+FnFBWWL+WMTULOvS09TveMqL89zK/w= 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: 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 | 3 +++ arch/arm64/kernel/idreg-override.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a1457995fd41..86662eed3003 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -418,6 +418,9 @@ arm64.nobti [ARM64] Unconditionally disable Branch Target Identification support + arm64.nogcs [ARM64] Unconditionally disable Guarded Control Stack + support + arm64.nopauth [ARM64] Unconditionally disable Pointer Authentication support diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c index 2fe2491b692c..49269a5cff10 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 "