mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kvm: Pass PCI device pointer to MSI routing functions

Browse Source 
In-kernel ITS emulation on ARM64 will require to supply requester IDs.
These IDs can now be retrieved from the device pointer using new
pci_requester_id() function.

This patch adds pci_dev pointer to KVM GSI routing functions and makes
callers passing it.

x86 architecture does not use requester IDs, but hw/i386/kvm/pci-assign.c
also made passing PCI device pointer instead of NULL for consistency with
the rest of the code.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Message-Id: <ce081423ba2394a4efc30f30708fca07656bc500.1444916432.git.p.fedin@samsung.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Pavel Fedin 2015-10-15 16:44:52 +03:00 committed by Paolo Bonzini
parent a05f686ff3
commit dc9f06ca81
11 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/i386/kvm/pci-assign.c
View File

@ -979,7 +979,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev)
MSIMessage msg = msi_get_message(pci_dev, 0); MSIMessage msg = msi_get_message(pci_dev, 0);
int virq; int virq;
virq = kvm_irqchip_add_msi_route(kvm_state, msg); virq = kvm_irqchip_add_msi_route(kvm_state, msg, pci_dev);
if (virq < 0) { if (virq < 0) {
perror("assigned_dev_update_msi: kvm_irqchip_add_msi_route"); perror("assigned_dev_update_msi: kvm_irqchip_add_msi_route");
return; return;
@ -1017,7 +1017,7 @@ static void assigned_dev_update_msi_msg(PCIDevice *pci_dev)
} }
kvm_irqchip_update_msi_route(kvm_state, assigned_dev->msi_virq[0], kvm_irqchip_update_msi_route(kvm_state, assigned_dev->msi_virq[0],
msi_get_message(pci_dev, 0)); msi_get_message(pci_dev, 0), pci_dev);
} }
static bool assigned_dev_msix_masked(MSIXTableEntry *entry) static bool assigned_dev_msix_masked(MSIXTableEntry *entry)
@ -1083,7 +1083,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev)
msg.address = entry->addr_lo | ((uint64_t)entry->addr_hi << 32); msg.address = entry->addr_lo | ((uint64_t)entry->addr_hi << 32);
msg.data = entry->data; msg.data = entry->data;
r = kvm_irqchip_add_msi_route(kvm_state, msg); r = kvm_irqchip_add_msi_route(kvm_state, msg, pci_dev);
if (r < 0) { if (r < 0) {
return r; return r;
} }
@ -1602,7 +1602,8 @@ static void assigned_dev_msix_mmio_write(void *opaque, hwaddr addr,
msg.data = entry->data; msg.data = entry->data;
ret = kvm_irqchip_update_msi_route(kvm_state, ret = kvm_irqchip_update_msi_route(kvm_state,
adev->msi_virq[i], msg); adev->msi_virq[i], msg,
pdev);
if (ret) { if (ret) {
error_report("Error updating irq routing entry (%d)", ret); error_report("Error updating irq routing entry (%d)", ret);
} }

11
hw/vfio/pci.c
View File

@ -424,7 +424,7 @@ static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,
return; return;
} }
virq = kvm_irqchip_add_msi_route(kvm_state, *msg); virq = kvm_irqchip_add_msi_route(kvm_state, *msg, &vdev->pdev);
if (virq < 0) { if (virq < 0) {
event_notifier_cleanup(&vector->kvm_interrupt); event_notifier_cleanup(&vector->kvm_interrupt);
return; return;
@ -449,9 +449,10 @@ static void vfio_remove_kvm_msi_virq(VFIOMSIVector *vector)
event_notifier_cleanup(&vector->kvm_interrupt); event_notifier_cleanup(&vector->kvm_interrupt);
} }
static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg) static void vfio_update_kvm_msi_virq(VFIOMSIVector *vector, MSIMessage msg,
PCIDevice *pdev)
{ {
kvm_irqchip_update_msi_route(kvm_state, vector->virq, msg); kvm_irqchip_update_msi_route(kvm_state, vector->virq, msg, pdev);
} }
static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
@ -486,7 +487,7 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
if (!msg) { if (!msg) {
vfio_remove_kvm_msi_virq(vector); vfio_remove_kvm_msi_virq(vector);
} else { } else {
vfio_update_kvm_msi_virq(vector, *msg); vfio_update_kvm_msi_virq(vector, *msg, pdev);
} }
} else { } else {
vfio_add_kvm_msi_virq(vdev, vector, msg, true); vfio_add_kvm_msi_virq(vdev, vector, msg, true);
@ -760,7 +761,7 @@ static void vfio_update_msi(VFIOPCIDevice *vdev)
} }
msg = msi_get_message(&vdev->pdev, i); msg = msi_get_message(&vdev->pdev, i);
vfio_update_kvm_msi_virq(vector, msg); vfio_update_kvm_msi_virq(vector, msg, &vdev->pdev);
} }
} }

5
hw/virtio/virtio-pci.c
View File

@ -590,7 +590,7 @@ static int kvm_virtio_pci_vq_vector_use(VirtIOPCIProxy *proxy,
int ret; int ret;
if (irqfd->users == 0) { if (irqfd->users == 0) {
ret = kvm_irqchip_add_msi_route(kvm_state, msg); ret = kvm_irqchip_add_msi_route(kvm_state, msg, &proxy->pci_dev);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -726,7 +726,8 @@ static int virtio_pci_vq_vector_unmask(VirtIOPCIProxy *proxy,
if (proxy->vector_irqfd) { if (proxy->vector_irqfd) {
irqfd = &proxy->vector_irqfd[vector]; irqfd = &proxy->vector_irqfd[vector];
if (irqfd->msg.data != msg.data || irqfd->msg.address != msg.address) { if (irqfd->msg.data != msg.data || irqfd->msg.address != msg.address) {
ret = kvm_irqchip_update_msi_route(kvm_state, irqfd->virq, msg); ret = kvm_irqchip_update_msi_route(kvm_state, irqfd->virq, msg,
&proxy->pci_dev);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }

7
include/sysemu/kvm.h
View File

@ -326,7 +326,7 @@ int kvm_arch_on_sigbus(int code, void *addr);
void kvm_arch_init_irq_routing(KVMState *s); void kvm_arch_init_irq_routing(KVMState *s);
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data); uint64_t address, uint32_t data, PCIDevice *dev);
int kvm_arch_msi_data_to_gsi(uint32_t data); int kvm_arch_msi_data_to_gsi(uint32_t data);
@ -451,8 +451,9 @@ static inline void cpu_clean_state(CPUState *cpu)
} }
} }
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg); int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg, PCIDevice *dev);
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg); int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
PCIDevice *dev);
void kvm_irqchip_release_virq(KVMState *s, int virq); void kvm_irqchip_release_virq(KVMState *s, int virq);
int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter); int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter);

9
kvm-all.c
View File

@ -1189,7 +1189,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
return kvm_set_irq(s, route->kroute.gsi, 1); return kvm_set_irq(s, route->kroute.gsi, 1);
} }
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg, PCIDevice *dev)
{ {
struct kvm_irq_routing_entry kroute = {}; struct kvm_irq_routing_entry kroute = {};
int virq; int virq;
@ -1213,7 +1213,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
kroute.u.msi.address_lo = (uint32_t)msg.address; kroute.u.msi.address_lo = (uint32_t)msg.address;
kroute.u.msi.address_hi = msg.address >> 32; kroute.u.msi.address_hi = msg.address >> 32;
kroute.u.msi.data = le32_to_cpu(msg.data); kroute.u.msi.data = le32_to_cpu(msg.data);
if (kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data)) { if (kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data, dev)) {
kvm_irqchip_release_virq(s, virq); kvm_irqchip_release_virq(s, virq);
return -EINVAL; return -EINVAL;
} }
@ -1224,7 +1224,8 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
return virq; return virq;
} }
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
PCIDevice *dev)
{ {
struct kvm_irq_routing_entry kroute = {}; struct kvm_irq_routing_entry kroute = {};
@ -1242,7 +1243,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg)
kroute.u.msi.address_lo = (uint32_t)msg.address; kroute.u.msi.address_lo = (uint32_t)msg.address;
kroute.u.msi.address_hi = msg.address >> 32; kroute.u.msi.address_hi = msg.address >> 32;
kroute.u.msi.data = le32_to_cpu(msg.data); kroute.u.msi.data = le32_to_cpu(msg.data);
if (kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data)) { if (kvm_arch_fixup_msi_route(&kroute, msg.address, msg.data, dev)) {
return -EINVAL; return -EINVAL;
} }

5
kvm-stub.c
View File

@ -115,7 +115,7 @@ int kvm_on_sigbus(int code, void *addr)
} }
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg) int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg, PCIDevice *dev)
{ {
return -ENOSYS; return -ENOSYS;
} }
@ -128,7 +128,8 @@ void kvm_irqchip_release_virq(KVMState *s, int virq)
{ {
} }
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg) int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,
PCIDevice *dev)
{ {
return -ENOSYS; return -ENOSYS;
} }

2
target-arm/kvm.c
View File

@ -605,7 +605,7 @@ int kvm_arm_vgic_probe(void)
} }
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data) uint64_t address, uint32_t data, PCIDevice *dev)
{ {
return 0; return 0;
} }

2
target-i386/kvm.c
View File

@ -2992,7 +2992,7 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id)
} }
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data) uint64_t address, uint32_t data, PCIDevice *dev)
{ {
return 0; return 0;
} }

2
target-mips/kvm.c
View File

@ -678,7 +678,7 @@ int kvm_arch_get_registers(CPUState *cs)
} }
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data) uint64_t address, uint32_t data, PCIDevice *dev)
{ {
return 0; return 0;
} }

2
target-ppc/kvm.c
View File

@ -2483,7 +2483,7 @@ error_out:
} }
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data) uint64_t address, uint32_t data, PCIDevice *dev)
{ {
return 0; return 0;
} }

2
target-s390x/kvm.c
View File

@ -2208,7 +2208,7 @@ int kvm_s390_vcpu_interrupt_post_load(S390CPU *cpu)
} }
int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route, int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
uint64_t address, uint32_t data) uint64_t address, uint32_t data, PCIDevice *dev)
{ {
S390PCIBusDevice *pbdev; S390PCIBusDevice *pbdev;
uint32_t fid = data >> ZPCI_MSI_VEC_BITS; uint32_t fid = data >> ZPCI_MSI_VEC_BITS;