Userspace support for MSI enabling
v2 cover Userspace support for MSI enabling
Update using irq routing method.
PATCH v2 1/7 kvm: Replace force type convert with container_of()
--- qemu/hw/device-assignment.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-)
qemu/hw/device-assignment.c +12 -8
@@ -144,7 +144,7 @@ static uint32_t assigned_dev_ioport_readl(void *opaque, uint32_t addr)static void assigned_dev_iomem_map (PCIDevice *pci_dev,int region_num,uint32_t e_phys,uint32_t e_size,int type) { -AssignedDevice *r_dev = (AssignedDevice *) pci_dev; +AssignedDevice *r_dev =container_of (pci_dev, AssignedDevice, dev);AssignedDevRegion *region = &r_dev->v_addrs[region_num];uint32_t old_ephys = region->e_physbase;uint32_t old_esize = region->e_size;
@@ -175,7 +175,7 @@ static void assigned_dev_iomem_map(PCIDevice *pci_dev, int region_num,static void assigned_dev_ioport_map (PCIDevice *pci_dev,int region_num,uint32_t addr,uint32_t size,int type) { -AssignedDevice *r_dev = (AssignedDevice *) pci_dev; +AssignedDevice *r_dev =container_of (pci_dev, AssignedDevice, dev);AssignedDevRegion *region = &r_dev->v_addrs[region_num];int first_map = (region->e_size ==0 );CPUState *env;
@@ -224,6 +224,7 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, {int fd;ssize_t ret; +AssignedDevice *pci_dev =container_of (d, AssignedDevice, dev); DEBUG("(%x.%x): address=%04x val=0x%08x len=%d\n", ((d->devfn >> 3) & 0x1F), (d->devfn & 0x7),
@@ -245,7 +246,7 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, ((d->devfn >>3 ) &0x1F ), (d->devfn &0x7 ), (uint16_t) address, val, len); - fd = ((AssignedDevice *)d)->real_device.config_fd; + fd = pci_dev->real_device.config_fd; again: ret =pwrite (fd, &val, len, address);
@@ -266,6 +267,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address,uint32_t val =0 ;int fd;ssize_t ret; +AssignedDevice *pci_dev =container_of (d, AssignedDevice, dev);if ((address >=0x10 && address <=0x24 ) || address ==0x34 || address ==0x3c || address ==0x3d ) {
@@ -279,7 +281,7 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address,if (address ==0xFC ) goto do_log; - fd = ((AssignedDevice *)d)->real_device.config_fd; + fd = pci_dev->real_device.config_fd; again: ret =pread (fd, &val, len, address);
@@ -537,16 +539,18 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) {int r;AssignedDevice *dev; +PCIDevice *pci_dev;uint8_t e_device, e_intx;struct kvm_assigned_pci_dev assigned_dev_data;DEBUG ("Registering real physical device %s (bus=%x dev=%x func=%x)\n" , adev->name, adev->bus, adev->dev, adev->func); - dev = (AssignedDevice *) -pci_register_device (bus, adev->name,sizeof (AssignedDevice), --1 , assigned_dev_pci_read_config, - assigned_dev_pci_write_config); + pci_dev =pci_register_device (bus, adev->name, +sizeof (AssignedDevice),-1 , assigned_dev_pci_read_config, + assigned_dev_pci_write_config); + dev =container_of (pci_dev, AssignedDevice, dev); +if (NULL == dev) {fprintf (stderr,"%s: Error: Couldn't register real device %s\n" , __func__, adev->name);
Signature · 1 line
1.5.4.5
PATCH v2 2/7 Make device assignment depend on libpci
In reply to Sheng YangWhich is used later for capability detection.
--- qemu/Makefile.target | 1 + qemu/configure | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
qemu/Makefile.target +1 -0
@@ -637,6 +637,7 @@ OBJS += device-hotplug.o ifeq ($(USE_KVM_DEVICE_ASSIGNMENT), 1) OBJS+= device-assignment.o +LIBS+=-lpci endif ifeq ($(TARGET_BASE_ARCH), i386)
qemu/configure +20 -0
@@ -792,6 +792,26 @@ EOF fi fi +# libpci probe for kvm_cap_device_assignment +if test $kvm_cap_device_assignment = "yes" ; then +cat > $TMPC << EOF +#include <pci/pci.h> +#ifndef PCI_VENDOR_ID +#error NO LIBPCI +#endif +int main(void) { return 0; } +EOF + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC 2>/dev/null ; then + : + else + echo + echo "Error: libpci check failed" + echo "Disable KVM Device Assignment capability." + echo + kvm_cap_device_assignment="no" + fi +fi + ########################################## # zlib check
Signature · 1 line
1.5.4.5
PATCH v2 3/7 Figure out device capability
In reply to Sheng YangTry to figure out device capability in update_dev_cap(). Now we are only care about MSI capability.
The function pci_find_cap_offset original function wrote by Allen for Xen. Notice the function need root privilege to work. This depends on libpci to work.
--- qemu/hw/device-assignment.c | 29 +++++++++++++++++++++++++++++ qemu/hw/device-assignment.h | 1 + 2 files changed, 30 insertions(+), 0 deletions(-)
qemu/hw/device-assignment.c +29 -0
@@ -219,6 +219,35 @@ static void assigned_dev_ioport_map(PCIDevice *pci_dev, int region_num, (r_dev->v_addrs + region_num)); } +static uint8_t pci_find_cap_offset (struct pci_dev *pci_dev,uint8_t cap) +{ +int id; +int max_cap =48 ; +int pos =PCI_CAPABILITY_LIST ; +int status; + + status =pci_read_byte (pci_dev,PCI_STATUS ); +if ((status &PCI_STATUS_CAP_LIST ) ==0 ) +return 0 ; + +while (max_cap--) { + pos =pci_read_byte (pci_dev, pos); +if (pos <0x40 ) +break ; + + pos &= ~3 ; + id =pci_read_byte (pci_dev, pos +PCI_CAP_LIST_ID ); + +if (id ==0xff ) +break ; +if (id == cap) +return pos; + + pos +=PCI_CAP_LIST_NEXT ; + } +return 0 ; +} +static void assigned_dev_pci_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) {
qemu/hw/device-assignment.h +1 -0
@@ -29,6 +29,7 @@#define __DEVICE_ASSIGNMENT_H__#include <sys/mman.h> +#include <pci/pci.h> #include "qemu-common.h" #include "sys-queue.h" #include "pci.h"
Signature · 1 line
1.5.4.5
PATCH v2 4/7 Support for device capability
In reply to Sheng YangThis framework can be easily extended to support device capability, like MSI/MSI-x.
--- qemu/hw/pci.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu/hw/pci.h | 30 ++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-)
qemu/hw/pci.c +85 -0
@@ -349,11 +349,65 @@ static void pci_update_mappings(PCIDevice *d) } } +int pci_access_cap_config (PCIDevice *pci_dev,uint32_t address,int len) +{ +if (pci_dev->cap.supported && address >= pci_dev->cap.start && + (address + len) < pci_dev->cap.start + pci_dev->cap.length) +return 1 ; +return 0 ; +} + +uint32_t pci_default_cap_read_config (PCIDevice *pci_dev, +uint32_t address,int len) +{ +uint32_t val =0 ; + +if (pci_access_cap_config (pci_dev, address, len)) { +switch (len) { +default : +case 4 : +if (address < pci_dev->cap.start + pci_dev->cap.length -4 ) { + val =le32_to_cpu (*(uint32_t *)(pci_dev->cap.config + + address - pci_dev->cap.start)); +break ; + } +/* fall through */ +case 2 : +if (address < pci_dev->cap.start + pci_dev->cap.length -2 ) { + val =le16_to_cpu (*(uint16_t *)(pci_dev->cap.config + + address - pci_dev->cap.start)); +break ; + } +/* fall through */ +case 1 : + val = pci_dev->cap.config[address - pci_dev->cap.start]; +break ; + } + } +return val; +} + +void pci_default_cap_write_config (PCIDevice *pci_dev, +uint32_t address,uint32_t val,int len) +{ +if (pci_access_cap_config (pci_dev, address, len)) { +int i; +for (i =0 ; i < len; i++) { + pci_dev->cap.config[address + i - pci_dev->cap.start] = val; + val >>=8 ; + } +return ; + } +} +uint32_t pci_default_read_config (PCIDevice *d,uint32_t address,int len) {uint32_t val; +if (pci_access_cap_config (d, address, len)) +return d->cap.config_read (d, address, len); +switch (len) {default :case 4 :
@@ -407,6 +461,11 @@ void pci_default_write_config(PCIDevice *d,return ; } default_config: +if (pci_access_cap_config (d, address, len)) { + d->cap.config_write (d, address, val, len); +return ; + } +/* not efficient, but simple */ addr = address;for (i =0 ; i < len; i++) {
@@ -833,3 +892,29 @@ PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, s->bus =pci_register_secondary_bus (&s->dev, map_irq);return s->bus; } + +void pci_enable_capability_support (PCIDevice *pci_dev, +uint32_t config_start, +PCICapConfigReadFunc *config_read, +PCICapConfigWriteFunc *config_write, +PCICapConfigInitFunc *config_init) +{ +if (!pci_dev) +return ; + +if (config_start >=0x40 && config_start <0xff ) + pci_dev->cap.start = config_start; +else + pci_dev->cap.start =PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR ; +if (config_read) + pci_dev->cap.config_read = config_read; +else + pci_dev->cap.config_read = pci_default_cap_read_config; +if (config_write) + pci_dev->cap.config_write = config_write; +else + pci_dev->cap.config_write = pci_default_cap_write_config; + pci_dev->cap.supported =1 ; + pci_dev->config[0x34 ] = pci_dev->cap.start; +config_init (pci_dev); +}
qemu/hw/pci.h +30 -0
@@ -126,6 +126,12 @@ typedef void PCIMapIORegionFunc(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type);typedef int PCIUnregisterFunc (PCIDevice *pci_dev); +typedef void PCICapConfigWriteFunc (PCIDevice *pci_dev, +uint32_t address,uint32_t val,int len); +typedef uint32_t PCICapConfigReadFunc (PCIDevice *pci_dev, +uint32_t address,int len); +typedef void PCICapConfigInitFunc (PCIDevice *pci_dev); +#define PCI_ADDRESS_SPACE_MEM 0x00#define PCI_ADDRESS_SPACE_IO 0x01#define PCI_ADDRESS_SPACE_MEM_PREFETCH 0x08
@@ -176,6 +182,10 @@ typedef struct PCIIORegion {#define PCI_COMMAND_RESERVED_MASK_HI (PCI_COMMAND_RESERVED >> 8) +#define PCI_CAPABILITY_CONFIG_MAX_LENGTH 0x60 +#define PCI_CAPABILITY_CONFIG_DEFAULT_START_ADDR 0x40 +#define PCI_CAPABILITY_CONFIG_MSI_LENGTH 0x10 +struct PCIDevice {/* PCI config space */ uint8_t config[256 ];
@@ -198,6 +208,15 @@ struct PCIDevice {/* Current IRQ levels. Used internally by the generic PCI code. */ int irq_state[4 ]; + +/* Device capability configuration space */ +struct { +int supported; +uint8_t config[PCI_CAPABILITY_CONFIG_MAX_LENGTH ]; +unsigned int start, length; +PCICapConfigReadFunc *config_read; +PCICapConfigWriteFunc *config_write; + } cap; }; PCIDevice *pci_register_device(PCIBus *bus, const char *name,
@@ -211,6 +230,12 @@ void pci_register_io_region(PCIDevice *pci_dev, int region_num, uint32_t size, int type, PCIMapIORegionFunc *map_func); +void pci_enable_capability_support (PCIDevice *pci_dev, +uint32_t config_start, +PCICapConfigReadFunc *config_read, +PCICapConfigWriteFunc *config_write, +PCICapConfigInitFunc *config_init); +int pci_map_irq (PCIDevice *pci_dev,int pin);uint32_t pci_default_read_config (PCIDevice *d,uint32_t address,int len);
@@ -218,6 +243,11 @@ void pci_default_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len);void pci_device_save (PCIDevice *s,QEMUFile *f);int pci_device_load (PCIDevice *s,QEMUFile *f); +uint32_t pci_default_cap_read_config (PCIDevice *pci_dev, +uint32_t address,int len); +void pci_default_cap_write_config (PCIDevice *pci_dev, +uint32_t address,uint32_t val,int len); +int pci_access_cap_config (PCIDevice *pci_dev,uint32_t address,int len);typedef void (*pci_set_irq_fn )(qemu_irq *pic,int irq_num,int level);typedef int (*pci_map_irq_fn )(PCIDevice *pci_dev,int irq_num);
Signature · 1 line
1.5.4.5
PATCH v2 5/7 kvm: user interface for MSI type irq routing
In reply to Sheng Yang--- libkvm/libkvm.c | 98 ++++++++++++++++++++++++++++++++++++++++++++----------- libkvm/libkvm.h | 22 ++++++++++++ 2 files changed, 101 insertions(+), 19 deletions(-)
libkvm/libkvm.c +79 -19
@@ -1202,11 +1202,12 @@ int kvm_clear_gsi_routes(kvm_context_t kvm)#endif } -int kvm_add_irq_route (kvm_context_t kvm,int gsi,int irqchip,int pin) +int kvm_add_routing_entry (kvm_context_t kvm, +struct kvm_irq_routing_entry * entry) {#ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *z; -struct kvm_irq_routing_entry *e; +struct kvm_irq_routing_entry *new;int n, size;if (kvm->irq_routes->nr == kvm->nr_allocated_irq_routes) {
@@ -1214,7 +1215,7 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin)if (n <64 ) n =64 ; size =sizeof (struct kvm_irq_routing ); - size += n *sizeof (*e); + size += n *sizeof (*new); z =realloc (kvm->irq_routes, size);if (!z)return -ENOMEM ;
@@ -1222,34 +1223,77 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin) kvm->irq_routes = z; } n = kvm->irq_routes->nr++; - e = &kvm->irq_routes->entries[n]; -memset (e,0 ,sizeof (*e)); - e->gsi = gsi; - e->type =KVM_IRQ_ROUTING_IRQCHIP ; - e->flags =0 ; - e->u.irqchip.irqchip = irqchip; - e->u.irqchip.pin = pin; + new = &kvm->irq_routes->entries[n]; +memset (new,0 ,sizeof (*new)); + new->gsi = entry->gsi; + new->type = entry->type; + new->flags = entry->flags; + new->u = entry->u;return 0 ;#else return -ENOSYS ;#endif } -int kvm_del_irq_route (kvm_context_t kvm,int gsi,int irqchip,int pin) +int kvm_add_irq_route (kvm_context_t kvm,int gsi,int irqchip,int pin) +{ +#ifdef KVM_CAP_IRQ_ROUTING +struct kvm_irq_routing_entry e; + + e.gsi = gsi; + e.type =KVM_IRQ_ROUTING_IRQCHIP ; + e.flags =0 ; + e.u.irqchip.irqchip = irqchip; + e.u.irqchip.pin = pin; +return kvm_add_routing_entry (kvm, &e); +#else +return -ENOSYS ; +#endif +} + +int kvm_del_routing_entry (kvm_context_t kvm, +struct kvm_irq_routing_entry * entry) {#ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing_entry *e, *p; -int i; +int i, found =0 ;for (i =0 ; i < kvm->irq_routes->nr; ++i) { e = &kvm->irq_routes->entries[i]; -if (e->type ==KVM_IRQ_ROUTING_IRQCHIP - && e->gsi == gsi - && e->u.irqchip.irqchip == irqchip - && e->u.irqchip.pin == pin) { - p = &kvm->irq_routes->entries[--kvm->irq_routes->nr]; - *e = *p; -return 0 ; +if (e->type == entry->type + && e->gsi == entry->gsi) { +switch (e->type) + { +case KVM_IRQ_ROUTING_IRQCHIP : { +if (e->u.irqchip.irqchip == + entry->u.irqchip.irqchip + && e->u.irqchip.pin == + entry->u.irqchip.pin) { + p = &kvm->irq_routes-> + entries[--kvm->irq_routes->nr]; + *e = *p; + found =1 ; + } +break ; + } +case KVM_IRQ_ROUTING_MSI : { +if (e->u.msi.address_lo == + entry->u.msi.address_lo + && e->u.msi.address_hi == + entry->u.msi.address_hi + && e->u.msi.data == entry->u.msi.data) { + p = &kvm->irq_routes-> + entries[--kvm->irq_routes->nr]; + *e = *p; + found =1 ; + } +break ; + } +default : +break ; + } +if (found) +return 0 ; } }return -ESRCH ;
@@ -1258,6 +1302,22 @@ int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin)#endif } +int kvm_del_irq_route (kvm_context_t kvm,int gsi,int irqchip,int pin) +{ +#ifdef KVM_CAP_IRQ_ROUTING +struct kvm_irq_routing_entry e; + + e.gsi = gsi; + e.type =KVM_IRQ_ROUTING_IRQCHIP ; + e.flags =0 ; + e.u.irqchip.irqchip = irqchip; + e.u.irqchip.pin = pin; +return kvm_del_routing_entry (kvm, &e); +#else +return -ENOSYS ; +#endif +} +int kvm_commit_irq_routes (kvm_context_t kvm) {#ifdef KVM_CAP_IRQ_ROUTING
libkvm/libkvm.h +22 -0
@@ -790,6 +790,28 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin);int kvm_del_irq_route (kvm_context_t kvm,int gsi,int irqchip,int pin);/*! +* \brief Adds a routing entry to the temporary irq routing table +* +* Adds a filled routing entry to the temporary irq routing table. Nothing is +* committed to the running VM. +* +* \param kvm Pointer to the current kvm_context +*/ +int kvm_add_routing_entry (kvm_context_t kvm, +struct kvm_irq_routing_entry * entry); + +/*! +* \brief Removes a routing from the temporary irq routing table +* +* Remove a routing to the temporary irq routing table. Nothing is +* committed to the running VM. +* +* \param kvm Pointer to the current kvm_context +*/ +int kvm_del_routing_entry (kvm_context_t kvm, +struct kvm_irq_routing_entry * entry); + +/*! * \brief Commit the temporary irq routing table * * Commit the temporary irq routing table to the running VM.
Signature · 1 line
1.5.4.5
PATCH v2 6/7 kvm: libkvm: allocate unused gsi for irq routing
In reply to Sheng YangNotice here is a simple solution, can be replaced later.
--- libkvm/kvm-common.h | 1 + libkvm/libkvm.c | 10 ++++++++++ libkvm/libkvm.h | 8 ++++++++ 3 files changed, 19 insertions(+), 0 deletions(-)
libkvm/kvm-common.h +1 -0
@@ -64,6 +64,7 @@ struct kvm_context {#ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *irq_routes;int nr_allocated_irq_routes; +int max_used_gsi;#endif };
libkvm/libkvm.c +10 -0
@@ -1229,6 +1229,9 @@ int kvm_add_routing_entry(kvm_context_t kvm, new->type = entry->type; new->flags = entry->flags; new->u = entry->u; + +if (entry->gsi > kvm->max_used_gsi) + kvm->max_used_gsi = entry->gsi;return 0 ;#else return -ENOSYS ;
@@ -1332,3 +1335,10 @@ int kvm_commit_irq_routes(kvm_context_t kvm)return -ENOSYS ;#endif } + +int kvm_get_irq_route_gsi (kvm_context_t kvm) +{ +return (kvm->max_used_gsi >=KVM_IOAPIC_NUM_PINS ) ? + kvm->max_used_gsi :KVM_IOAPIC_NUM_PINS ; +} +
libkvm/libkvm.h +8 -0
@@ -820,4 +820,12 @@ int kvm_del_routing_entry(kvm_context_t kvm,*/ int kvm_commit_irq_routes (kvm_context_t kvm); +/*! +* \brief Get unused GSI number for irq routing table +* +* Get unused GSI number for irq routing table +* +* \param kvm Pointer to the current kvm_context +*/ +int kvm_get_irq_route_gsi (kvm_context_t kvm);#endif
Signature · 1 line
1.5.4.5
PATCH v2 7/7 kvm: expose MSI capability to guest
In reply to Sheng Yang--- qemu/hw/device-assignment.c | 112 ++++++++++++++++++++++++++++++++++++++++--- qemu/hw/device-assignment.h | 7 +++ 2 files changed, 112 insertions(+), 7 deletions(-)
qemu/hw/device-assignment.c +105 -7
@@ -265,7 +265,8 @@ static void assigned_dev_pci_write_config(PCIDevice *d, uint32_t address, }if ((address >=0x10 && address <=0x24 ) || address ==0x34 || - address ==0x3c || address ==0x3d ) { + address ==0x3c || address ==0x3d || +pci_access_cap_config (d, address, len)) {/* used for update-mappings (BAR emulation) */ pci_default_write_config (d, address, val, len);return ;
@@ -299,7 +300,8 @@ static uint32_t assigned_dev_pci_read_config(PCIDevice *d, uint32_t address,AssignedDevice *pci_dev =container_of (d, AssignedDevice, dev);if ((address >=0x10 && address <=0x24 ) || address ==0x34 || - address ==0x3c || address ==0x3d ) { + address ==0x3c || address ==0x3d || +pci_access_cap_config (d, address, len)) { val =pci_default_read_config (d, address, len);DEBUG ("(%x.%x): address=%04x val=0x%08x len=%d\n" , (d->devfn >>3 ) &0x1F , (d->devfn &0x7 ), address, val, len);
@@ -328,11 +330,13 @@ do_log:DEBUG ("(%x.%x): address=%04x val=0x%08x len=%d\n" , (d->devfn >>3 ) &0x1F , (d->devfn &0x7 ), address, val, len); -/* kill the special capabilities */ -if (address ==4 && len ==4 ) - val &= ~0x100000 ; -else if (address ==6 ) - val &= ~0x10 ; +if (!pci_dev->cap.available) { +/* kill the special capabilities */ +if (address ==4 && len ==4 ) + val &= ~0x100000 ; +else if (address ==6 ) + val &= ~0x10 ; + }return val; }
@@ -564,6 +568,96 @@ void assigned_dev_update_irqs() } } +#if defined(KVM_CAP_DEVICE_MSI ) && defined (KVM_CAP_IRQ_ROUTING ) +static void assigned_dev_update_msi (PCIDevice *pci_dev,unsigned int ctrl_pos) +{ +struct kvm_assigned_irq assigned_irq_data; +struct kvm_irq_routing_entry gsi_entry; +AssignedDevice *assigned_dev =container_of (pci_dev, AssignedDevice, dev); +uint8_t ctrl_byte = 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); + +if (ctrl_byte &PCI_MSI_FLAGS_ENABLE ) { + gsi_entry.u.msi.address_lo = *(uint32_t *)(pci_dev->cap.config + +PCI_MSI_ADDRESS_LO ); + gsi_entry.u.msi.address_hi =0 ; + gsi_entry.u.msi.data = *(uint16_t *)(pci_dev->cap.config + +PCI_MSI_DATA_32 ); + gsi_entry.type =KVM_IRQ_ROUTING_MSI ; + gsi_entry.gsi =kvm_get_irq_route_gsi (kvm_context); +kvm_add_routing_entry (kvm_context, &gsi_entry); +if (kvm_commit_irq_routes (kvm_context) <0 ) { +perror ("assigned_dev_enable_msi: kvm_commit_irq_routes" ); + assigned_dev->cap.state &= ~ASSIGNED_DEVICE_MSI_ENABLED ; +return ; + } + assigned_irq_data.guest_irq = gsi_entry.gsi; + assigned_irq_data.flags =KVM_DEV_IRQ_ASSIGN_ENABLE_MSI ; + }else { + assigned_irq_data.guest_irq = assigned_dev->girq; + } + +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_MSI ) { + assigned_dev->cap.state |=ASSIGNED_DEVICE_MSI_ENABLED ; + pci_dev->cap.config[ctrl_pos] |=PCI_MSI_FLAGS_ENABLE ; + }else { + assigned_dev->cap.state &= ~ASSIGNED_DEVICE_MSI_ENABLED ; + pci_dev->cap.config[ctrl_pos] &= ~PCI_MSI_FLAGS_ENABLE ; + } +} +#endif + +void assigned_device_pci_cap_write_config (PCIDevice *pci_dev,uint32_t address, +uint32_t val,int len) +{ +AssignedDevice *assigned_dev =container_of (pci_dev, AssignedDevice, dev); +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_IRQ_ROUTING ) +if (assigned_dev->cap.available &ASSIGNED_DEVICE_CAP_MSI ) { + ctrl_pos = pos +PCI_MSI_FLAGS ; +if (address <= ctrl_pos && address + len > ctrl_pos) +assigned_dev_update_msi (pci_dev, ctrl_pos - pci_dev->cap.start); + pos +=PCI_CAPABILITY_CONFIG_MSI_LENGTH ; + } +#endif +return ; +} + +static void assigned_device_pci_cap_init (PCIDevice *pci_dev) +{ +AssignedDevice *dev =container_of (pci_dev, AssignedDevice, dev); +int next_cap_pt; +struct pci_access *pacc; +int h_bus, h_dev, h_func; + + pci_dev->cap.length =0 ; + h_bus = dev->h_busnr; + h_dev = dev->h_devfn >>3 ; + h_func = dev->h_devfn &0x07 ; + pacc =pci_alloc (); +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_IRQ_ROUTING ) +/* Expose MSI capability +* MSI capability is the 1st capability in cap.config */ +if (pci_find_cap_offset (dev->pdev,PCI_CAP_ID_MSI )) { + dev->cap.available |=ASSIGNED_DEVICE_CAP_MSI ; + pci_dev->cap.config[pci_dev->cap.length] =PCI_CAP_ID_MSI ; + pci_dev->cap.length +=PCI_CAPABILITY_CONFIG_MSI_LENGTH ; + next_cap_pt =1 ; + } +#endif +} +struct PCIDevice *init_assigned_device (AssignedDevInfo *adev,PCIBus *bus) {int r;
@@ -631,6 +725,10 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus)return NULL ; } +pci_enable_capability_support (pci_dev,0 ,NULL , + assigned_device_pci_cap_write_config, + assigned_device_pci_cap_init); +return &dev->dev; }
qemu/hw/device-assignment.h +7 -0
@@ -81,6 +81,13 @@ typedef struct {unsigned char h_busnr;unsigned int h_devfn;int bound; +struct pci_dev *pdev; +struct { +#define ASSIGNED_DEVICE_CAP_MSI (1 << 0) +uint32_t available; +#define ASSIGNED_DEVICE_MSI_ENABLED (1 << 0) +uint32_t state; + } cap; } AssignedDevice;typedef struct AssignedDevInfo AssignedDevInfo ;
Signature · 1 line
1.5.4.5