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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4EF4C61DD3 for ; Tue, 1 Sep 2026 21:51:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ntvmp5tAW0Lnf6CadWCmQQjHOUTBR9lOMJLkhDreaUU=; b=L/c4iqq0jHLBaXsdMUfatBEFK3 +TEGA0y8fUQNcQKiApQOV8rX8aLrXLAn0c5Ed3ZlgOo1xlsX61TLlTtxXMCTngLLAaXyvJjhy584D h+1nbb41hyOWglexZDIM+EpP2c7pVcGAhxlLSWu5f2YfTN6pKRqLvwasm5Rx7yOpQ1BX+PqLm3BOt oqDGG4F68Cpk18GFSlCmSwz6pjaD+/uLBvSB3Ayr4dIbI8yHk51f9T8LGmI15XdXpMmP8GnVYmUf6 sPhJLduIWAhQqyaRCXENKlRloj9//OTm4uoQwyS96DkiS13+4sJwiWyA7fdufaYO/40bKZjW7iaW3 Xa+dFIvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x1WNr-0000000DQRo-17CY; Tue, 01 Sep 2026 21:51:11 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x1WNp-0000000DQQ0-34qr for linux-arm-kernel@lists.infradead.org; Tue, 01 Sep 2026 21:51:09 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id 30E2860A5B; Tue, 1 Sep 2026 21:51:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C72931F00A3A; Tue, 1 Sep 2026 21:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788299468; bh=Ntvmp5tAW0Lnf6CadWCmQQjHOUTBR9lOMJLkhDreaUU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=eFMG19SV03NMaVFnpDeSPY1ZW0q60Rl/wv6m5fW5GccSqDsqXGLKo2cVdLqGYjKmX p0PPrUrnmkrdxpzW78Tx2nj3Ee7JvbVekHcEuPZHGqao4szXnvpxgjfaAFU209UrE7 PK/uZ5rmth1UPLXcKdNZgLndOdtKWy6wYC3OAfbg1KSORa2k/LngOEvNrfIRPm8Cgk AOpiItwOxoha4tNdBzIWI+WZ/FsaQ/zq5tf2vENHHkCaiT8MX0raEv/BV/nZLod8b0 D1ngQr5DVsDG6gnGzRJOsy0gGJgQ0Ze0A+/W13sJlFiguCXRrByb3CDnWpUbN/RqB8 6Pw3XWBEY+EHg== From: Mark Brown Date: Tue, 01 Sep 2026 22:47:07 +0100 Subject: [PATCH v20 09/14] KVM: arm64: Allow GCS to be enabled for guests MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260901-arm64-gcs-v20-9-f31750bdfadb@kernel.org> References: <20260901-arm64-gcs-v20-0-f31750bdfadb@kernel.org> In-Reply-To: <20260901-arm64-gcs-v20-0-f31750bdfadb@kernel.org> To: Catalin Marinas , Will Deacon , Marc Zyngier , Joey Gouly , Suzuki K Poulose , Shuah Khan , Oliver Upton , Fuad Tabba Cc: Peter Maydell , Leonardo Bras , Wei-Lin Chang , Yao Yuan , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.17-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1947; i=broonie@kernel.org; h=from:subject:message-id; bh=sVwijteYWmwsPHrOhzgNw/h8bxNw24CK78k3J1PaD0o=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBql0ijTOOgU+g5ib2qdw5i9m5Up1vp0bgOidFbt N7sgbGHYNeJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCapdIowAKCRAk1otyXVSH 0D71B/9cf0Tr9O/jvhvol2aAHSpSGqkbgy5qn1+oWqbQ4Gr2Q8DUJj38IvXWXLZVU8+mD9f0BzI RtT9nnduQBP9zjkO0Xxjf2lFL5sbJ63eu12X6ZfULwyCASUzTxOB4VRzEGLcvtshRdpMuT6+biJ 3m+VMjNbqpucJqLCszqSimSggsuxOQfPGRjG9j1VGfpSH4onTKf/XLJBhSIhv7+UeD7YAm1WwaT LMWdOt2tkZHP1u003Em5G86ogV5SkGYzZgZwwboiYBQYJGxdKle9Jw2XVPL+9Tp1+Y8hJkR7nZi 6UsaFzTADQQoNB+2II6Dyf4v8uTDYWTiy9eotFc+bsA97CDa X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that required functionality for GCS is in place expose ID_AA64PFR1_EL1.GCS, allowing guests to be given the feature. Signed-off-by: Mark Brown --- arch/arm64/kvm/nested.c | 3 +-- arch/arm64/kvm/sys_regs.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 17123f0b6dab..a9dea85b6192 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -1702,11 +1702,10 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val) break; case SYS_ID_AA64PFR1_EL1: - /* Only support BTI, SSBS, CSV2_frac */ + /* Only support GCS, BTI, SSBS, CSV2_frac */ val &= ~(ID_AA64PFR1_EL1_PFAR | ID_AA64PFR1_EL1_MTEX | ID_AA64PFR1_EL1_THE | - ID_AA64PFR1_EL1_GCS | ID_AA64PFR1_EL1_MTE_frac | ID_AA64PFR1_EL1_NMI | ID_AA64PFR1_EL1_SME | diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 1f80c26a9839..fb2c9fd42e24 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -2193,10 +2193,12 @@ static u64 sanitise_id_aa64pfr1_el1(const struct kvm_vcpu *vcpu, u64 val) SYS_FIELD_GET(ID_AA64PFR0_EL1, RAS, pfr0) == ID_AA64PFR0_EL1_RAS_IMP)) val &= ~ID_AA64PFR1_EL1_RAS_frac; + if (!system_supports_gcs()) + val &= ~ID_AA64PFR1_EL1_GCS; + val &= ~ID_AA64PFR1_EL1_SME; val &= ~ID_AA64PFR1_EL1_RNDR_trap; val &= ~ID_AA64PFR1_EL1_NMI; - val &= ~ID_AA64PFR1_EL1_GCS; val &= ~ID_AA64PFR1_EL1_THE; val &= ~ID_AA64PFR1_EL1_MTEX; val &= ~ID_AA64PFR1_EL1_PFAR; @@ -3444,7 +3446,6 @@ static const struct sys_reg_desc sys_reg_descs[] = { ~(ID_AA64PFR1_EL1_PFAR | ID_AA64PFR1_EL1_MTEX | ID_AA64PFR1_EL1_THE | - ID_AA64PFR1_EL1_GCS | ID_AA64PFR1_EL1_MTE_frac | ID_AA64PFR1_EL1_NMI | ID_AA64PFR1_EL1_RNDR_trap | -- 2.47.3