diff options
author | Ben-Ami Yassour <benami@il.ibm.com> | 2008-09-13 20:48:28 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2008-10-15 08:25:04 -0400 |
commit | 62c476c7c7f25a5b245b9902a935636e6316e58c (patch) | |
tree | 6584591c7c345fcbb3c6d437203dc7f4a628573a /include | |
parent | 387179464257921eb9aa3d15cc3ff194f6945a7c (diff) |
KVM: Device Assignment with VT-d
Based on a patch by: Kay, Allen M <allen.m.kay@intel.com>
This patch enables PCI device assignment based on VT-d support.
When a device is assigned to the guest, the guest memory is pinned and
the mapping is updated in the VT-d IOMMU.
[Amit: Expose KVM_CAP_IOMMU so we can check if an IOMMU is present
and also control enable/disable from userspace]
Signed-off-by: Kay, Allen M <allen.m.kay@intel.com>
Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: Ben-Ami Yassour <benami@il.ibm.com>
Signed-off-by: Amit Shah <amit.shah@qumranet.com>
Acked-by: Mark Gross <mgross@linux.intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/kvm_host.h | 23 | ||||
-rw-r--r-- | include/linux/kvm.h | 3 | ||||
-rw-r--r-- | include/linux/kvm_host.h | 52 |
3 files changed, 58 insertions, 20 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 68a3ac13afce..805629c0f15f 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
@@ -331,26 +331,6 @@ struct kvm_mem_alias { | |||
331 | gfn_t target_gfn; | 331 | gfn_t target_gfn; |
332 | }; | 332 | }; |
333 | 333 | ||
334 | struct kvm_irq_ack_notifier { | ||
335 | struct hlist_node link; | ||
336 | unsigned gsi; | ||
337 | void (*irq_acked)(struct kvm_irq_ack_notifier *kian); | ||
338 | }; | ||
339 | |||
340 | struct kvm_assigned_dev_kernel { | ||
341 | struct kvm_irq_ack_notifier ack_notifier; | ||
342 | struct work_struct interrupt_work; | ||
343 | struct list_head list; | ||
344 | int assigned_dev_id; | ||
345 | int host_busnr; | ||
346 | int host_devfn; | ||
347 | int host_irq; | ||
348 | int guest_irq; | ||
349 | int irq_requested; | ||
350 | struct pci_dev *dev; | ||
351 | struct kvm *kvm; | ||
352 | }; | ||
353 | |||
354 | struct kvm_arch{ | 334 | struct kvm_arch{ |
355 | int naliases; | 335 | int naliases; |
356 | struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS]; | 336 | struct kvm_mem_alias aliases[KVM_ALIAS_SLOTS]; |
@@ -364,6 +344,7 @@ struct kvm_arch{ | |||
364 | */ | 344 | */ |
365 | struct list_head active_mmu_pages; | 345 | struct list_head active_mmu_pages; |
366 | struct list_head assigned_dev_head; | 346 | struct list_head assigned_dev_head; |
347 | struct dmar_domain *intel_iommu_domain; | ||
367 | struct kvm_pic *vpic; | 348 | struct kvm_pic *vpic; |
368 | struct kvm_ioapic *vioapic; | 349 | struct kvm_ioapic *vioapic; |
369 | struct kvm_pit *vpit; | 350 | struct kvm_pit *vpit; |
@@ -514,6 +495,8 @@ int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa, | |||
514 | int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes, | 495 | int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes, |
515 | gpa_t addr, unsigned long *ret); | 496 | gpa_t addr, unsigned long *ret); |
516 | 497 | ||
498 | int is_mmio_pfn(pfn_t pfn); | ||
499 | |||
517 | extern bool tdp_enabled; | 500 | extern bool tdp_enabled; |
518 | 501 | ||
519 | enum emulation_result { | 502 | enum emulation_result { |
diff --git a/include/linux/kvm.h b/include/linux/kvm.h index ef4bc6f89778..4269be171faf 100644 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h | |||
@@ -384,6 +384,7 @@ struct kvm_trace_rec { | |||
384 | #define KVM_CAP_COALESCED_MMIO 15 | 384 | #define KVM_CAP_COALESCED_MMIO 15 |
385 | #define KVM_CAP_SYNC_MMU 16 /* Changes to host mmap are reflected in guest */ | 385 | #define KVM_CAP_SYNC_MMU 16 /* Changes to host mmap are reflected in guest */ |
386 | #define KVM_CAP_DEVICE_ASSIGNMENT 17 | 386 | #define KVM_CAP_DEVICE_ASSIGNMENT 17 |
387 | #define KVM_CAP_IOMMU 18 | ||
387 | 388 | ||
388 | /* | 389 | /* |
389 | * ioctls for VM fds | 390 | * ioctls for VM fds |
@@ -495,4 +496,6 @@ struct kvm_assigned_irq { | |||
495 | __u32 flags; | 496 | __u32 flags; |
496 | }; | 497 | }; |
497 | 498 | ||
499 | #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) | ||
500 | |||
498 | #endif | 501 | #endif |
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 4b036430ea23..6252802c3cc0 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h | |||
@@ -286,6 +286,53 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v); | |||
286 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu); | 286 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu); |
287 | void kvm_vcpu_kick(struct kvm_vcpu *vcpu); | 287 | void kvm_vcpu_kick(struct kvm_vcpu *vcpu); |
288 | 288 | ||
289 | struct kvm_irq_ack_notifier { | ||
290 | struct hlist_node link; | ||
291 | unsigned gsi; | ||
292 | void (*irq_acked)(struct kvm_irq_ack_notifier *kian); | ||
293 | }; | ||
294 | |||
295 | struct kvm_assigned_dev_kernel { | ||
296 | struct kvm_irq_ack_notifier ack_notifier; | ||
297 | struct work_struct interrupt_work; | ||
298 | struct list_head list; | ||
299 | int assigned_dev_id; | ||
300 | int host_busnr; | ||
301 | int host_devfn; | ||
302 | int host_irq; | ||
303 | int guest_irq; | ||
304 | int irq_requested; | ||
305 | struct pci_dev *dev; | ||
306 | struct kvm *kvm; | ||
307 | }; | ||
308 | |||
309 | #ifdef CONFIG_DMAR | ||
310 | int kvm_iommu_map_pages(struct kvm *kvm, gfn_t base_gfn, | ||
311 | unsigned long npages); | ||
312 | int kvm_iommu_map_guest(struct kvm *kvm, | ||
313 | struct kvm_assigned_dev_kernel *assigned_dev); | ||
314 | int kvm_iommu_unmap_guest(struct kvm *kvm); | ||
315 | #else /* CONFIG_DMAR */ | ||
316 | static inline int kvm_iommu_map_pages(struct kvm *kvm, | ||
317 | gfn_t base_gfn, | ||
318 | unsigned long npages) | ||
319 | { | ||
320 | return 0; | ||
321 | } | ||
322 | |||
323 | static inline int kvm_iommu_map_guest(struct kvm *kvm, | ||
324 | struct kvm_assigned_dev_kernel | ||
325 | *assigned_dev) | ||
326 | { | ||
327 | return -ENODEV; | ||
328 | } | ||
329 | |||
330 | static inline int kvm_iommu_unmap_guest(struct kvm *kvm) | ||
331 | { | ||
332 | return 0; | ||
333 | } | ||
334 | #endif /* CONFIG_DMAR */ | ||
335 | |||
289 | static inline void kvm_guest_enter(void) | 336 | static inline void kvm_guest_enter(void) |
290 | { | 337 | { |
291 | account_system_vtime(current); | 338 | account_system_vtime(current); |
@@ -308,6 +355,11 @@ static inline gpa_t gfn_to_gpa(gfn_t gfn) | |||
308 | return (gpa_t)gfn << PAGE_SHIFT; | 355 | return (gpa_t)gfn << PAGE_SHIFT; |
309 | } | 356 | } |
310 | 357 | ||
358 | static inline hpa_t pfn_to_hpa(pfn_t pfn) | ||
359 | { | ||
360 | return (hpa_t)pfn << PAGE_SHIFT; | ||
361 | } | ||
362 | |||
311 | static inline void kvm_migrate_timers(struct kvm_vcpu *vcpu) | 363 | static inline void kvm_migrate_timers(struct kvm_vcpu *vcpu) |
312 | { | 364 | { |
313 | set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests); | 365 | set_bit(KVM_REQ_MIGRATE_TIMER, &vcpu->requests); |