diff options
| author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-10-06 01:47:38 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-15 08:25:33 -0400 |
| commit | 8a98f6648a2b0756d8f26d6c13332f5526355fec (patch) | |
| tree | 8df03d146d22082644df8078747e332f9b2aff1f /virt | |
| parent | 371c01b28e4049d1fbf60a9631cdad98f7cae030 (diff) | |
KVM: Move device assignment logic to common code
To share with other archs, this patch moves device assignment
logic to common parts.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 268 |
1 files changed, 266 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 98cd916448a8..485bcdc16552 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -51,6 +51,12 @@ | |||
| 51 | #include "coalesced_mmio.h" | 51 | #include "coalesced_mmio.h" |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | #ifdef KVM_CAP_DEVICE_ASSIGNMENT | ||
| 55 | #include <linux/pci.h> | ||
| 56 | #include <linux/interrupt.h> | ||
| 57 | #include "irq.h" | ||
| 58 | #endif | ||
| 59 | |||
| 54 | MODULE_AUTHOR("Qumranet"); | 60 | MODULE_AUTHOR("Qumranet"); |
| 55 | MODULE_LICENSE("GPL"); | 61 | MODULE_LICENSE("GPL"); |
| 56 | 62 | ||
| @@ -71,6 +77,240 @@ static long kvm_vcpu_ioctl(struct file *file, unsigned int ioctl, | |||
| 71 | 77 | ||
| 72 | bool kvm_rebooting; | 78 | bool kvm_rebooting; |
| 73 | 79 | ||
| 80 | #ifdef KVM_CAP_DEVICE_ASSIGNMENT | ||
| 81 | static struct kvm_assigned_dev_kernel *kvm_find_assigned_dev(struct list_head *head, | ||
| 82 | int assigned_dev_id) | ||
| 83 | { | ||
| 84 | struct list_head *ptr; | ||
| 85 | struct kvm_assigned_dev_kernel *match; | ||
| 86 | |||
| 87 | list_for_each(ptr, head) { | ||
| 88 | match = list_entry(ptr, struct kvm_assigned_dev_kernel, list); | ||
| 89 | if (match->assigned_dev_id == assigned_dev_id) | ||
| 90 | return match; | ||
| 91 | } | ||
| 92 | return NULL; | ||
| 93 | } | ||
| 94 | |||
| 95 | static void kvm_assigned_dev_interrupt_work_handler(struct work_struct *work) | ||
| 96 | { | ||
| 97 | struct kvm_assigned_dev_kernel *assigned_dev; | ||
| 98 | |||
| 99 | assigned_dev = container_of(work, struct kvm_assigned_dev_kernel, | ||
| 100 | interrupt_work); | ||
| 101 | |||
| 102 | /* This is taken to safely inject irq inside the guest. When | ||
| 103 | * the interrupt injection (or the ioapic code) uses a | ||
| 104 | * finer-grained lock, update this | ||
| 105 | */ | ||
| 106 | mutex_lock(&assigned_dev->kvm->lock); | ||
| 107 | kvm_set_irq(assigned_dev->kvm, | ||
| 108 | assigned_dev->guest_irq, 1); | ||
| 109 | mutex_unlock(&assigned_dev->kvm->lock); | ||
| 110 | kvm_put_kvm(assigned_dev->kvm); | ||
| 111 | } | ||
| 112 | |||
| 113 | /* FIXME: Implement the OR logic needed to make shared interrupts on | ||
| 114 | * this line behave properly | ||
| 115 | */ | ||
| 116 | static irqreturn_t kvm_assigned_dev_intr(int irq, void *dev_id) | ||
| 117 | { | ||
| 118 | struct kvm_assigned_dev_kernel *assigned_dev = | ||
| 119 | (struct kvm_assigned_dev_kernel *) dev_id; | ||
| 120 | |||
| 121 | kvm_get_kvm(assigned_dev->kvm); | ||
| 122 | schedule_work(&assigned_dev->interrupt_work); | ||
| 123 | disable_irq_nosync(irq); | ||
| 124 | return IRQ_HANDLED; | ||
| 125 | } | ||
| 126 | |||
| 127 | /* Ack the irq line for an assigned device */ | ||
| 128 | static void kvm_assigned_dev_ack_irq(struct kvm_irq_ack_notifier *kian) | ||
| 129 | { | ||
| 130 | struct kvm_assigned_dev_kernel *dev; | ||
| 131 | |||
| 132 | if (kian->gsi == -1) | ||
| 133 | return; | ||
| 134 | |||
| 135 | dev = container_of(kian, struct kvm_assigned_dev_kernel, | ||
| 136 | ack_notifier); | ||
| 137 | kvm_set_irq(dev->kvm, dev->guest_irq, 0); | ||
| 138 | enable_irq(dev->host_irq); | ||
| 139 | } | ||
| 140 | |||
| 141 | static void kvm_free_assigned_device(struct kvm *kvm, | ||
| 142 | struct kvm_assigned_dev_kernel | ||
| 143 | *assigned_dev) | ||
| 144 | { | ||
| 145 | if (irqchip_in_kernel(kvm) && assigned_dev->irq_requested) | ||
| 146 | free_irq(assigned_dev->host_irq, (void *)assigned_dev); | ||
| 147 | |||
| 148 | kvm_unregister_irq_ack_notifier(kvm, &assigned_dev->ack_notifier); | ||
| 149 | |||
| 150 | if (cancel_work_sync(&assigned_dev->interrupt_work)) | ||
| 151 | /* We had pending work. That means we will have to take | ||
| 152 | * care of kvm_put_kvm. | ||
| 153 | */ | ||
| 154 | kvm_put_kvm(kvm); | ||
| 155 | |||
| 156 | pci_release_regions(assigned_dev->dev); | ||
| 157 | pci_disable_device(assigned_dev->dev); | ||
| 158 | pci_dev_put(assigned_dev->dev); | ||
| 159 | |||
| 160 | list_del(&assigned_dev->list); | ||
| 161 | kfree(assigned_dev); | ||
| 162 | } | ||
| 163 | |||
| 164 | void kvm_free_all_assigned_devices(struct kvm *kvm) | ||
| 165 | { | ||
| 166 | struct list_head *ptr, *ptr2; | ||
| 167 | struct kvm_assigned_dev_kernel *assigned_dev; | ||
| 168 | |||
| 169 | list_for_each_safe(ptr, ptr2, &kvm->arch.assigned_dev_head) { | ||
| 170 | assigned_dev = list_entry(ptr, | ||
| 171 | struct kvm_assigned_dev_kernel, | ||
| 172 | list); | ||
| 173 | |||
| 174 | kvm_free_assigned_device(kvm, assigned_dev); | ||
| 175 | } | ||
| 176 | } | ||
| 177 | |||
| 178 | static int kvm_vm_ioctl_assign_irq(struct kvm *kvm, | ||
| 179 | struct kvm_assigned_irq | ||
| 180 | *assigned_irq) | ||
| 181 | { | ||
| 182 | int r = 0; | ||
| 183 | struct kvm_assigned_dev_kernel *match; | ||
| 184 | |||
| 185 | mutex_lock(&kvm->lock); | ||
| 186 | |||
| 187 | match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head, | ||
| 188 | assigned_irq->assigned_dev_id); | ||
| 189 | if (!match) { | ||
| 190 | mutex_unlock(&kvm->lock); | ||
| 191 | return -EINVAL; | ||
| 192 | } | ||
| 193 | |||
| 194 | if (match->irq_requested) { | ||
| 195 | match->guest_irq = assigned_irq->guest_irq; | ||
| 196 | match->ack_notifier.gsi = assigned_irq->guest_irq; | ||
| 197 | mutex_unlock(&kvm->lock); | ||
| 198 | return 0; | ||
| 199 | } | ||
| 200 | |||
| 201 | INIT_WORK(&match->interrupt_work, | ||
| 202 | kvm_assigned_dev_interrupt_work_handler); | ||
| 203 | |||
| 204 | if (irqchip_in_kernel(kvm)) { | ||
| 205 | if (!capable(CAP_SYS_RAWIO)) { | ||
| 206 | r = -EPERM; | ||
| 207 | goto out_release; | ||
| 208 | } | ||
| 209 | |||
| 210 | if (assigned_irq->host_irq) | ||
| 211 | match->host_irq = assigned_irq->host_irq; | ||
| 212 | else | ||
| 213 | match->host_irq = match->dev->irq; | ||
| 214 | match->guest_irq = assigned_irq->guest_irq; | ||
| 215 | match->ack_notifier.gsi = assigned_irq->guest_irq; | ||
| 216 | match->ack_notifier.irq_acked = kvm_assigned_dev_ack_irq; | ||
| 217 | kvm_register_irq_ack_notifier(kvm, &match->ack_notifier); | ||
| 218 | |||
| 219 | /* Even though this is PCI, we don't want to use shared | ||
| 220 | * interrupts. Sharing host devices with guest-assigned devices | ||
| 221 | * on the same interrupt line is not a happy situation: there | ||
| 222 | * are going to be long delays in accepting, acking, etc. | ||
| 223 | */ | ||
| 224 | if (request_irq(match->host_irq, kvm_assigned_dev_intr, 0, | ||
| 225 | "kvm_assigned_device", (void *)match)) { | ||
| 226 | r = -EIO; | ||
| 227 | goto out_release; | ||
| 228 | } | ||
| 229 | } | ||
| 230 | |||
| 231 | match->irq_requested = true; | ||
| 232 | mutex_unlock(&kvm->lock); | ||
| 233 | return r; | ||
| 234 | out_release: | ||
| 235 | mutex_unlock(&kvm->lock); | ||
| 236 | kvm_free_assigned_device(kvm, match); | ||
| 237 | return r; | ||
| 238 | } | ||
| 239 | |||
| 240 | static int kvm_vm_ioctl_assign_device(struct kvm *kvm, | ||
| 241 | struct kvm_assigned_pci_dev *assigned_dev) | ||
| 242 | { | ||
| 243 | int r = 0; | ||
| 244 | struct kvm_assigned_dev_kernel *match; | ||
| 245 | struct pci_dev *dev; | ||
| 246 | |||
| 247 | mutex_lock(&kvm->lock); | ||
| 248 | |||
| 249 | match = kvm_find_assigned_dev(&kvm->arch.assigned_dev_head, | ||
| 250 | assigned_dev->assigned_dev_id); | ||
| 251 | if (match) { | ||
| 252 | /* device already assigned */ | ||
| 253 | r = -EINVAL; | ||
| 254 | goto out; | ||
| 255 | } | ||
| 256 | |||
| 257 | match = kzalloc(sizeof(struct kvm_assigned_dev_kernel), GFP_KERNEL); | ||
| 258 | if (match == NULL) { | ||
| 259 | printk(KERN_INFO "%s: Couldn't allocate memory\n", | ||
| 260 | __func__); | ||
| 261 | r = -ENOMEM; | ||
| 262 | goto out; | ||
| 263 | } | ||
| 264 | dev = pci_get_bus_and_slot(assigned_dev->busnr, | ||
| 265 | assigned_dev->devfn); | ||
| 266 | if (!dev) { | ||
| 267 | printk(KERN_INFO "%s: host device not found\n", __func__); | ||
| 268 | r = -EINVAL; | ||
| 269 | goto out_free; | ||
| 270 | } | ||
| 271 | if (pci_enable_device(dev)) { | ||
| 272 | printk(KERN_INFO "%s: Could not enable PCI device\n", __func__); | ||
| 273 | r = -EBUSY; | ||
| 274 | goto out_put; | ||
| 275 | } | ||
| 276 | r = pci_request_regions(dev, "kvm_assigned_device"); | ||
| 277 | if (r) { | ||
| 278 | printk(KERN_INFO "%s: Could not get access to device regions\n", | ||
| 279 | __func__); | ||
| 280 | goto out_disable; | ||
| 281 | } | ||
| 282 | match->assigned_dev_id = assigned_dev->assigned_dev_id; | ||
| 283 | match->host_busnr = assigned_dev->busnr; | ||
| 284 | match->host_devfn = assigned_dev->devfn; | ||
| 285 | match->dev = dev; | ||
| 286 | |||
| 287 | match->kvm = kvm; | ||
| 288 | |||
| 289 | list_add(&match->list, &kvm->arch.assigned_dev_head); | ||
| 290 | |||
| 291 | if (assigned_dev->flags & KVM_DEV_ASSIGN_ENABLE_IOMMU) { | ||
| 292 | r = kvm_iommu_map_guest(kvm, match); | ||
| 293 | if (r) | ||
| 294 | goto out_list_del; | ||
| 295 | } | ||
| 296 | |||
| 297 | out: | ||
| 298 | mutex_unlock(&kvm->lock); | ||
| 299 | return r; | ||
| 300 | out_list_del: | ||
| 301 | list_del(&match->list); | ||
| 302 | pci_release_regions(dev); | ||
| 303 | out_disable: | ||
| 304 | pci_disable_device(dev); | ||
| 305 | out_put: | ||
| 306 | pci_dev_put(dev); | ||
| 307 | out_free: | ||
| 308 | kfree(match); | ||
| 309 | mutex_unlock(&kvm->lock); | ||
| 310 | return r; | ||
| 311 | } | ||
| 312 | #endif | ||
| 313 | |||
| 74 | static inline int valid_vcpu(int n) | 314 | static inline int valid_vcpu(int n) |
| 75 | { | 315 | { |
| 76 | return likely(n >= 0 && n < KVM_MAX_VCPUS); | 316 | return likely(n >= 0 && n < KVM_MAX_VCPUS); |
| @@ -578,12 +818,12 @@ int __kvm_set_memory_region(struct kvm *kvm, | |||
| 578 | } | 818 | } |
| 579 | 819 | ||
| 580 | kvm_free_physmem_slot(&old, &new); | 820 | kvm_free_physmem_slot(&old, &new); |
| 581 | 821 | #ifdef CONFIG_DMAR | |
| 582 | /* map the pages in iommu page table */ | 822 | /* map the pages in iommu page table */ |
| 583 | r = kvm_iommu_map_pages(kvm, base_gfn, npages); | 823 | r = kvm_iommu_map_pages(kvm, base_gfn, npages); |
| 584 | if (r) | 824 | if (r) |
| 585 | goto out; | 825 | goto out; |
| 586 | 826 | #endif | |
| 587 | return 0; | 827 | return 0; |
| 588 | 828 | ||
| 589 | out_free: | 829 | out_free: |
| @@ -1383,6 +1623,30 @@ static long kvm_vm_ioctl(struct file *filp, | |||
| 1383 | break; | 1623 | break; |
| 1384 | } | 1624 | } |
| 1385 | #endif | 1625 | #endif |
| 1626 | #ifdef KVM_CAP_DEVICE_ASSIGNMENT | ||
| 1627 | case KVM_ASSIGN_PCI_DEVICE: { | ||
| 1628 | struct kvm_assigned_pci_dev assigned_dev; | ||
| 1629 | |||
| 1630 | r = -EFAULT; | ||
| 1631 | if (copy_from_user(&assigned_dev, argp, sizeof assigned_dev)) | ||
| 1632 | goto out; | ||
| 1633 | r = kvm_vm_ioctl_assign_device(kvm, &assigned_dev); | ||
| 1634 | if (r) | ||
| 1635 | goto out; | ||
| 1636 | break; | ||
| 1637 | } | ||
| 1638 | case KVM_ASSIGN_IRQ: { | ||
| 1639 | struct kvm_assigned_irq assigned_irq; | ||
| 1640 | |||
| 1641 | r = -EFAULT; | ||
| 1642 | if (copy_from_user(&assigned_irq, argp, sizeof assigned_irq)) | ||
| 1643 | goto out; | ||
| 1644 | r = kvm_vm_ioctl_assign_irq(kvm, &assigned_irq); | ||
| 1645 | if (r) | ||
| 1646 | goto out; | ||
| 1647 | break; | ||
| 1648 | } | ||
| 1649 | #endif | ||
| 1386 | default: | 1650 | default: |
| 1387 | r = kvm_arch_vm_ioctl(filp, ioctl, arg); | 1651 | r = kvm_arch_vm_ioctl(filp, ioctl, arg); |
| 1388 | } | 1652 | } |
