Commit 16abeb60 authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: nv: Load timer before the GIC 



In order for vgic_v3_load_nested to be able to observe which timer
interrupts have the HW bit set for the current context, the timers
must have been loaded in the new mode and the right timer mapped
to their corresponding HW IRQs.

At the moment, we load the GIC first, meaning that timer interrupts
injected to an L2 guest will never have the HW bit set (we see the
old configuration).

Swapping the two loads solves this particular problem.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250225172930.1850838-5-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent b7a252e8

arch/arm64/kvm/arm.c

+5 −1
Original line number Diff line number Diff line
@@ -576,8 +576,12 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
nommu:

	vcpu->cpu = cpu;



	kvm_vgic_load(vcpu);

	/*

	 * The timer must be loaded before the vgic to correctly set up physical

	 * interrupt deactivation in nested state (e.g. timer interrupt).

	 */

	kvm_timer_vcpu_load(vcpu);

	kvm_vgic_load(vcpu);

	kvm_vcpu_load_debug(vcpu);

	if (has_vhe())

		kvm_vcpu_load_vhe(vcpu);