Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 125255
b: refs/heads/master
c: 5319c66
h: refs/heads/master
i:
  125253: b5a695d
  125251: c7d5e8e
  125247: 6903fcf
v: v3
  • Loading branch information
Sheng Yang authored and Avi Kivity committed Dec 31, 2008
1 parent 74cf3a9 commit 6a9b404
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b9cc7fd469869bed38831c5adac3f59dc25eaf5
refs/heads/master: 5319c662522db8995ff9276ba9d80549c64b294a
70 changes: 54 additions & 16 deletions trunk/virt/kvm/kvm_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
MODULE_AUTHOR("Qumranet");
MODULE_LICENSE("GPL");

static int msi2intx = 1;
module_param(msi2intx, bool, 0);

DEFINE_SPINLOCK(kvm_lock);
LIST_HEAD(vm_list);

Expand Down Expand Up @@ -250,7 +253,8 @@ static int assigned_device_update_intx(struct kvm *kvm,
return 0;

if (irqchip_in_kernel(kvm)) {
if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) {
if (!msi2intx &&
adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) {
free_irq(adev->host_irq, (void *)kvm);
pci_disable_msi(adev->dev);
}
Expand Down Expand Up @@ -285,30 +289,44 @@ static int assigned_device_update_msi(struct kvm *kvm,
{
int r;

/* x86 don't care upper address of guest msi message addr */
adev->guest_msi.address_lo = airq->guest_msi.addr_lo;
adev->guest_msi.data = airq->guest_msi.data;
adev->ack_notifier.gsi = -1;
if (airq->flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSI) {
/* x86 don't care upper address of guest msi message addr */
adev->irq_requested_type |= KVM_ASSIGNED_DEV_GUEST_MSI;
adev->irq_requested_type &= ~KVM_ASSIGNED_DEV_GUEST_INTX;
adev->guest_msi.address_lo = airq->guest_msi.addr_lo;
adev->guest_msi.data = airq->guest_msi.data;
adev->ack_notifier.gsi = -1;
} else if (msi2intx) {
adev->irq_requested_type |= KVM_ASSIGNED_DEV_GUEST_INTX;
adev->irq_requested_type &= ~KVM_ASSIGNED_DEV_GUEST_MSI;
adev->guest_irq = airq->guest_irq;
adev->ack_notifier.gsi = airq->guest_irq;
}

if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI)
return 0;

if (irqchip_in_kernel(kvm)) {
if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX)
free_irq(adev->host_irq, (void *)adev);

r = pci_enable_msi(adev->dev);
if (r)
return r;
if (!msi2intx) {
if (adev->irq_requested_type &
KVM_ASSIGNED_DEV_HOST_INTX)
free_irq(adev->host_irq, (void *)adev);

r = pci_enable_msi(adev->dev);
if (r)
return r;
}

adev->host_irq = adev->dev->irq;
if (request_irq(adev->host_irq, kvm_assigned_dev_intr, 0,
"kvm_assigned_msi_device", (void *)adev))
return -EIO;
}

adev->irq_requested_type = KVM_ASSIGNED_DEV_GUEST_MSI |
KVM_ASSIGNED_DEV_HOST_MSI;
if (!msi2intx)
adev->irq_requested_type = KVM_ASSIGNED_DEV_GUEST_MSI;

adev->irq_requested_type |= KVM_ASSIGNED_DEV_HOST_MSI;
return 0;
}
#endif
Expand Down Expand Up @@ -346,10 +364,19 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
goto out_release;
else
match->irq_source_id = r;

#ifdef CONFIG_X86
/* Determine host device irq type, we can know the
* result from dev->msi_enabled */
if (msi2intx)
pci_enable_msi(match->dev);
#endif
}
}

if (assigned_irq->flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSI) {
if ((!msi2intx &&
(assigned_irq->flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSI)) ||
(msi2intx && match->dev->msi_enabled)) {
#ifdef CONFIG_X86
r = assigned_device_update_msi(kvm, match, assigned_irq);
if (r) {
Expand All @@ -362,8 +389,16 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm,
#endif
} else if (assigned_irq->host_irq == 0 && match->dev->irq == 0) {
/* Host device IRQ 0 means don't support INTx */
printk(KERN_WARNING "kvm: wait device to enable MSI!\n");
r = 0;
if (!msi2intx) {
printk(KERN_WARNING
"kvm: wait device to enable MSI!\n");
r = 0;
} else {
printk(KERN_WARNING
"kvm: failed to enable MSI device!\n");
r = -ENOTTY;
goto out_release;
}
} else {
/* Non-sharing INTx mode */
r = assigned_device_update_intx(kvm, match, assigned_irq);
Expand Down Expand Up @@ -2209,6 +2244,9 @@ int kvm_init(void *opaque, unsigned int vcpu_size,

kvm_preempt_ops.sched_in = kvm_sched_in;
kvm_preempt_ops.sched_out = kvm_sched_out;
#ifndef CONFIG_X86
msi2intx = 0;
#endif

return 0;

Expand Down

0 comments on commit 6a9b404

Please sign in to comment.