Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52fb35a authored by He, Qing's avatar He, Qing Committed by Avi Kivity
Browse files

KVM: Bypass irq_pending get/set when using in kernel irqchip 



vcpu->irq_pending is saved in get/set_sreg IOCTL, but when in-kernel
local APIC is used, doing this may occasionally overwrite vcpu->apic to
an invalid value, as in the vm restore path.

Signed-off-by: default avatarQing He <qing.he@intel.com>
parent 6ceb9d79

drivers/kvm/kvm_main.c

+14 −8
Original line number Diff line number Diff line
@@ -2145,6 +2145,10 @@ static int kvm_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu, 
	sregs->efer = vcpu->shadow_efer;

	sregs->apic_base = kvm_get_apic_base(vcpu);



	if (irqchip_in_kernel(vcpu->kvm))

		memset(sregs->interrupt_bitmap, 0,

		       sizeof sregs->interrupt_bitmap);

	else

		memcpy(sregs->interrupt_bitmap, vcpu->irq_pending,

		       sizeof sregs->interrupt_bitmap);
@@ -2200,12 +2204,14 @@ static int kvm_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
	if (mmu_reset_needed)

		kvm_mmu_reset_context(vcpu);



	if (!irqchip_in_kernel(vcpu->kvm)) {

		memcpy(vcpu->irq_pending, sregs->interrupt_bitmap,

		       sizeof vcpu->irq_pending);

		vcpu->irq_summary = 0;

		for (i = 0; i < ARRAY_SIZE(vcpu->irq_pending); ++i)

			if (vcpu->irq_pending[i])

				__set_bit(i, &vcpu->irq_summary);

	}



	set_segment(vcpu, &sregs->cs, VCPU_SREG_CS);

	set_segment(vcpu, &sregs->ds, VCPU_SREG_DS);