Commit 0d33cd0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Marcelo Tosatti:
 "Fix for higher-order page allocation failures, fix Xen-on-KVM with
  x2apic, L1 crash with unrestricted guest mode (nested VMX)"

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: avoid page allocation failure in kvm_set_memory_region()
  KVM: x86: call irq notifiers with directed EOI
  KVM: nVMX: mask unrestricted_guest if disabled on L0
parents 1401b7c3 74496134

arch/x86/kvm/ioapic.c

+3 −1
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, 
			struct kvm_ioapic *ioapic, int vector, int trigger_mode)

{

	int i;

	struct kvm_lapic *apic = vcpu->arch.apic;



	for (i = 0; i < IOAPIC_NUM_PINS; i++) {

		union kvm_ioapic_redirect_entry *ent = &ioapic->redirtbl[i];
@@ -443,7 +444,8 @@ static void __kvm_ioapic_update_eoi(struct kvm_vcpu *vcpu, 
		kvm_notify_acked_irq(ioapic->kvm, KVM_IRQCHIP_IOAPIC, i);

		spin_lock(&ioapic->lock);



		if (trigger_mode != IOAPIC_LEVEL_TRIG)

		if (trigger_mode != IOAPIC_LEVEL_TRIG ||

		    kvm_apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI)

			continue;



		ASSERT(ent->fields.trig_mode == IOAPIC_LEVEL_TRIG);

arch/x86/kvm/lapic.c

+1 −2
Original line number Diff line number Diff line
@@ -833,8 +833,7 @@ int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2) 


static void kvm_ioapic_send_eoi(struct kvm_lapic *apic, int vector)

{

	if (!(kvm_apic_get_reg(apic, APIC_SPIV) & APIC_SPIV_DIRECTED_EOI) &&

	    kvm_ioapic_handles_vector(apic->vcpu->kvm, vector)) {

	if (kvm_ioapic_handles_vector(apic->vcpu->kvm, vector)) {

		int trigger_mode;

		if (apic_test_vector(vector, apic->regs + APIC_TMR))

			trigger_mode = IOAPIC_LEVEL_TRIG;

arch/x86/kvm/vmx.c

+5 −2
Original line number Diff line number Diff line
@@ -2479,8 +2479,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) 
	if (enable_ept) {

		/* nested EPT: emulate EPT also to L1 */

		vmx->nested.nested_vmx_secondary_ctls_high |=

			SECONDARY_EXEC_ENABLE_EPT |

			SECONDARY_EXEC_UNRESTRICTED_GUEST;

			SECONDARY_EXEC_ENABLE_EPT;

		vmx->nested.nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |

			 VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |

			 VMX_EPT_INVEPT_BIT;
@@ -2494,6 +2493,10 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) 
	} else

		vmx->nested.nested_vmx_ept_caps = 0;



	if (enable_unrestricted_guest)

		vmx->nested.nested_vmx_secondary_ctls_high |=

			SECONDARY_EXEC_UNRESTRICTED_GUEST;



	/* miscellaneous data */

	rdmsr(MSR_IA32_VMX_MISC,

		vmx->nested.nested_vmx_misc_low,

virt/kvm/kvm_main.c

+7 −7
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static struct kvm *kvm_create_vm(unsigned long type) 
	BUILD_BUG_ON(KVM_MEM_SLOTS_NUM > SHRT_MAX);



	r = -ENOMEM;

	kvm->memslots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);

	kvm->memslots = kvm_kvzalloc(sizeof(struct kvm_memslots));

	if (!kvm->memslots)

		goto out_err_no_srcu;
@@ -522,7 +522,7 @@ out_err_no_srcu: 
out_err_no_disable:

	for (i = 0; i < KVM_NR_BUSES; i++)

		kfree(kvm->buses[i]);

	kfree(kvm->memslots);

	kvfree(kvm->memslots);

	kvm_arch_free_vm(kvm);

	return ERR_PTR(r);

}
@@ -578,7 +578,7 @@ static void kvm_free_physmem(struct kvm *kvm) 
	kvm_for_each_memslot(memslot, slots)

		kvm_free_physmem_slot(kvm, memslot, NULL);



	kfree(kvm->memslots);

	kvfree(kvm->memslots);

}



static void kvm_destroy_devices(struct kvm *kvm)
@@ -871,10 +871,10 @@ int __kvm_set_memory_region(struct kvm *kvm, 
			goto out_free;

	}



	slots = kmemdup(kvm->memslots, sizeof(struct kvm_memslots),

			GFP_KERNEL);

	slots = kvm_kvzalloc(sizeof(struct kvm_memslots));

	if (!slots)

		goto out_free;

	memcpy(slots, kvm->memslots, sizeof(struct kvm_memslots));



	if ((change == KVM_MR_DELETE) || (change == KVM_MR_MOVE)) {

		slot = id_to_memslot(slots, mem->slot);
@@ -917,7 +917,7 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	kvm_arch_commit_memory_region(kvm, mem, &old, change);



	kvm_free_physmem_slot(kvm, &old, &new);

	kfree(old_memslots);

	kvfree(old_memslots);



	/*

	 * IOMMU mapping:  New slots need to be mapped.  Old slots need to be
@@ -936,7 +936,7 @@ int __kvm_set_memory_region(struct kvm *kvm, 
	return 0;



out_slots:

	kfree(slots);

	kvfree(slots);

out_free:

	kvm_free_physmem_slot(kvm, &new, &old);

out:

CRA Git | Maintained and supported by SUSTech CRA and CCSE