aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2009-02-25 04:22:28 -0500
committerAvi Kivity <avi@redhat.com>2009-06-10 04:48:23 -0400
commitd510d6cc653bc4b3094ea73afe12600d0ab445b3 (patch)
tree60ea170465dcddcd5cdd7c29a29df3f28407c202 /include
parent2350bd1f62c8706c22b8e58c3bfff10806c0a31b (diff)
KVM: Enable MSI-X for KVM assigned device
This patch finally enable MSI-X. What we need for MSI-X: 1. Intercept one page in MMIO region of device. So that we can get guest desired MSI-X table and set up the real one. Now this have been done by guest, and transfer to kernel using ioctl KVM_SET_MSIX_NR and KVM_SET_MSIX_ENTRY. 2. Information for incoming interrupt. Now one device can have more than one interrupt, and they are all handled by one workqueue structure. So we need to identify them. The previous patch enable gsi_msg_pending_bitmap get this done. 3. Mapping from host IRQ to guest gsi as well as guest gsi to real MSI/MSI-X message address/data. We used same entry number for the host and guest here, so that it's easy to find the correlated guest gsi. What we lack for now: 1. The PCI spec said nothing can existed with MSI-X table in the same page of MMIO region, except pending bits. The patch ignore pending bits as the first step (so they are always 0 - no pending). 2. The PCI spec allowed to change MSI-X table dynamically. That means, the OS can enable MSI-X, then mask one MSI-X entry, modify it, and unmask it. The patch didn't support this, and Linux also don't work in this way. 3. The patch didn't implement MSI-X mask all and mask single entry. I would implement the former in driver/pci/msi.c later. And for single entry, userspace should have reposibility to handle it. Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kvm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 78cdee8c635..640835ed270 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -409,6 +409,9 @@ struct kvm_trace_rec {
409#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT 409#ifdef __KVM_HAVE_DEVICE_ASSIGNMENT
410#define KVM_CAP_DEVICE_DEASSIGNMENT 27 410#define KVM_CAP_DEVICE_DEASSIGNMENT 27
411#endif 411#endif
412#ifdef __KVM_HAVE_MSIX
413#define KVM_CAP_DEVICE_MSIX 28
414#endif
412/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */ 415/* Another bug in KVM_SET_USER_MEMORY_REGION fixed: */
413#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30 416#define KVM_CAP_JOIN_MEMORY_REGIONS_WORKS 30
414 417
@@ -611,6 +614,11 @@ struct kvm_assigned_irq {
611#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION KVM_DEV_IRQ_ASSIGN_ENABLE_MSI 614#define KVM_DEV_IRQ_ASSIGN_MSI_ACTION KVM_DEV_IRQ_ASSIGN_ENABLE_MSI
612#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI (1 << 0) 615#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSI (1 << 0)
613 616
617#define KVM_DEV_IRQ_ASSIGN_MSIX_ACTION (KVM_DEV_IRQ_ASSIGN_ENABLE_MSIX |\
618 KVM_DEV_IRQ_ASSIGN_MASK_MSIX)
619#define KVM_DEV_IRQ_ASSIGN_ENABLE_MSIX (1 << 1)
620#define KVM_DEV_IRQ_ASSIGN_MASK_MSIX (1 << 2)
621
614struct kvm_assigned_msix_nr { 622struct kvm_assigned_msix_nr {
615 __u32 assigned_dev_id; 623 __u32 assigned_dev_id;
616 __u16 entry_nr; 624 __u16 entry_nr;