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

Commit 8bf463f3 authored by David Hildenbrand's avatar David Hildenbrand Committed by Radim Krčmář
Browse files

KVM: x86: check against irqchip_mode in kvm_set_routing_entry() 



Let's replace the checks for pic_in_kernel() and ioapic_in_kernel() by
checks against irqchip_mode.

Also make sure that creation of any route is only possible if we have
an lapic in kernel (irqchip_in_kernel()) or if we are currently
inititalizing the irqchip.

This is necessary to switch pic_in_kernel() and ioapic_in_kernel() to
irqchip_mode, too.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 637e3f86

arch/x86/kvm/irq_comm.c

+8 −6
Original line number Diff line number Diff line
@@ -282,24 +282,26 @@ int kvm_set_routing_entry(struct kvm *kvm, 
	int delta;

	unsigned max_pin;



	/* also allow creation of routes during KVM_IRQCHIP_INIT_IN_PROGRESS */

	if (kvm->arch.irqchip_mode == KVM_IRQCHIP_NONE)

		goto out;



	/* Matches smp_wmb() when setting irqchip_mode */

	smp_rmb();

	switch (ue->type) {

	case KVM_IRQ_ROUTING_IRQCHIP:

		if (irqchip_split(kvm))

			goto out;

		delta = 0;

		switch (ue->u.irqchip.irqchip) {

		case KVM_IRQCHIP_PIC_SLAVE:

			delta = 8;

			/* fall through */

		case KVM_IRQCHIP_PIC_MASTER:

			if (!pic_in_kernel(kvm))

				goto out;



			e->set = kvm_set_pic_irq;

			max_pin = PIC_NUM_PINS;

			break;

		case KVM_IRQCHIP_IOAPIC:

			if (!ioapic_in_kernel(kvm))

				goto out;



			max_pin = KVM_IOAPIC_NUM_PINS;

			e->set = kvm_set_ioapic_irq;

			break;