luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: fix handling of ACK from shared guest IRQ

Browse Source 
If an assigned device shares a guest irq with an emulated
device then we currently interpret an ack generated by the
emulated device as originating from the assigned device
leading to e.g. "Unbalanced enable for IRQ 4347" from the
enable_irq() in kvm_assigned_dev_ack_irq().

The fix is fairly simple - don't enable the physical device
irq unless it was previously disabled.

Of course, this can still lead to a situation where a
non-assigned device ACK can cause the physical device irq to
be reenabled before the device was serviced. However, being
level sensitive, the interrupt will merely be regenerated.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Mark McLoughlin 2008-12-02 12:16:33 +00:00 committed by Avi Kivity
parent eb64f1e8cd
commit defaf1587c
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kvm_host.h
View File

@ -307,6 +307,7 @@ struct kvm_assigned_dev_kernel {
int host_busnr; int host_busnr;
int host_devfn; int host_devfn;
int host_irq; int host_irq;
bool host_irq_disabled;
int guest_irq; int guest_irq;
struct msi_msg guest_msi; struct msi_msg guest_msi;
#define KVM_ASSIGNED_DEV_GUEST_INTX (1 << 0) #define KVM_ASSIGNED_DEV_GUEST_INTX (1 << 0)

15
virt/kvm/kvm_main.c
View File

@ -170,6 +170,7 @@ static void kvm_assigned_dev_interrupt_work_handler(struct work_struct *work)
KVM_ASSIGNED_DEV_GUEST_MSI) { KVM_ASSIGNED_DEV_GUEST_MSI) {
assigned_device_msi_dispatch(assigned_dev); assigned_device_msi_dispatch(assigned_dev);
enable_irq(assigned_dev->host_irq); enable_irq(assigned_dev->host_irq);
assigned_dev->host_irq_disabled = false;
} }
mutex_unlock(&assigned_dev->kvm->lock); mutex_unlock(&assigned_dev->kvm->lock);
kvm_put_kvm(assigned_dev->kvm); kvm_put_kvm(assigned_dev->kvm);
@ -181,8 +182,12 @@ static irqreturn_t kvm_assigned_dev_intr(int irq, void *dev_id)
(struct kvm_assigned_dev_kernel *) dev_id; (struct kvm_assigned_dev_kernel *) dev_id;
kvm_get_kvm(assigned_dev->kvm); kvm_get_kvm(assigned_dev->kvm);
schedule_work(&assigned_dev->interrupt_work); schedule_work(&assigned_dev->interrupt_work);
disable_irq_nosync(irq); disable_irq_nosync(irq);
assigned_dev->host_irq_disabled = true;
return IRQ_HANDLED; return IRQ_HANDLED;
} }
@ -196,8 +201,16 @@ static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian)
dev = container_of(kian, struct kvm_assigned_dev_kernel, dev = container_of(kian, struct kvm_assigned_dev_kernel,
ack_notifier); ack_notifier);
kvm_set_irq(dev->kvm, dev->irq_source_id, dev->guest_irq, 0); kvm_set_irq(dev->kvm, dev->irq_source_id, dev->guest_irq, 0);
enable_irq(dev->host_irq);
/* The guest irq may be shared so this ack may be
* from another device.
*/
if (dev->host_irq_disabled) {
enable_irq(dev->host_irq);
dev->host_irq_disabled = false;
}
} }
static void kvm_free_assigned_irq(struct kvm *kvm, static void kvm_free_assigned_irq(struct kvm *kvm,