* [PATCH 0/3] Userspace for MSI-X
@ 2008-12-23 8:32 Sheng Yang
2008-12-23 8:32 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sheng Yang @ 2008-12-23 8:32 UTC (permalink / raw)
To: Avi Kivity, Anthony Liguori; +Cc: kvm
Oh, I know, here the last ones... :)
2008 is not that easy, but indeed a great year for KVM.
Merry Xmas to the guys in the KVM community!
--
regards
Yang, Sheng
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] Add MSI-X related macro to pci.c 2008-12-23 8:32 [PATCH 0/3] Userspace for MSI-X Sheng Yang @ 2008-12-23 8:32 ` Sheng Yang 2008-12-23 8:32 ` [PATCH 2/3] KVM: Makefile change for intercepted MMIO Sheng Yang 2008-12-23 8:32 ` [PATCH 3/3] Add MSI-X capability support Sheng Yang 2 siblings, 0 replies; 6+ messages in thread From: Sheng Yang @ 2008-12-23 8:32 UTC (permalink / raw) To: Avi Kivity, Anthony Liguori; +Cc: kvm, Sheng Yang Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- qemu/hw/pci.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemu/hw/pci.h b/qemu/hw/pci.h index 3a0e9c2..8b9ac5f 100644 --- a/qemu/hw/pci.h +++ b/qemu/hw/pci.h @@ -67,6 +67,7 @@ typedef struct PCIIORegion { #define PCI_CAPABILITY_CONFIG_MAX_LENGTH 0x60 #define PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR 0x40 #define PCI_CAPABILITY_CONFIG_MSI_LENGTH 0x10 +#define PCI_CAPABILITY_CONFIG_MSIX_LENGTH 0x10 struct PCIDevice { /* PCI config space */ -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] KVM: Makefile change for intercepted MMIO 2008-12-23 8:32 [PATCH 0/3] Userspace for MSI-X Sheng Yang 2008-12-23 8:32 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang @ 2008-12-23 8:32 ` Sheng Yang 2008-12-23 8:32 ` [PATCH 3/3] Add MSI-X capability support Sheng Yang 2 siblings, 0 replies; 6+ messages in thread From: Sheng Yang @ 2008-12-23 8:32 UTC (permalink / raw) To: Avi Kivity, Anthony Liguori; +Cc: kvm, Sheng Yang Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- kernel/x86/Kbuild | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/x86/Kbuild b/kernel/x86/Kbuild index c4723b1..a4b823c 100644 --- a/kernel/x86/Kbuild +++ b/kernel/x86/Kbuild @@ -5,7 +5,7 @@ include $(obj)/../config.kbuild obj-m := kvm.o kvm-intel.o kvm-amd.o kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o ../anon_inodes.o irq.o i8259.o \ lapic.o ioapic.o preempt.o i8254.o coalesced_mmio.o irq_comm.o \ - ../external-module-compat.o + intercepted_mmio.o ../external-module-compat.o ifeq ($(EXT_CONFIG_KVM_TRACE),y) kvm-objs += kvm_trace.o endif -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] Add MSI-X capability support 2008-12-23 8:32 [PATCH 0/3] Userspace for MSI-X Sheng Yang 2008-12-23 8:32 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang 2008-12-23 8:32 ` [PATCH 2/3] KVM: Makefile change for intercepted MMIO Sheng Yang @ 2008-12-23 8:32 ` Sheng Yang 2 siblings, 0 replies; 6+ messages in thread From: Sheng Yang @ 2008-12-23 8:32 UTC (permalink / raw) To: Avi Kivity, Anthony Liguori; +Cc: kvm, Sheng Yang Expose MSI-X capabilty to guest if the assigned device got it. Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- qemu/hw/device-assignment.c | 82 +++++++++++++++++++++++++++++++++++++++++-- qemu/hw/device-assignment.h | 3 ++ 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 61d3f66..2d0c8a5 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -570,7 +570,9 @@ void assigned_dev_update_irq(PCIDevice *d) } } -#if defined(KVM_CAP_DEVICE_MSI) && defined (KVM_CAP_GSI_MSG) +#ifdef KVM_CAP_GSI_MSG + +#ifdef KVM_CAP_DEVICE_MSI static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) { struct kvm_assigned_irq assigned_irq_data; @@ -610,6 +612,45 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) } #endif +#ifdef KVM_CAP_DEVICE_MSIX +static void assigned_dev_update_msix(PCIDevice *pci_dev, unsigned int ctrl_pos) +{ + struct kvm_assigned_irq assigned_irq_data; + AssignedDevice *assigned_dev = container_of(pci_dev, AssignedDevice, dev); + uint16_t *ctrl_word = (uint16_t *)(pci_dev->cap.config + ctrl_pos); + + memset(&assigned_irq_data, 0, sizeof assigned_irq_data); + assigned_irq_data.assigned_dev_id = + calc_assigned_dev_id(assigned_dev->h_busnr, + (uint8_t)assigned_dev->h_devfn); + + assigned_irq_data.flags = KVM_DEV_IRQ_ASSIGN_MSIX_ACTION; + if (*ctrl_word & PCI_MSIX_ENABLE) + assigned_irq_data.flags |= KVM_DEV_IRQ_ASSIGN_ENABLE_MSIX; + if (*ctrl_word & PCI_MSIX_MASK) + assigned_irq_data.flags |= KVM_DEV_IRQ_ASSIGN_MASK_MSIX; + + if (kvm_assign_irq(kvm_context, &assigned_irq_data) < 0) + perror("assigned_dev_enable_msi"); + + if (assigned_irq_data.flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSIX) { + assigned_dev->cap.state |= ASSIGNED_DEVICE_MSIX_ENABLED; + *ctrl_word |= PCI_MSIX_ENABLE; + } else { + assigned_dev->cap.state &= ~ASSIGNED_DEVICE_MSIX_ENABLED; + *ctrl_word &= ~PCI_MSIX_ENABLE; + } + if (assigned_irq_data.flags & KVM_DEV_IRQ_ASSIGN_MASK_MSIX) { + assigned_dev->cap.state |= ASSIGNED_DEVICE_MSIX_MASKED; + *ctrl_word |= PCI_MSIX_MASK; + } else { + assigned_dev->cap.state &= ~ASSIGNED_DEVICE_MSIX_MASKED; + *ctrl_word &= ~PCI_MSIX_MASK; + } +} +#endif +#endif + void assigned_device_pci_cap_write_config(PCIDevice *pci_dev, uint32_t address, uint32_t val, int len) { @@ -617,7 +658,8 @@ void assigned_device_pci_cap_write_config(PCIDevice *pci_dev, uint32_t address, unsigned int pos = pci_dev->cap.start, ctrl_pos; pci_default_cap_write_config(pci_dev, address, val, len); -#if defined(KVM_CAP_DEVICE_MSI) && defined (KVM_CAP_GSI_MSG) +#ifdef KVM_CAP_GSI_MSG +#ifdef KVM_CAP_DEVICE_MSI if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) { ctrl_pos = pos + PCI_MSI_FLAGS; if (address <= ctrl_pos && address + len > ctrl_pos) @@ -625,6 +667,17 @@ void assigned_device_pci_cap_write_config(PCIDevice *pci_dev, uint32_t address, pos += PCI_CAPABILITY_CONFIG_MSI_LENGTH; } #endif +#ifdef KVM_CAP_DEVICE_MSIX + if (assigned_dev->cap.available & ASSIGNED_DEVICE_CAP_MSI) { + ctrl_pos = pos + 3; + if (address <= ctrl_pos && address + len > ctrl_pos) { + ctrl_pos--; /* control is word long */ + assigned_dev_update_msix(pci_dev, ctrl_pos - pci_dev->cap.start); + } + pos += PCI_CAPABILITY_CONFIG_MSIX_LENGTH; + } +#endif +#endif return; } @@ -643,7 +696,8 @@ void assigned_device_pci_cap_init(PCIDevice *pci_dev) pci_init(pacc); dev->pdev = pci_get_dev(pacc, 0, h_bus, h_dev, h_func); pci_cleanup(pacc); -#if defined(KVM_CAP_DEVICE_MSI) && defined (KVM_CAP_GSI_MSG) +#ifdef KVM_CAP_GSI_MSG +#ifdef KVM_CAP_DEVICE_MSI /* Expose MSI capability * MSI capability is the 1st capability in cap.config */ if (pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSI)) { @@ -653,6 +707,28 @@ void assigned_device_pci_cap_init(PCIDevice *pci_dev) next_cap_pt = 1; } #endif +#ifdef KVM_CAP_DEVICE_MSIX + /* Expose MSI-X capability */ + if (pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSIX)) { + int pos, entry_nr; + dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX; + pos = pci_find_cap_offset(dev->pdev, PCI_CAP_ID_MSIX); + entry_nr = pci_read_word(dev->pdev, pos + 2) & PCI_MSIX_TABSIZE; + pci_dev->cap.config[pci_dev->cap.length] = 0x11; + pci_dev->cap.config[pci_dev->cap.length + 2] = entry_nr; + *(uint32_t *)(pci_dev->cap.config + + pci_dev->cap.length + PCI_MSIX_TABLE) = + pci_read_long(dev->pdev, pos + PCI_MSIX_TABLE); + *(uint32_t *)(pci_dev->cap.config + + pci_dev->cap.length + PCI_MSIX_PBA) = + pci_read_long(dev->pdev, pos + PCI_MSIX_PBA); + pci_dev->cap.config[next_cap_pt] = + pci_dev->cap.start + pci_dev->cap.length; + pci_dev->cap.length += PCI_CAPABILITY_CONFIG_MSIX_LENGTH; + next_cap_pt += PCI_CAPABILITY_CONFIG_MSIX_LENGTH; + } +#endif +#endif } struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) diff --git a/qemu/hw/device-assignment.h b/qemu/hw/device-assignment.h index ea26de5..9348e2c 100644 --- a/qemu/hw/device-assignment.h +++ b/qemu/hw/device-assignment.h @@ -84,8 +84,11 @@ typedef struct { struct pci_dev *pdev; struct { #define ASSIGNED_DEVICE_CAP_MSI (1 << 0) +#define ASSIGNED_DEVICE_CAP_MSIX (1 << 1) uint32_t available; #define ASSIGNED_DEVICE_MSI_ENABLED (1 << 0) +#define ASSIGNED_DEVICE_MSIX_ENABLED (1 << 1) +#define ASSIGNED_DEVICE_MSIX_MASKED (1 << 2) uint32_t state; } cap; } AssignedDevice; -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Patch 0/3][v2] Userspace for MSI-X @ 2008-12-30 6:29 Sheng Yang 2008-12-30 6:29 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang 0 siblings, 1 reply; 6+ messages in thread From: Sheng Yang @ 2008-12-30 6:29 UTC (permalink / raw) To: Avi Kivity, Anthony Liguori; +Cc: kvm Change from v2: Move MMIO intercepting to userspace, and add two new ioctls. For kernel space MSI-X depends on lots of related patch I sent before, this time I kept it and wait for others to be checked in. Please help to review, thanks. -- regards Yang, Sheng ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] Add MSI-X related macro to pci.c 2008-12-30 6:29 [Patch 0/3][v2] Userspace for MSI-X Sheng Yang @ 2008-12-30 6:29 ` Sheng Yang 0 siblings, 0 replies; 6+ messages in thread From: Sheng Yang @ 2008-12-30 6:29 UTC (permalink / raw) To: Avi Kivity, Anthony Liguori; +Cc: kvm, Sheng Yang Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- qemu/hw/pci.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemu/hw/pci.h b/qemu/hw/pci.h index f2a622c..22c5de1 100644 --- a/qemu/hw/pci.h +++ b/qemu/hw/pci.h @@ -87,6 +87,7 @@ typedef struct PCIIORegion { #define PCI_CAPABILITY_CONFIG_MAX_LENGTH 0x60 #define PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR 0x40 #define PCI_CAPABILITY_CONFIG_MSI_LENGTH 0x10 +#define PCI_CAPABILITY_CONFIG_MSIX_LENGTH 0x10 struct PCIDevice { /* PCI config space */ -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 0/3][v3] Userspace for MSI-X enabling @ 2009-02-11 8:14 Sheng Yang 2009-02-11 8:14 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang 0 siblings, 1 reply; 6+ messages in thread From: Sheng Yang @ 2009-02-11 8:14 UTC (permalink / raw) To: Avi Kivity; +Cc: kvm, Anthony Liguori Update from v2: Change the interface to irq routing method. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] Add MSI-X related macro to pci.c 2009-02-11 8:14 [PATCH 0/3][v3] Userspace for MSI-X enabling Sheng Yang @ 2009-02-11 8:14 ` Sheng Yang 0 siblings, 0 replies; 6+ messages in thread From: Sheng Yang @ 2009-02-11 8:14 UTC (permalink / raw) To: Avi Kivity; +Cc: kvm, Anthony Liguori, Sheng Yang Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- qemu/hw/pci.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemu/hw/pci.h b/qemu/hw/pci.h index b6fc330..8466cf8 100644 --- a/qemu/hw/pci.h +++ b/qemu/hw/pci.h @@ -185,6 +185,7 @@ typedef struct PCIIORegion { #define PCI_CAPABILITY_CONFIG_MAX_LENGTH 0x60 #define PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR 0x40 #define PCI_CAPABILITY_CONFIG_MSI_LENGTH 0x10 +#define PCI_CAPABILITY_CONFIG_MSIX_LENGTH 0x10 struct PCIDevice { /* PCI config space */ -- 1.5.4.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-02-11 8:14 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-12-23 8:32 [PATCH 0/3] Userspace for MSI-X Sheng Yang 2008-12-23 8:32 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang 2008-12-23 8:32 ` [PATCH 2/3] KVM: Makefile change for intercepted MMIO Sheng Yang 2008-12-23 8:32 ` [PATCH 3/3] Add MSI-X capability support Sheng Yang -- strict thread matches above, loose matches on Subject: below -- 2008-12-30 6:29 [Patch 0/3][v2] Userspace for MSI-X Sheng Yang 2008-12-30 6:29 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang 2009-02-11 8:14 [PATCH 0/3][v3] Userspace for MSI-X enabling Sheng Yang 2009-02-11 8:14 ` [PATCH 1/3] Add MSI-X related macro to pci.c Sheng Yang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.