Commit f6f43a53 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-x86-fixes-6.17-rcN' of https://github.com/kvm-x86/linux into HEAD 

KVM x86 fix for 6.17-rcN

Sync the vTPR from the local APIC to the VMCB even when AVIC is active, to fix
a bug where host updates to the vTPR, e.g. via KVM_SET_LAPIC or emulation of a
guest access, effectively get lost and result in interrupt delivery issues in
the guest.
parents 7d862707 d02e4883

arch/x86/kvm/svm/svm.c

+1 −2
Original line number Diff line number Diff line
@@ -4046,8 +4046,7 @@ static inline void sync_lapic_to_cr8(struct kvm_vcpu *vcpu) 
	struct vcpu_svm *svm = to_svm(vcpu);

	u64 cr8;



	if (nested_svm_virtualize_tpr(vcpu) ||

	    kvm_vcpu_apicv_active(vcpu))

	if (nested_svm_virtualize_tpr(vcpu))

		return;



	cr8 = kvm_get_cr8(vcpu);