From patchwork Mon Jan 22 20:18:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13526221 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 428E1C47DDC for ; Mon, 22 Jan 2024 20:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r27ZfZXUYOTS0TalerQ6GmNEawu0CUp0cgo00Au38ok=; b=ZAyjXbITyx6iAA FEsbllYI+J9RwXlX9f5CfbmPGNPvPCII+NpkW5quUvZdAEgW0F9NvI9KHoK7GkwpBwYnmYT2NS0S7 BGON6BCjllUIv0ceZO3QQbiFsVq+805+lrBPNKSPF0Zl181A1Rej1p8pLZ+oPoec5skv/Vv7yydVz G2TMPZ12zLhZhT2rqmNy0o1tam8jPSbgsjMEeS9OZX+qZKk0L37vFDtL3pbW1XQ1cjE3tUUT+77jx oV6lJwRlJlBPyzkmtf8dllVxFZFcCXw4cptusZvMFOPxzPZOVpbZD5WzmUBW1wBIsf7xQAmF8NDPn QGn2R/uV/55uO+zi3dWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rS0lK-00Ds4O-0E; Mon, 22 Jan 2024 20:19:18 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rS0l5-00DrrF-1d for linux-arm-kernel@lists.infradead.org; Mon, 22 Jan 2024 20:19:06 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 128D561AB8; Mon, 22 Jan 2024 20:19:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D43CBC433A6; Mon, 22 Jan 2024 20:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705954741; bh=+YmONgMWpFOWKRTDk0MpC9YrGfrX0PQci4i+V0jsS+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UGxnGGAzieA/rMILiJa/Z3xz0JIYEYB2OY4nBcqOsj4nRUYrk7yx/DkqVOGatZbcd XyoZ5NZUV3Twozv2N8IqJumHxrIjM7vhIHdv7bMM4inlX7VSlUsHsF5tGU1F+37+B0 sw5QnfxB9b4HAYy6pvaoEQMfH+Vz/Ec2S814fcnJwqZc+AwOefhLUUERRMOq9uTspq ak71IaSTgPn/Lv9gZjx5aYEDr3kXCzHkYHH96LHrEZWd7jSlzHYaKJeprMxjEm+Us6 sZa+gk92OWjjmPvGtWSDkl3A3glif7by8n7pn7UEYseJfszEgG8nWu3GeUk4Ds+/kA FVncTAxFBEIMQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rS0l2-00DjkQ-0u; Mon, 22 Jan 2024 20:19:00 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Catalin Marinas , Will Deacon , Joey Gouly , Mark Brown Subject: [PATCH 23/25] KVM: arm64: Make AMU sysreg UNDEF if FEAT_AMU is not advertised to the guest Date: Mon, 22 Jan 2024 20:18:50 +0000 Message-Id: <20240122201852.262057-24-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240122201852.262057-1-maz@kernel.org> References: <20240122201852.262057-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, joey.gouly@arm.com, broonie@kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240122_121903_627944_B0EC7BA1 X-CRM114-Status: UNSURE ( 9.61 ) X-CRM114-Notice: Please train this message. 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 No AMU? No AMU! IF we see an AMU-related trap, let's turn it into an UNDEF! Signed-off-by: Marc Zyngier Reviewed-by: Joey Gouly --- arch/arm64/kvm/sys_regs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index bcde43b81755..afe6975fcf5c 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -3994,6 +3994,10 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 | HFGxTR_EL2_nPIR_EL1); + if (!kvm_has_feat(kvm, ID_AA64PFR0_EL1, AMU, IMP)) + kvm->arch.fgu[HAFGRTR_GROUP] |= ~(HAFGRTR_EL2_RES0 | + HAFGRTR_EL2_RES1); + set_bit(KVM_ARCH_FLAG_FGU_INITIALIZED, &kvm->arch.flags); out: mutex_unlock(&kvm->arch.config_lock);