From patchwork Wed Feb 14 13:18:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13556532 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 E05C4C48BC1 for ; Wed, 14 Feb 2024 13:20:35 +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=gHvIpgEDTqD/YvcMlIw1uygH1BxywyJr2Iy/a/Iezec=; b=w2xpAxczJCI56j PfCv+oyrZ32Zq0HbYfT4Zcq3yjqnTyjCLg1FvVr7aoe810+IEsRP14BUbkCWFv8kF+QFXK6k+d+Dh IBUSyNh9im2FhZiB6TW1LNxf4ZL+LEDS/iZtHrLoCmko7q4igZ7ME2YN45j3hWaxjIBgL5llFtDcK RBlNamgKWzPz6mJs8CJRHcLECErpC4QMgzo7SfCHOiESAIzhetJdqPb1bje+1t8LpNaLZGBWQnrIR vdGgGIRvXiWYjeyDoBDHLGaeDaJGXmylNnl8BC685ozNpCXTWbp+hgltQk8iP4DRaEw5/lMq59KMi U+GpCZBrNTqbLIYCElRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raFBW-0000000CzEo-2CcW; Wed, 14 Feb 2024 13:20:22 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raF9r-0000000Cxl9-3egy for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 13:18:45 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 19B7BCE2219; Wed, 14 Feb 2024 13:18:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58157C433C7; Wed, 14 Feb 2024 13:18:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707916717; bh=dIJkF1mYYrrWiIgVuWE1ahoSVnnmnY+7OH6lcrJJCb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o6jAYNc03KQx5iRwjo/wQ9iEgiHkyK3IkKifSWlvzaZEar7gPsgAsk2tASbXwmRyz sBPMhc8WCBM60GdWK5nedOyN/vBDKL5d7zGD2kFfmt6NltVN9myeRyvi/6vm0d+aOs CTrP3AhZFAGGHPDA9CfLgbXs6EmqRvRdtQ4nQJn3EQ/F+ZR7TRoFRXYwpqraGFwJSE r5yz/zRtpcpc/+TNfCNxCHGKFGzVFHSdQxw3UD42m5yBoiVz5bkVXmXAES4TZuPQRG NJ2xn0uiwFMcyXpOaJaEueJg0ALSOBb6OLYrBrBMyotnIQ2y9WHssLyT56JOmM9X/l OBlNhGllt9yrw== 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 1raF9n-00394l-EA; Wed, 14 Feb 2024 13:18:35 +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 v4 23/26] KVM: arm64: Make AMU sysreg UNDEF if FEAT_AMU is not advertised to the guest Date: Wed, 14 Feb 2024 13:18:24 +0000 Message-Id: <20240214131827.2856277-24-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240214131827.2856277-1-maz@kernel.org> References: <20240214131827.2856277-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-20240214_051840_390968_BECEA437 X-CRM114-Status: UNSURE ( 9.55 ) 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! Reviewed-by: Joey Gouly Signed-off-by: Marc Zyngier --- 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 da9db99c77e7..38ed47bd29db 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -3998,6 +3998,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);