motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 09:43:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

vfio/pci: export MSI functions

Browse source 
Export various MSI functions, renamed with a vfio_pci prefix, for use by
CPR in subsequent patches.  No functional change.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/1749569991-25171-18-git-send-email-steven.sistare@oracle.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Steve Sistare 2025-06-10 08:39:30 -07:00 • committed by Cédric Le Goater
parent 6d7696f329
commit 6f06e3729a
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
hw/vfio/pci.c
View file

@ -351,6 +351,11 @@ static void vfio_intx_disable(VFIOPCIDevice *vdev)
trace_vfio_intx_disable(vdev->vbasedev.name); trace_vfio_intx_disable(vdev->vbasedev.name);
} }
bool vfio_pci_intx_enable(VFIOPCIDevice *vdev, Error **errp)
{
return vfio_intx_enable(vdev, errp);
}
/* /*
* MSI/X * MSI/X
*/ */
@ -475,8 +480,8 @@ static int vfio_enable_vectors(VFIOPCIDevice *vdev, bool msix)
return ret; return ret;
} }
static void vfio_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector, void vfio_pci_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,
int vector_n, bool msix) int vector_n, bool msix)
{ {
if ((msix && vdev->no_kvm_msix) || (!msix && vdev->no_kvm_msi)) { if ((msix && vdev->no_kvm_msix) || (!msix && vdev->no_kvm_msi)) {
return; return;
@ -549,7 +554,7 @@ static void set_irq_signalling(VFIODevice *vbasedev, VFIOMSIVector *vector,
} }
} }
static void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr) void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr)
{ {
VFIOMSIVector *vector = &vdev->msi_vectors[nr]; VFIOMSIVector *vector = &vdev->msi_vectors[nr];
PCIDevice *pdev = &vdev->pdev; PCIDevice *pdev = &vdev->pdev;
@ -599,10 +604,10 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,
} else { } else {
if (msg) { if (msg) {
if (vdev->defer_kvm_irq_routing) { if (vdev->defer_kvm_irq_routing) {
vfio_add_kvm_msi_virq(vdev, vector, nr, true); vfio_pci_add_kvm_msi_virq(vdev, vector, nr, true);
} else { } else {
vfio_route_change = kvm_irqchip_begin_route_changes(kvm_state); vfio_route_change = kvm_irqchip_begin_route_changes(kvm_state);
vfio_add_kvm_msi_virq(vdev, vector, nr, true); vfio_pci_add_kvm_msi_virq(vdev, vector, nr, true);
kvm_irqchip_commit_route_changes(&vfio_route_change); kvm_irqchip_commit_route_changes(&vfio_route_change);
vfio_connect_kvm_msi_virq(vector, nr); vfio_connect_kvm_msi_virq(vector, nr);
} }
@ -681,14 +686,14 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)
} }
} }
static void vfio_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev) void vfio_pci_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev)
{ {
assert(!vdev->defer_kvm_irq_routing); assert(!vdev->defer_kvm_irq_routing);
vdev->defer_kvm_irq_routing = true; vdev->defer_kvm_irq_routing = true;
vfio_route_change = kvm_irqchip_begin_route_changes(kvm_state); vfio_route_change = kvm_irqchip_begin_route_changes(kvm_state);
} }
static void vfio_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev) void vfio_pci_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev)
{ {
int i; int i;
@ -718,14 +723,14 @@ static void vfio_msix_enable(VFIOPCIDevice *vdev)
* routes once rather than per vector provides a substantial * routes once rather than per vector provides a substantial
* performance improvement. * performance improvement.
*/ */
vfio_prepare_kvm_msi_virq_batch(vdev); vfio_pci_prepare_kvm_msi_virq_batch(vdev);
if (msix_set_vector_notifiers(&vdev->pdev, vfio_msix_vector_use, if (msix_set_vector_notifiers(&vdev->pdev, vfio_msix_vector_use,
vfio_msix_vector_release, NULL)) { vfio_msix_vector_release, NULL)) {
error_report("vfio: msix_set_vector_notifiers failed"); error_report("vfio: msix_set_vector_notifiers failed");
} }
vfio_commit_kvm_msi_virq_batch(vdev); vfio_pci_commit_kvm_msi_virq_batch(vdev);
if (vdev->nr_vectors) { if (vdev->nr_vectors) {
ret = vfio_enable_vectors(vdev, true); ret = vfio_enable_vectors(vdev, true);
@ -769,7 +774,7 @@ retry:
* Deferring to commit the KVM routes once rather than per vector * Deferring to commit the KVM routes once rather than per vector
* provides a substantial performance improvement. * provides a substantial performance improvement.
*/ */
vfio_prepare_kvm_msi_virq_batch(vdev); vfio_pci_prepare_kvm_msi_virq_batch(vdev);
vdev->msi_vectors = g_new0(VFIOMSIVector, vdev->nr_vectors); vdev->msi_vectors = g_new0(VFIOMSIVector, vdev->nr_vectors);
@ -793,10 +798,10 @@ retry:
* Attempt to enable route through KVM irqchip, * Attempt to enable route through KVM irqchip,
* default to userspace handling if unavailable. * default to userspace handling if unavailable.
*/ */
vfio_add_kvm_msi_virq(vdev, vector, i, false); vfio_pci_add_kvm_msi_virq(vdev, vector, i, false);
} }
vfio_commit_kvm_msi_virq_batch(vdev); vfio_pci_commit_kvm_msi_virq_batch(vdev);
/* Set interrupt type prior to possible interrupts */ /* Set interrupt type prior to possible interrupts */
vdev->interrupt = VFIO_INT_MSI; vdev->interrupt = VFIO_INT_MSI;

8
hw/vfio/pci.h
View file

@ -210,6 +210,14 @@ static inline bool vfio_is_vga(VFIOPCIDevice *vdev)
return class == PCI_CLASS_DISPLAY_VGA; return class == PCI_CLASS_DISPLAY_VGA;
} }
/* MSI/MSI-X/INTx */
void vfio_pci_vector_init(VFIOPCIDevice *vdev, int nr);
void vfio_pci_add_kvm_msi_virq(VFIOPCIDevice *vdev, VFIOMSIVector *vector,
int vector_n, bool msix);
void vfio_pci_prepare_kvm_msi_virq_batch(VFIOPCIDevice *vdev);
void vfio_pci_commit_kvm_msi_virq_batch(VFIOPCIDevice *vdev);
bool vfio_pci_intx_enable(VFIOPCIDevice *vdev, Error **errp);
uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len); uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len);
void vfio_pci_write_config(PCIDevice *pdev, void vfio_pci_write_config(PCIDevice *pdev,
uint32_t addr, uint32_t val, int len); uint32_t addr, uint32_t val, int len);