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

vfio: add vfio_device_get_irq_info() helper

Browse source 
Add a helper similar to vfio_device_get_region_info() and use it
everywhere.

Replace a couple of needless allocations with stack variables.

As a side-effect, this fixes a minor error reporting issue in the call
from vfio_msix_early_setup().

Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: John Levon <john.levon@nutanix.com>
Link: https://lore.kernel.org/qemu-devel/20250507152020.1254632-5-john.levon@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
John Levon 2025-05-07 16:20:09 +01:00 • committed by Cédric Le Goater
parent ef73671f0b
commit 5321e623eb
6 changed files with 53 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hw/vfio/ap.c
View file

@ -74,10 +74,10 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
unsigned int irq, Error **errp) unsigned int irq, Error **errp)
{ {
int fd; int fd;
size_t argsz; int ret;
IOHandler *fd_read; IOHandler *fd_read;
EventNotifier *notifier; EventNotifier *notifier;
g_autofree struct vfio_irq_info *irq_info = NULL; struct vfio_irq_info irq_info;
VFIODevice *vdev = &vapdev->vdev; VFIODevice *vdev = &vapdev->vdev;
switch (irq) { switch (irq) {
@ -96,14 +96,15 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
return false; return false;
} }
argsz = sizeof(*irq_info); ret = vfio_device_get_irq_info(vdev, irq, &irq_info);
irq_info = g_malloc0(argsz);
irq_info->index = irq;
irq_info->argsz = argsz;
if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, if (ret < 0) {
irq_info) < 0 || irq_info->count < 1) { error_setg_errno(errp, -ret, "vfio: Error getting irq info");
error_setg_errno(errp, errno, "vfio: Error getting irq info"); return false;
}
if (irq_info.count < 1) {
error_setg(errp, "vfio: Error getting irq info, count=0");
return false; return false;
} }

20
hw/vfio/ccw.c
View file

@ -376,8 +376,8 @@ static bool vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
Error **errp) Error **errp)
{ {
VFIODevice *vdev = &vcdev->vdev; VFIODevice *vdev = &vcdev->vdev;
g_autofree struct vfio_irq_info *irq_info = NULL; struct vfio_irq_info irq_info;
size_t argsz; int ret;
int fd; int fd;
EventNotifier *notifier; EventNotifier *notifier;
IOHandler *fd_read; IOHandler *fd_read;
@ -406,13 +406,15 @@ static bool vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
return false; return false;
} }
argsz = sizeof(*irq_info); ret = vfio_device_get_irq_info(vdev, irq, &irq_info);
irq_info = g_malloc0(argsz);
irq_info->index = irq; if (ret < 0) {
irq_info->argsz = argsz; error_setg_errno(errp, -ret, "vfio: Error getting irq info");
if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, return false;
irq_info) < 0 || irq_info->count < 1) { }
error_setg_errno(errp, errno, "vfio: Error getting irq info");
if (irq_info.count < 1) {
error_setg(errp, "vfio: Error getting irq info, count=0");
return false; return false;
} }

15
hw/vfio/device.c
View file

@ -185,6 +185,21 @@ bool vfio_device_irq_set_signaling(VFIODevice *vbasedev, int index, int subindex
return false; return false;
} }
int vfio_device_get_irq_info(VFIODevice *vbasedev, int index,
struct vfio_irq_info *info)
{
int ret;
memset(info, 0, sizeof(*info));
info->argsz = sizeof(*info);
info->index = index;
ret = ioctl(vbasedev->fd, VFIO_DEVICE_GET_IRQ_INFO, info);
return ret < 0 ? -errno : ret;
}
int vfio_device_get_region_info(VFIODevice *vbasedev, int index, int vfio_device_get_region_info(VFIODevice *vbasedev, int index,
struct vfio_region_info **info) struct vfio_region_info **info)
{ {

23
hw/vfio/pci.c
View file

@ -1555,8 +1555,7 @@ static bool vfio_msix_early_setup(VFIOPCIDevice *vdev, Error **errp)
uint16_t ctrl; uint16_t ctrl;
uint32_t table, pba; uint32_t table, pba;
int ret, fd = vdev->vbasedev.fd; int ret, fd = vdev->vbasedev.fd;
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info), struct vfio_irq_info irq_info;
.index = VFIO_PCI_MSIX_IRQ_INDEX };
VFIOMSIXInfo *msix; VFIOMSIXInfo *msix;
pos = pci_find_capability(&vdev->pdev, PCI_CAP_ID_MSIX); pos = pci_find_capability(&vdev->pdev, PCI_CAP_ID_MSIX);
@ -1593,7 +1592,8 @@ static bool vfio_msix_early_setup(VFIOPCIDevice *vdev, Error **errp)
msix->pba_offset = pba & ~PCI_MSIX_FLAGS_BIRMASK; msix->pba_offset = pba & ~PCI_MSIX_FLAGS_BIRMASK;
msix->entries = (ctrl & PCI_MSIX_FLAGS_QSIZE) + 1; msix->entries = (ctrl & PCI_MSIX_FLAGS_QSIZE) + 1;
ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info); ret = vfio_device_get_irq_info(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX,
&irq_info);
if (ret < 0) { if (ret < 0) {
error_setg_errno(errp, -ret, "failed to get MSI-X irq info"); error_setg_errno(errp, -ret, "failed to get MSI-X irq info");
g_free(msix); g_free(msix);
@ -2736,7 +2736,7 @@ static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
{ {
VFIODevice *vbasedev = &vdev->vbasedev; VFIODevice *vbasedev = &vdev->vbasedev;
g_autofree struct vfio_region_info *reg_info = NULL; g_autofree struct vfio_region_info *reg_info = NULL;
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) }; struct vfio_irq_info irq_info;
int i, ret = -1; int i, ret = -1;
/* Sanity check device */ /* Sanity check device */
@ -2797,12 +2797,10 @@ static bool vfio_populate_device(VFIOPCIDevice *vdev, Error **errp)
} }
} }
irq_info.index = VFIO_PCI_ERR_IRQ_INDEX; ret = vfio_device_get_irq_info(vbasedev, VFIO_PCI_ERR_IRQ_INDEX, &irq_info);
ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info);
if (ret) { if (ret) {
/* This can fail for an old kernel or legacy PCI dev */ /* This can fail for an old kernel or legacy PCI dev */
trace_vfio_populate_device_get_irq_info_failure(strerror(errno)); trace_vfio_populate_device_get_irq_info_failure(strerror(-ret));
} else if (irq_info.count == 1) { } else if (irq_info.count == 1) {
vdev->pci_aer = true; vdev->pci_aer = true;
} else { } else {
@ -2911,17 +2909,18 @@ static void vfio_req_notifier_handler(void *opaque)
static void vfio_register_req_notifier(VFIOPCIDevice *vdev) static void vfio_register_req_notifier(VFIOPCIDevice *vdev)
{ {
struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info), struct vfio_irq_info irq_info;
.index = VFIO_PCI_REQ_IRQ_INDEX };
Error *err = NULL; Error *err = NULL;
int32_t fd; int32_t fd;
int ret;
if (!(vdev->features & VFIO_FEATURE_ENABLE_REQ)) { if (!(vdev->features & VFIO_FEATURE_ENABLE_REQ)) {
return; return;
} }
if (ioctl(vdev->vbasedev.fd, ret = vfio_device_get_irq_info(&vdev->vbasedev, VFIO_PCI_REQ_IRQ_INDEX,
VFIO_DEVICE_GET_IRQ_INFO, &irq_info) < 0 || irq_info.count < 1) { &irq_info);
if (ret < 0 || irq_info.count < 1) {
return; return;
} }

6
hw/vfio/platform.c
View file

@ -474,10 +474,10 @@ static bool vfio_populate_device(VFIODevice *vbasedev, Error **errp)
QSIMPLEQ_INIT(&vdev->pending_intp_queue); QSIMPLEQ_INIT(&vdev->pending_intp_queue);
for (i = 0; i < vbasedev->num_irqs; i++) { for (i = 0; i < vbasedev->num_irqs; i++) {
struct vfio_irq_info irq = { .argsz = sizeof(irq) }; struct vfio_irq_info irq;
ret = vfio_device_get_irq_info(vbasedev, i, &irq);
irq.index = i;
ret = ioctl(vbasedev->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);
if (ret) { if (ret) {
error_setg_errno(errp, -ret, "failed to get device irq info"); error_setg_errno(errp, -ret, "failed to get device irq info");
goto irq_err; goto irq_err;

3
include/hw/vfio/vfio-device.h
View file

@ -147,6 +147,9 @@ int vfio_device_get_region_info(VFIODevice *vbasedev, int index,
int vfio_device_get_region_info_type(VFIODevice *vbasedev, uint32_t type, int vfio_device_get_region_info_type(VFIODevice *vbasedev, uint32_t type,
uint32_t subtype, struct vfio_region_info **info); uint32_t subtype, struct vfio_region_info **info);
bool vfio_device_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type); bool vfio_device_has_region_cap(VFIODevice *vbasedev, int region, uint16_t cap_type);
int vfio_device_get_irq_info(VFIODevice *vbasedev, int index,
struct vfio_irq_info *info);
#endif #endif
/* Returns 0 on success, or a negative errno. */ /* Returns 0 on success, or a negative errno. */