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

Commit 5116d8f6 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Avi Kivity
Browse files

KVM: fix ack not being delivered when msi present 



kvm_notify_acked_irq does not check irq type, so that it sometimes
interprets msi vector as irq.  As a result, ack notifiers are not
called, which typially hangs the guest.  The fix is to track and
check irq type.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d3bc2f91

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ struct kvm_memory_slot { 


struct kvm_kernel_irq_routing_entry {

	u32 gsi;

	u32 type;

	int (*set)(struct kvm_kernel_irq_routing_entry *e,

		    struct kvm *kvm, int level);

	union {

virt/kvm/irq_comm.c

+3 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin) 
	unsigned gsi = pin;



	list_for_each_entry(e, &kvm->irq_routing, link)

		if (e->irqchip.irqchip == irqchip &&

		if (e->type == KVM_IRQ_ROUTING_IRQCHIP &&

		    e->irqchip.irqchip == irqchip &&

		    e->irqchip.pin == pin) {

			gsi = e->gsi;

			break;
@@ -259,6 +260,7 @@ static int setup_routing_entry(struct kvm_kernel_irq_routing_entry *e, 
	int delta;



	e->gsi = ue->gsi;

	e->type = ue->type;

	switch (ue->type) {

	case KVM_IRQ_ROUTING_IRQCHIP:

		delta = 0;