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 2E7ABCF9C7D for ; Thu, 20 Nov 2025 17:26:20 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Ks6cPm5dV/LibIRHFmIzJEseC9A2vig9c94m46a200o=; b=0gZ7+Y7XpjIXyg3xHoXRIZwT6B ymLn3jZH/mZ7CPA0er0pMie4JKLm+OekIIJgfklAdilwx53YzgRq3ZKIsI3ZdFByfZQIAGvfaja0n fKc+lGVG8U5XBpxNsbBUexjOwjn0FXyT7Exu6MpiYnMacl2vSBr1RRM+J0YOP+LGeG5Y19l0RI5lg MFapLnfXdhBZ64PCBHlKzrvUYKda8Dl3uc2rRhJWMC11TQATdCjIQP64/qvpzVcmey4tVQoMrhhn0 PbCdAUlCxRT0ej1Ffi7fOjLC+rWYiXzX/7WAwL1Hwan+Hmml7yrbWYx+hLtv/7HBCGB94cAAo6Avi 49FWTOyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vM8QA-000000075rB-37rH; Thu, 20 Nov 2025 17:26:14 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vM8Pv-000000075ZQ-2P4X for linux-arm-kernel@lists.infradead.org; Thu, 20 Nov 2025 17:26:01 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 776BF44221; Thu, 20 Nov 2025 17:25:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5751FC4CEF1; Thu, 20 Nov 2025 17:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763659559; bh=1no91c3xaDd316LugGksTfsPN/xmo39aJ5Oq84Jki54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tBJ/L1nKkInyngz35EAztDHku0prGJOCA4mPp4v203L9Fu4EfbmcMcqYF+M718XtY otC715E4JoMgHSZ9cY/6eM28AzccS9kx20ifC/texdtpPXq2lfG2Ea96xRTtr+yt6d Zob1UJ1c/0unJZXcIT8figMDdg0O/Pl51BoZ4bGUaH+nGwVARDOoKYlMFwurqlsUjd /ENFzKru7mJvPU0MAsEkq13TLaiw3WuJTgJw0V8fmZPMOaCtdQJECXpU2PNtJyKpXo 6Wto8Plc7OkrFTEXMDdd9JrbtYC/3KxBXIphNpKh8pGq6vYeXdwOboIg7uXiXSJtm3 6Tc3JMq1HvNww== 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.98.2) (envelope-from ) id 1vM8Pt-00000006y6g-1zBE; Thu, 20 Nov 2025 17:25:57 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Christoffer Dall , Fuad Tabba , Mark Brown Subject: [PATCH v4 15/49] KVM: arm64: GICv2: Preserve EOIcount on exit Date: Thu, 20 Nov 2025 17:25:05 +0000 Message-ID: <20251120172540.2267180-16-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120172540.2267180-1-maz@kernel.org> References: <20251120172540.2267180-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, christoffer.dall@arm.com, tabba@google.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-20251120_092559_627944_25756020 X-CRM114-Status: GOOD ( 10.15 ) 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 EOIcount is how the virtual CPU interface signals that the guest is deactivating interrupts outside of the LRs when EOImode==0. We therefore need to preserve that information so that we can find out what actually needs deactivating, just like we already do on GICv3. Tested-by: Fuad Tabba Signed-off-by: Marc Zyngier --- arch/arm64/kvm/vgic/vgic-v2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kvm/vgic/vgic-v2.c b/arch/arm64/kvm/vgic/vgic-v2.c index 74efacba38d42..5cfbe58983428 100644 --- a/arch/arm64/kvm/vgic/vgic-v2.c +++ b/arch/arm64/kvm/vgic/vgic-v2.c @@ -437,6 +437,12 @@ void vgic_v2_save_state(struct kvm_vcpu *vcpu) return; if (used_lrs) { + if (vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr & GICH_HCR_LRENPIE) { + u32 val = readl_relaxed(base + GICH_HCR); + + vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr &= ~GICH_HCR_EOICOUNT; + vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr |= val & GICH_HCR_EOICOUNT; + } save_lrs(vcpu, base); writel_relaxed(0, base + GICH_HCR); } -- 2.47.3