Commit 5e8b511c authored by Sascha Bischoff's avatar Sascha Bischoff Committed by Oliver Upton
Browse files

KVM: arm64: gic: Check for vGICv3 when clearing TWI 



Explicitly check for the vgic being v3 when disabling TWI. Failure to
check this can result in using the wrong view of the vgic CPU IF union
causing undesirable/unexpected behaviour.

Signed-off-by: default avatarSascha Bischoff <sascha.bischoff@arm.com>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://msgid.link/20260106165154.3321753-1-sascha.bischoff@arm.com


Signed-off-by: default avatarOliver Upton <oupton@kernel.org>
parent f8f9c1f4

arch/arm64/kvm/arm.c

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static bool kvm_vcpu_should_clear_twi(struct kvm_vcpu *vcpu) 
		return kvm_wfi_trap_policy == KVM_WFX_NOTRAP;



	return single_task_running() &&

	       vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 &&

	       (atomic_read(&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count) ||

		vcpu->kvm->arch.vgic.nassgireq);

}