vfio/common: Introduce vfio_set_irq_signaling helper
PATCH v5 1/1 vfio/common: Introduce vfio_set_irq_signaling helper
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an ACTION_TRIGGER, ACTION_MASK or ACTION_UNMASK action.
In the error message, we now use errno in case of any VFIO_DEVICE_SET_IRQS ioctl failure.
---
v4 -> v5:
- output errno instead of ioctl returned value. Issue reported by Li
- vfio_set_irq_signaling now returns -errno in case of failure
- update the commit message
v3 -> v4:
- renamed irq_to_str into index_to_str
- avoid usage of g_strdup_printf
- print both the index and subindex in generic case
v2 -> v3:
- irq_to_str() simply outputs the IRQ index if the VFIO device is not of PCI type
- removed "vfio: failed to start eventfd signaling ../.." in vfio_platform
v1 -> v2:
- don't call GET_IRQ_INFO in vfio_set_irq_signaling() and restore quiet check in vfio_register_req_notifier. Nicer display of the IRQ name.
This is a follow-up to
[PATCH v2 0/2] vfio-pci: Introduce vfio_set_event_handler(). It looks to me that introducing vfio_set_irq_signaling() has more benefits in term of code reduction and the helper abstraction looks cleaner.
--- hw/vfio/common.c | 78 ++++++++++++ hw/vfio/pci.c | 217 ++++++++-------------------------- hw/vfio/platform.c | 62 ++++------ include/hw/vfio/vfio-common.h | 2 + 4 files changed, 151 insertions(+), 208 deletions(-)
hw/vfio/common.c +78 -0
@@ -95,6 +95,84 @@ void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index)ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); } +static inline const char *action_to_str (int action) +{ +switch (action) { +case VFIO_IRQ_SET_ACTION_MASK : +return "MASK" ; +case VFIO_IRQ_SET_ACTION_UNMASK : +return "UNMASK" ; +case VFIO_IRQ_SET_ACTION_TRIGGER : +return "TRIGGER" ; +default : +return "UNKNOWN ACTION" ; + } +} + +static const char *index_to_str (VFIODevice *vbasedev,int index) +{ +if (vbasedev->type !=VFIO_DEVICE_TYPE_PCI ) { +return NULL ; + } + +switch (index) { +case VFIO_PCI_INTX_IRQ_INDEX : +return "INTX" ; +case VFIO_PCI_MSI_IRQ_INDEX : +return "MSI" ; +case VFIO_PCI_MSIX_IRQ_INDEX : +return "MSIX" ; +case VFIO_PCI_ERR_IRQ_INDEX : +return "ERR" ; +case VFIO_PCI_REQ_IRQ_INDEX : +return "REQ" ; +default : +return NULL ; + } +} + +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) +{ +struct vfio_irq_set *irq_set; +int argsz, ret =0 ; +const char *name; +int32_t *pfd; + + argsz =sizeof (*irq_set) +sizeof (*pfd); + + irq_set =g_malloc0 (argsz); + irq_set->argsz = argsz; + irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index = index; + irq_set->start = subindex; + irq_set->count =1 ; + pfd = (int32_t *)&irq_set->data; + *pfd = fd; + +if (ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { + ret = -errno; + } +g_free (irq_set); + +if (!ret) { +return 0 ; + } + +error_setg_errno (errp, -ret,"VFIO_DEVICE_SET_IRQS failure" ); + + name =index_to_str (vbasedev, index); +if (name) { +error_prepend (errp,"%s-%d: " , name, subindex); + }else { +error_prepend (errp,"index %d-%d: " , index, subindex); + } +error_prepend (errp, +"Failed to %s %s eventfd signaling for interrupt " , + fd <0 ?"tear down" :"set up" ,action_to_str (action)); +return ret; +} +/* * IO Port/MMIO - Beware of the endians, VFIO is always little endian */
hw/vfio/pci.c +51 -166
321 lines not on this page · raw message
hw/vfio/platform.c +20 -42
96 lines not on this page · raw message
include/hw/vfio/vfio-common.h +2 -0
@@ -167,6 +167,8 @@ void vfio_put_base_device(VFIODevice *vbasedev);void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index); +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp);void vfio_region_write (void *opaque,hwaddr addr,uint64_t data,unsigned size); uint64_t vfio_region_read(void *opaque,
Signature · 1 line
2.20.1
Quoted 9 lines · On Wed, 12 Jun 2019 14:40:04 +0200 Eric Auger <[email protected]> wrote:
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an
ACTION_TRIGGER,ACTION_MASKorACTION_UNMASKaction.In the error message, we now use errno in case of any
VFIO_DEVICE_SET_IRQSioctl failure.Signed-off-by Eric Auger <[email protected]>
Looks good to me.
I currently have the following, still untested patch on top (vfio-ap doesn't use this ioctl):
From 9c2efe73d6139e8c7b2109ac2df79fe073d942fb Mon Sep 17 00:00:00 2001
From: Cornelia Huck <[email protected]>
Date: Wed, 12 Jun 2019 18:42:29 +0200
Subject: [PATCH] vfio-ccw: use vfio_set_irq_signaling()
Make use of the new helper.
--- hw/vfio/ccw.c | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-)
hw/vfio/ccw.c +13 -37
@@ -198,9 +198,9 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) {VFIODevice *vdev = &vcdev->vdev;struct vfio_irq_info *irq_info; -struct vfio_irq_set *irq_set;size_t argsz; -int32_t *pfd; +int fd; +Error *local_err =NULL ;if (vdev->num_irqs <VFIO_CCW_IO_IRQ_INDEX +1 ) { error_setg(errp, "vfio: unexpected number of io irqs %u",
@@ -224,56 +224,32 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) goto out_free_info; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_CCW_IO_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *) &irq_set->data; - - *pfd =event_notifier_get_fd (&vcdev->io_notifier); -qemu_set_fd_handler (*pfd, vfio_ccw_io_notifier_handler,NULL , vcdev); -if (ioctl (vdev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_setg (errp,"vfio: Failed to set up io notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vcdev); + fd =event_notifier_get_fd (&vcdev->io_notifier); +qemu_set_fd_handler (fd, vfio_ccw_io_notifier_handler,NULL , vcdev); +if (vfio_set_irq_signaling (vdev,VFIO_CCW_IO_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &local_err)) { +error_propagate (errp, local_err); +qemu_set_fd_handler (fd,NULL ,NULL , vcdev);event_notifier_cleanup (&vcdev->io_notifier); } -g_free (irq_set); - out_free_info:g_free (irq_info); }static void vfio_ccw_unregister_io_notifier (VFIOCCWDevice *vcdev) { -struct vfio_irq_set *irq_set; -size_t argsz; -int32_t *pfd; - - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_CCW_IO_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *) &irq_set->data; - *pfd =-1 ; - -if (ioctl (vcdev->vdev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to de-assign device io fd: %m" ); +Error *local_err =NULL ; + +if (vfio_set_irq_signaling (&vcdev->vdev,VFIO_CCW_IO_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &local_err)) { +error_report_err (local_err); }qemu_set_fd_handler (event_notifier_get_fd (&vcdev->io_notifier),NULL ,NULL , vcdev);event_notifier_cleanup (&vcdev->io_notifier); -g_free (irq_set); }static void vfio_ccw_get_region (VFIOCCWDevice *vcdev,Error **errp)
Signature · 1 line
2.20.1
Hi Connie,
Quoted 8 lines · Cornelia Huck
Quoted 5 lines · On Wed, 12 Jun 2019 14:40:04 +0200 Eric Auger <[email protected]> wrote:
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an
ACTION_TRIGGER,ACTION_MASKorACTION_UNMASKaction.
Quoted 8 lines
Quoted 4 lines
In the error message, we now use errno in case of any
VFIO_DEVICE_SET_IRQSioctl failure.Signed-off-by Eric Auger <[email protected]>Looks good to me.
Reviewed-by Cornelia Huck <[email protected]>
thank you!
Quoted 91 lines
I currently have the following, still untested patch on top (vfio-ap doesn't use this ioctl):
From
9c2efe73d6139e8c7b2109ac2df79fe073d942fbMon Sep 17 00:00:00 2001
From: Cornelia Huck <[email protected]>
Date: Wed, 12 Jun 2019 18:42:29 +0200
Subject: [PATCH] vfio-ccw: usevfio_set_irq_signaling()Make use of the new helper.
Signed-off-by Cornelia Huck <[email protected]>--- hw/vfio/ccw.c | 50 +++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 37 deletions(-)hw/vfio/ccw.c +13
-36@@ -198,9 +198,9 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) {VFIODevice *vdev = &vcdev->vdev;struct vfio_irq_info *irq_info; -struct vfio_irq_set *irq_set;size_t argsz; -int32_t *pfd; +int fd; +Error *local_err =NULL ;if (vdev->num_irqs <VFIO_CCW_IO_IRQ_INDEX +1 ) { error_setg(errp, "vfio: unexpected number of io irqs %u",@@ -224,56 +224,32 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) goto out_free_info; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_CCW_IO_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *) &irq_set->data; - - *pfd =event_notifier_get_fd (&vcdev->io_notifier); -qemu_set_fd_handler (*pfd, vfio_ccw_io_notifier_handler,NULL , vcdev); -if (ioctl (vdev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_setg (errp,"vfio: Failed to set up io notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vcdev); + fd =event_notifier_get_fd (&vcdev->io_notifier); +qemu_set_fd_handler (fd, vfio_ccw_io_notifier_handler,NULL , vcdev); +if (vfio_set_irq_signaling (vdev,VFIO_CCW_IO_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &local_err)) { +error_propagate (errp, local_err); +qemu_set_fd_handler (fd,NULL ,NULL , vcdev);event_notifier_cleanup (&vcdev->io_notifier); } -g_free (irq_set); - out_free_info:g_free (irq_info); }static void vfio_ccw_unregister_io_notifier (VFIOCCWDevice *vcdev) { -struct vfio_irq_set *irq_set; -size_t argsz; -int32_t *pfd; - - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_CCW_IO_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *) &irq_set->data; - *pfd =-1 ; - -if (ioctl (vcdev->vdev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to de-assign device io fd: %m" ); +Error *local_err =NULL ; + +if (vfio_set_irq_signaling (&vcdev->vdev,VFIO_CCW_IO_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &local_err)) { +error_report_err (local_err);
hw/vfio/ccw.c static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) · line 255
Quoted 10 lines
hw/vfio/ccw.c +0
-1}qemu_set_fd_handler (event_notifier_get_fd (&vcdev->io_notifier),NULL ,NULL , vcdev);event_notifier_cleanup (&vcdev->io_notifier); -g_free (irq_set); }static void vfio_ccw_get_region (VFIOCCWDevice *vcdev,Error **errp)
Looks good. Looking forward to reviewing it formally.
Best Regards
Eric
Quoted 11 lines · Eric Auger <[email protected]> 于2019年6月12日周三 下午8:40写道:
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an
ACTION_TRIGGER,ACTION_MASKorACTION_UNMASKaction.In the error message, we now use errno in case of any
VFIO_DEVICE_SET_IRQSioctl failure.Signed-off-by Eric Auger <[email protected]>
Quoted 608 lines
---
v4 -> v5:
- output errno instead of ioctl returned value. Issue reported by Li
-vfio_set_irq_signalingnow returns -errno in case of failure
- update the commit messagev3 -> v4:
- renamedirq_to_strintoindex_to_str
- avoid usage ofg_strdup_printf
- print both the index and subindex in generic casev2 -> v3:
-irq_to_str()simply outputs the IRQ index if the VFIO device is not of PCI type
- removed "vfio: failed to start eventfd signaling ../.." invfio_platformv1 -> v2:
- don't callGET_IRQ_INFOinvfio_set_irq_signaling()and restore quiet check invfio_register_req_notifier. Nicer display of the IRQ name.This is a follow-up to
[PATCH v2 0/2] vfio-pci: Introducevfio_set_event_handler(). It looks to me that introducingvfio_set_irq_signaling()has more benefits in term of code reduction and the helper abstraction looks cleaner.--- hw/vfio/common.c | 78 ++++++++++++ hw/vfio/pci.c | 217 ++++++++-------------------------- hw/vfio/platform.c | 62 ++++------ include/hw/vfio/vfio-common.h | 2 + 4 files changed, 151 insertions(+), 208 deletions(-)hw/vfio/common.c +78
-0@@ -95,6 +95,84 @@ void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index) ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, &irq_set); } +static inline const char *action_to_str (int action) +{ +switch (action) { +case VFIO_IRQ_SET_ACTION_MASK : +return "MASK" ; +case VFIO_IRQ_SET_ACTION_UNMASK : +return "UNMASK" ; +case VFIO_IRQ_SET_ACTION_TRIGGER : +return "TRIGGER" ; +default : +return "UNKNOWN ACTION" ; + } +} + +static const char *index_to_str (VFIODevice *vbasedev,int index) +{ +if (vbasedev->type !=VFIO_DEVICE_TYPE_PCI ) { +return NULL ; + } + +switch (index) { +case VFIO_PCI_INTX_IRQ_INDEX : +return "INTX" ; +case VFIO_PCI_MSI_IRQ_INDEX : +return "MSI" ; +case VFIO_PCI_MSIX_IRQ_INDEX : +return "MSIX" ; +case VFIO_PCI_ERR_IRQ_INDEX : +return "ERR" ; +case VFIO_PCI_REQ_IRQ_INDEX : +return "REQ" ; +default : +return NULL ; + } +} + +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) +{ +struct vfio_irq_set *irq_set; +int argsz, ret =0 ; +const char *name; +int32_t *pfd; + + argsz =sizeof (*irq_set) +sizeof (*pfd); + + irq_set =g_malloc0 (argsz); + irq_set->argsz = argsz; + irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index = index; + irq_set->start = subindex; + irq_set->count =1 ; + pfd = (int32_t *)&irq_set->data; + *pfd = fd; + +if (ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { + ret = -errno; + } +g_free (irq_set); + +if (!ret) { +return 0 ; + } + +error_setg_errno (errp, -ret,"VFIO_DEVICE_SET_IRQS failure" ); + + name =index_to_str (vbasedev, index); +if (name) { +error_prepend (errp,"%s-%d: " , name, subindex); + }else { +error_prepend (errp,"index %d-%d: " , index, subindex); + } +error_prepend (errp, +"Failed to %s %s eventfd signaling for interrupt " , + fd <0 ?"tear down" :"set up" ,action_to_str (action)); +return ret; +} +/* * IO Port/MMIO - Beware of the endians, VFIO is always little endian */
hw/vfio/pci.c +1
-3@@ -113,9 +113,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) .gsi = vdev->intx.route.irq, .flags = KVM_IRQFD_FLAG_RESAMPLE, }; -struct vfio_irq_set *irq_set; -int ret, argsz; -int32_t *pfd; +Error *err =NULL ; if (vdev->no_kvm_intx || !kvm_irqfds_enabled() ||vdev->intx.route.mode != PCI_INTX_ENABLED ||hw/vfio/pci.c +4
-16@@ -143,22 +141,10 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) goto fail_irqfd; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd = irqfd.resamplefd; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx unmask fd" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_UNMASK , + irqfd.resamplefd, &err)) { +error_propagate (errp, err);goto fail_vfio; }hw/vfio/pci.c +10
-22@@ -262,10 +248,10 @@ static void vfio_intx_update(PCIDevice *pdev)static int vfio_intx_enable (VFIOPCIDevice *vdev,Error **errp) {uint8_t pin =vfio_pci_read_config (&vdev->pdev,PCI_INTERRUPT_PIN ,1 ); -int ret, argsz, retval =0 ; -struct vfio_irq_set *irq_set; -int32_t *pfd;Error *err =NULL ; +int32_t fd; +int ret; +if (!pin) {return 0 ;@@ -292,27 +278,15 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) error_setg_errno(errp, -ret, "event_notifier_init failed"); return ret; } + fd =event_notifier_get_fd (&vdev->intx.interrupt); +qemu_set_fd_handler (fd, vfio_intx_interrupt,NULL , vdev); - argsz = sizeof(*irq_set) + sizeof(*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->intx.interrupt); -qemu_set_fd_handler (*pfd, vfio_intx_interrupt,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx fd" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_propagate (errp, err); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->intx.interrupt); - retval = -errno; - goto cleanup; +return -errno;} vfio_intx_enable_kvm(vdev, &err);hw/vfio/pci.c +1
-5@@ -323,11 +297,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->interrupt = VFIO_INT_INTx;trace_vfio_intx_enable (vdev->vbasedev.name); - -cleanup: -g_free (irq_set); - -return retval; +return 0 ; }static void
vfio_intx_disable(VFIOPCIDevice *vdev)hw/vfio/pci.c +8
-20@@ -530,31 +500,19 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, error_report("vfio: failed to enable vectors, %d", ret); } }else { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; - - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; +Error *err =NULL ; +int32_t fd;if (vector->virq >=0 ) { - *pfd =event_notifier_get_fd (&vector->kvm_interrupt); + fd =event_notifier_get_fd (&vector->kvm_interrupt); }else { - *pfd =event_notifier_get_fd (&vector->interrupt); + fd =event_notifier_get_fd (&vector->interrupt); } - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_report ("vfio: failed to modify vector, %d" , ret); +if (vfio_set_irq_signaling (&vdev->vbasedev, +VFIO_PCI_MSIX_IRQ_INDEX , nr, +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); }}hw/vfio/pci.c +0
-0@@ -591,26 +549,10 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) * be re-asserted on unmask. Nothing to do if already using QEMUmode.
*/ if (vector->virq >= 0) {hw/vfio/pci.c +2
-19-int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (&vector->interrupt); - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vector->interrupt); - -ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); - -g_free (irq_set); + vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX,nr,
hw/vfio/pci.c +13
-42+ VFIO_IRQ_SET_ACTION_TRIGGER, fd, NULL); } }@@ -2636,10 +2578,8 @@ static void vfio_err_notifier_handler(void *opaque)*/ static void vfio_register_err_notifier (VFIOPCIDevice *vdev) { -int ret; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!vdev->pci_aer) {return ;@@ -2651,58 +2591,30 @@ static voidvfio_register_err_notifier (VFIOPCIDevice *vdev) return; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->err_notifier); +qemu_set_fd_handler (fd, vfio_err_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->err_notifier); -qemu_set_fd_handler (*pfd, vfio_err_notifier_handler,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to set up error notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->err_notifier); vdev->pci_aer = false; } -g_free (irq_set); }static void vfio_unregister_err_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; -int ret; +Error *err =NULL ;if (!vdev->pci_aer) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to de-assign error fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set);qemu_set_fd_handler (event_notifier_get_fd (&vdev->err_notifier),NULL ,NULL , vdev);event_notifier_cleanup(&vdev->err_notifier);hw/vfio/pci.c +2
-3@@ -2727,9 +2639,8 @@ static void vfio_register_req_notifier(VFIOPCIDevice *vdev) {struct vfio_irq_info irq_info = { .argsz =sizeof (irq_info), .index =VFIO_PCI_REQ_IRQ_INDEX }; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!(vdev->features &VFIO_FEATURE_ENABLE_REQ )) {return;hw/vfio/pci.c +10
-36@@ -2745,57 +2656,31 @@ static voidvfio_register_req_notifier (VFIOPCIDevice *vdev) return; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->req_notifier); +qemu_set_fd_handler (fd, vfio_req_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->req_notifier); -qemu_set_fd_handler (*pfd, vfio_req_notifier_handler,NULL , vdev); - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to set up device request notification"); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); + if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->req_notifier); } else { vdev->req_enabled = true; } - -g_free (irq_set); }static void vfio_unregister_req_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ;if (!vdev->req_enabled) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to de-assign device request fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set); qemu_set_fd_handler(event_notifier_get_fd(&vdev->req_notifier),NULL, NULL, vdev); event_notifier_cleanup(&vdev->req_notifier);hw/vfio/platform.c +12
-23@@ -106,26 +106,19 @@ static int vfio_set_trigger_eventfd(VFIOINTp *intp, eventfd_user_side_handler_t handler) {VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (intp->interrupt); +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->interrupt); -qemu_set_fd_handler (*pfd, (IOHandler *)handler,NULL , intp); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set trigger eventfd: %m" ); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); +qemu_set_fd_handler (fd, (IOHandler *)handler,NULL , intp); + + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); } -g_free (irq_set); +return ret; }@@ -330,7 +323,6 @@ static void vfio_platform_eoi(VFIODevice *vbasedev)static void vfio_start_eventfd_injection (SysBusDevice *sbdev,qemu_irq irq) { -int ret;VFIOPlatformDevice *vdev =VFIO_PLATFORM_DEVICE (sbdev);VFIOINTp *intp;@@ -341,10 +333,7 @@ static void vfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) }assert (intp); - ret =vfio_set_trigger_eventfd (intp, vfio_intp_interrupt); -if (ret) { - error_report("vfio: failed to start eventfd signaling for IRQ %d: %m", - intp->pin); + if (vfio_set_trigger_eventfd(intp, vfio_intp_interrupt)) {abort ();}}
hw/vfio/platform.c +8
-17@@ -361,25 +350,16 @@ static voidvfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) */ static int vfio_set_resample_eventfd (VFIOINTp *intp) { +int32_t fd =event_notifier_get_fd (intp->unmask);VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->unmask); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set resample eventfd: %m" ); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_UNMASK , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); }return ret;}
hw/vfio/platform.c +0
-2@@ -435,8 +415,6 @@ static void vfio_start_irqfd_injection(SysBusDevice *sbdev, qemu_irq irq)return ; fail_vfio:kvm_irqchip_remove_irqfd_notifier (kvm_state, intp->interrupt, irq); -error_report ("vfio: failed to start eventfd signaling for IRQ %d: %m" , - intp->pin);abort (); fail_irqfd:vfio_start_eventfd_injection(sbdev, irq);include/hw/vfio/vfio-common.h +2
-1@@ -167,6 +167,8 @@ void vfio_put_base_device(VFIODevice *vbasedev);void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index); +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp);void vfio_region_write (void *opaque,hwaddr addr,uint64_t data,unsigned size); uint64_t vfio_region_read(void *opaque, --2.20.1
Hi Li,
Quoted 7 lines · Li Qiang
Quoted 5 lines · Eric Auger <[email protected]> 于2019年6月12日周三 下午8:40写道:
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an
ACTION_TRIGGER,ACTION_MASKorACTION_UNMASKaction.
Quoted 8 lines
Quoted 6 lines
In the error message, we now use errno in case of any
VFIO_DEVICE_SET_IRQSioctl failure.Signed-off-by Eric Auger <[email protected]>Reviewed-by Li Qiang <[email protected]>
Thanks for the errno issue report and for the review!
Best Regards
Eric
Quoted 611 lines
Quoted 611 lines
---
v4 -> v5:
- output errno instead of ioctl returned value. Issue reported by Li
-vfio_set_irq_signalingnow returns -errno in case of failure
- update the commit messagev3 -> v4:
- renamedirq_to_strintoindex_to_str
- avoid usage ofg_strdup_printf
- print both the index and subindex in generic casev2 -> v3:
-irq_to_str()simply outputs the IRQ index if the VFIO device is not of PCI type
- removed "vfio: failed to start eventfd signaling ../.." invfio_platformv1 -> v2:
- don't callGET_IRQ_INFOinvfio_set_irq_signaling()and restore quiet check invfio_register_req_notifier. Nicer display of the IRQ name.This is a follow-up to
[PATCH v2 0/2] vfio-pci: Introducevfio_set_event_handler(). It looks to me that introducingvfio_set_irq_signaling()has more benefits in term of code reduction and the helper abstraction looks cleaner.--- hw/vfio/common.c | 78 ++++++++++++ hw/vfio/pci.c | 217 ++++++++-------------------------- hw/vfio/platform.c | 62 ++++------ include/hw/vfio/vfio-common.h | 2 + 4 files changed, 151 insertions(+), 208 deletions(-)hw/vfio/common.c +78
-0@@ -95,6 +95,84 @@ void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index) ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, &irq_set); } +static inline const char *action_to_str (int action) +{ +switch (action) { +case VFIO_IRQ_SET_ACTION_MASK : +return "MASK" ; +case VFIO_IRQ_SET_ACTION_UNMASK : +return "UNMASK" ; +case VFIO_IRQ_SET_ACTION_TRIGGER : +return "TRIGGER" ; +default : +return "UNKNOWN ACTION" ; + } +} + +static const char *index_to_str (VFIODevice *vbasedev,int index) +{ +if (vbasedev->type !=VFIO_DEVICE_TYPE_PCI ) { +return NULL ; + } + +switch (index) { +case VFIO_PCI_INTX_IRQ_INDEX : +return "INTX" ; +case VFIO_PCI_MSI_IRQ_INDEX : +return "MSI" ; +case VFIO_PCI_MSIX_IRQ_INDEX : +return "MSIX" ; +case VFIO_PCI_ERR_IRQ_INDEX : +return "ERR" ; +case VFIO_PCI_REQ_IRQ_INDEX : +return "REQ" ; +default : +return NULL ; + } +} + +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) +{ +struct vfio_irq_set *irq_set; +int argsz, ret =0 ; +const char *name; +int32_t *pfd; + + argsz =sizeof (*irq_set) +sizeof (*pfd); + + irq_set =g_malloc0 (argsz); + irq_set->argsz = argsz; + irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index = index; + irq_set->start = subindex; + irq_set->count =1 ; + pfd = (int32_t *)&irq_set->data; + *pfd = fd; + +if (ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { + ret = -errno; + } +g_free (irq_set); + +if (!ret) { +return 0 ; + } + +error_setg_errno (errp, -ret,"VFIO_DEVICE_SET_IRQS failure" ); + + name =index_to_str (vbasedev, index); +if (name) { +error_prepend (errp,"%s-%d: " , name, subindex); + }else { +error_prepend (errp,"index %d-%d: " , index, subindex); + } +error_prepend (errp, +"Failed to %s %s eventfd signaling for interrupt " , + fd <0 ?"tear down" :"set up" ,action_to_str (action)); +return ret; +} +/* * IO Port/MMIO - Beware of the endians, VFIO is always little endian */
hw/vfio/pci.c +1
-3@@ -113,9 +113,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) .gsi = vdev->intx.route.irq, .flags = KVM_IRQFD_FLAG_RESAMPLE, }; -struct vfio_irq_set *irq_set; -int ret, argsz; -int32_t *pfd; +Error *err =NULL ; if (vdev->no_kvm_intx || !kvm_irqfds_enabled() ||vdev->intx.route.mode != PCI_INTX_ENABLED ||hw/vfio/pci.c +4
-16@@ -143,22 +141,10 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) goto fail_irqfd; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd = irqfd.resamplefd; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx unmask fd" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_UNMASK , + irqfd.resamplefd, &err)) { +error_propagate (errp, err);goto fail_vfio; }hw/vfio/pci.c +10
-22@@ -262,10 +248,10 @@ static void vfio_intx_update(PCIDevice *pdev)static int vfio_intx_enable (VFIOPCIDevice *vdev,Error **errp) {uint8_t pin =vfio_pci_read_config (&vdev->pdev,PCI_INTERRUPT_PIN ,1 ); -int ret, argsz, retval =0 ; -struct vfio_irq_set *irq_set; -int32_t *pfd;Error *err =NULL ; +int32_t fd; +int ret; +if (!pin) {return 0 ;@@ -292,27 +278,15 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) error_setg_errno(errp, -ret, "event_notifier_init failed"); return ret; } + fd =event_notifier_get_fd (&vdev->intx.interrupt); +qemu_set_fd_handler (fd, vfio_intx_interrupt,NULL , vdev); - argsz = sizeof(*irq_set) + sizeof(*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->intx.interrupt); -qemu_set_fd_handler (*pfd, vfio_intx_interrupt,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx fd" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_propagate (errp, err); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->intx.interrupt); - retval = -errno; - goto cleanup; +return -errno;} vfio_intx_enable_kvm(vdev, &err);hw/vfio/pci.c +1
-5@@ -323,11 +297,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->interrupt = VFIO_INT_INTx;trace_vfio_intx_enable (vdev->vbasedev.name); - -cleanup: -g_free (irq_set); - -return retval; +return 0 ; }static void
vfio_intx_disable(VFIOPCIDevice *vdev)hw/vfio/pci.c +8
-20@@ -530,31 +500,19 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr, error_report("vfio: failed to enable vectors, %d", ret); } }else { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; - - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; +Error *err =NULL ; +int32_t fd;if (vector->virq >=0 ) { - *pfd =event_notifier_get_fd (&vector->kvm_interrupt); + fd =event_notifier_get_fd (&vector->kvm_interrupt); }else { - *pfd =event_notifier_get_fd (&vector->interrupt); + fd =event_notifier_get_fd (&vector->interrupt); } - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_report ("vfio: failed to modify vector, %d" , ret); +if (vfio_set_irq_signaling (&vdev->vbasedev, +VFIO_PCI_MSIX_IRQ_INDEX , nr, +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); }}hw/vfio/pci.c +0
-0@@ -591,26 +549,10 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr) * be re-asserted on unmask. Nothing to do if already using QEMUmode.
*/ if (vector->virq >= 0) {hw/vfio/pci.c +2
-19-int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (&vector->interrupt); - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vector->interrupt); - -ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); - -g_free (irq_set); + vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX,nr,
hw/vfio/pci.c +13
-42+ VFIO_IRQ_SET_ACTION_TRIGGER, fd, NULL); } }@@ -2636,10 +2578,8 @@ static void vfio_err_notifier_handler(void *opaque)*/ static void vfio_register_err_notifier (VFIOPCIDevice *vdev) { -int ret; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!vdev->pci_aer) {return ;@@ -2651,58 +2591,30 @@ static voidvfio_register_err_notifier (VFIOPCIDevice *vdev) return; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->err_notifier); +qemu_set_fd_handler (fd, vfio_err_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->err_notifier); -qemu_set_fd_handler (*pfd, vfio_err_notifier_handler,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to set up error notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->err_notifier); vdev->pci_aer = false; } -g_free (irq_set); }static void vfio_unregister_err_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; -int ret; +Error *err =NULL ;if (!vdev->pci_aer) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to de-assign error fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set);qemu_set_fd_handler (event_notifier_get_fd (&vdev->err_notifier),NULL ,NULL , vdev);event_notifier_cleanup(&vdev->err_notifier);hw/vfio/pci.c +2
-3@@ -2727,9 +2639,8 @@ static void vfio_register_req_notifier(VFIOPCIDevice *vdev) {struct vfio_irq_info irq_info = { .argsz =sizeof (irq_info), .index =VFIO_PCI_REQ_IRQ_INDEX }; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!(vdev->features &VFIO_FEATURE_ENABLE_REQ )) {return;hw/vfio/pci.c +10
-36@@ -2745,57 +2656,31 @@ static voidvfio_register_req_notifier (VFIOPCIDevice *vdev) return; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->req_notifier); +qemu_set_fd_handler (fd, vfio_req_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->req_notifier); -qemu_set_fd_handler (*pfd, vfio_req_notifier_handler,NULL , vdev); - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to set up device request notification"); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); + if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->req_notifier); } else { vdev->req_enabled = true; } - -g_free (irq_set); }static void vfio_unregister_req_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ;if (!vdev->req_enabled) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to de-assign device request fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set); qemu_set_fd_handler(event_notifier_get_fd(&vdev->req_notifier),NULL, NULL, vdev); event_notifier_cleanup(&vdev->req_notifier);hw/vfio/platform.c +12
-23@@ -106,26 +106,19 @@ static int vfio_set_trigger_eventfd(VFIOINTp *intp, eventfd_user_side_handler_t handler) {VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (intp->interrupt); +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->interrupt); -qemu_set_fd_handler (*pfd, (IOHandler *)handler,NULL , intp); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set trigger eventfd: %m" ); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); +qemu_set_fd_handler (fd, (IOHandler *)handler,NULL , intp); + + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); } -g_free (irq_set); +return ret; }@@ -330,7 +323,6 @@ static void vfio_platform_eoi(VFIODevice *vbasedev)static void vfio_start_eventfd_injection (SysBusDevice *sbdev,qemu_irq irq) { -int ret;VFIOPlatformDevice *vdev =VFIO_PLATFORM_DEVICE (sbdev);VFIOINTp *intp;@@ -341,10 +333,7 @@ static void vfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) }assert (intp); - ret =vfio_set_trigger_eventfd (intp, vfio_intp_interrupt); -if (ret) { - error_report("vfio: failed to start eventfd signaling for IRQ %d: %m", - intp->pin); + if (vfio_set_trigger_eventfd(intp, vfio_intp_interrupt)) {abort ();}}
hw/vfio/platform.c +8
-17@@ -361,25 +350,16 @@ static voidvfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) */ static int vfio_set_resample_eventfd (VFIOINTp *intp) { +int32_t fd =event_notifier_get_fd (intp->unmask);VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->unmask); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set resample eventfd: %m" ); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_UNMASK , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); }return ret;}
hw/vfio/platform.c +0
-2@@ -435,8 +415,6 @@ static void vfio_start_irqfd_injection(SysBusDevice *sbdev, qemu_irq irq)return ; fail_vfio:kvm_irqchip_remove_irqfd_notifier (kvm_state, intp->interrupt, irq); -error_report ("vfio: failed to start eventfd signaling for IRQ %d: %m" , - intp->pin);abort (); fail_irqfd:vfio_start_eventfd_injection(sbdev, irq);include/hw/vfio/vfio-common.h +2
-1@@ -167,6 +167,8 @@ void vfio_put_base_device(VFIODevice *vbasedev);void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index); +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp);void vfio_region_write (void *opaque,hwaddr addr,uint64_t data,unsigned size); uint64_t vfio_region_read(void *opaque, --2.20.1
Quoted 11 lines · On Wed, 12 Jun 2019 14:40:04 +0200 Eric Auger <[email protected]> wrote:
The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an
ACTION_TRIGGER,ACTION_MASKorACTION_UNMASKaction.In the error message, we now use errno in case of any
VFIO_DEVICE_SET_IRQSioctl failure.Signed-off-by Eric Auger <[email protected]>---
Thanks Eric, I just sent a pull request including this, with Li's and Connie's R-b. Thanks,
Alex
Quoted 578 lines
v4 -> v5:
- output errno instead of ioctl returned value. Issue reported by Li
-vfio_set_irq_signalingnow returns -errno in case of failure
- update the commit messagev3 -> v4:
- renamedirq_to_strintoindex_to_str
- avoid usage ofg_strdup_printf
- print both the index and subindex in generic casev2 -> v3:
-irq_to_str()simply outputs the IRQ index if the VFIO device is not of PCI type
- removed "vfio: failed to start eventfd signaling ../.." invfio_platformv1 -> v2:
- don't callGET_IRQ_INFOinvfio_set_irq_signaling()and restore quiet check invfio_register_req_notifier. Nicer display of the IRQ name.This is a follow-up to
[PATCH v2 0/2] vfio-pci: Introducevfio_set_event_handler(). It looks to me that introducingvfio_set_irq_signaling()has more benefits in term of code reduction and the helper abstraction looks cleaner.--- hw/vfio/common.c | 78 ++++++++++++ hw/vfio/pci.c | 217 ++++++++-------------------------- hw/vfio/platform.c | 62 ++++------ include/hw/vfio/vfio-common.h | 2 + 4 files changed, 151 insertions(+), 208 deletions(-)hw/vfio/common.c +78
-0@@ -95,6 +95,84 @@ void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index)ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , &irq_set); } +static inline const char *action_to_str (int action) +{ +switch (action) { +case VFIO_IRQ_SET_ACTION_MASK : +return "MASK" ; +case VFIO_IRQ_SET_ACTION_UNMASK : +return "UNMASK" ; +case VFIO_IRQ_SET_ACTION_TRIGGER : +return "TRIGGER" ; +default : +return "UNKNOWN ACTION" ; + } +} + +static const char *index_to_str (VFIODevice *vbasedev,int index) +{ +if (vbasedev->type !=VFIO_DEVICE_TYPE_PCI ) { +return NULL ; + } + +switch (index) { +case VFIO_PCI_INTX_IRQ_INDEX : +return "INTX" ; +case VFIO_PCI_MSI_IRQ_INDEX : +return "MSI" ; +case VFIO_PCI_MSIX_IRQ_INDEX : +return "MSIX" ; +case VFIO_PCI_ERR_IRQ_INDEX : +return "ERR" ; +case VFIO_PCI_REQ_IRQ_INDEX : +return "REQ" ; +default : +return NULL ; + } +} + +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp) +{ +struct vfio_irq_set *irq_set; +int argsz, ret =0 ; +const char *name; +int32_t *pfd; + + argsz =sizeof (*irq_set) +sizeof (*pfd); + + irq_set =g_malloc0 (argsz); + irq_set->argsz = argsz; + irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index = index; + irq_set->start = subindex; + irq_set->count =1 ; + pfd = (int32_t *)&irq_set->data; + *pfd = fd; + +if (ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set)) { + ret = -errno; + } +g_free (irq_set); + +if (!ret) { +return 0 ; + } + +error_setg_errno (errp, -ret,"VFIO_DEVICE_SET_IRQS failure" ); + + name =index_to_str (vbasedev, index); +if (name) { +error_prepend (errp,"%s-%d: " , name, subindex); + }else { +error_prepend (errp,"index %d-%d: " , index, subindex); + } +error_prepend (errp, +"Failed to %s %s eventfd signaling for interrupt " , + fd <0 ?"tear down" :"set up" ,action_to_str (action)); +return ret; +} +/* * IO Port/MMIO - Beware of the endians, VFIO is always little endian */ hw/vfio/pci.c +51
-166@@ -113,9 +113,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) .gsi = vdev->intx.route.irq, .flags = KVM_IRQFD_FLAG_RESAMPLE, }; -struct vfio_irq_set *irq_set; -int ret, argsz; -int32_t *pfd; +Error *err =NULL ; if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || vdev->intx.route.mode != PCI_INTX_ENABLED ||@@ -143,22 +141,10 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) goto fail_irqfd; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd = irqfd.resamplefd; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx unmask fd" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_UNMASK , + irqfd.resamplefd, &err)) { +error_propagate (errp, err); goto fail_vfio; }@@ -262,10 +248,10 @@ static void vfio_intx_update(PCIDevice *pdev)static int vfio_intx_enable (VFIOPCIDevice *vdev,Error **errp) {uint8_t pin =vfio_pci_read_config (&vdev->pdev,PCI_INTERRUPT_PIN ,1 ); -int ret, argsz, retval =0 ; -struct vfio_irq_set *irq_set; -int32_t *pfd;Error *err =NULL ; +int32_t fd; +int ret; +if (!pin) {return 0 ;@@ -292,27 +278,15 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)error_setg_errno (errp, -ret,"event_notifier_init failed" );return ret; } + fd =event_notifier_get_fd (&vdev->intx.interrupt); +qemu_set_fd_handler (fd, vfio_intx_interrupt,NULL , vdev); - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_INTX_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->intx.interrupt); -qemu_set_fd_handler (*pfd, vfio_intx_interrupt,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_setg_errno (errp, -ret,"failed to setup INTx fd" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_INTX_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_propagate (errp, err); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->intx.interrupt); - retval = -errno; - goto cleanup; +return -errno; }vfio_intx_enable_kvm (vdev, &err);@@ -323,11 +297,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) vdev->interrupt = VFIO_INT_INTx;trace_vfio_intx_enable (vdev->vbasedev.name); - -cleanup: -g_free (irq_set); - -return retval; +return 0 ; }static void vfio_intx_disable (VFIOPCIDevice *vdev)@@ -530,31 +500,19 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,error_report ("vfio: failed to enable vectors, %d" , ret); } }else { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; - - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; +Error *err =NULL ; +int32_t fd;if (vector->virq >=0 ) { - *pfd =event_notifier_get_fd (&vector->kvm_interrupt); + fd =event_notifier_get_fd (&vector->kvm_interrupt); }else { - *pfd =event_notifier_get_fd (&vector->interrupt); + fd =event_notifier_get_fd (&vector->interrupt); } - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret) { -error_report ("vfio: failed to modify vector, %d" , ret); +if (vfio_set_irq_signaling (&vdev->vbasedev, +VFIO_PCI_MSIX_IRQ_INDEX , nr, +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } }@@ -591,26 +549,10 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)* be re-asserted on unmask. Nothing to do if already using QEMU mode. */ if (vector->virq >=0 ) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (&vector->interrupt); - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_MSIX_IRQ_INDEX ; - irq_set->start = nr; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vector->interrupt); - -ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); - -g_free (irq_set); +vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_MSIX_IRQ_INDEX , nr, +VFIO_IRQ_SET_ACTION_TRIGGER , fd,NULL ); } }@@ -2636,10 +2578,8 @@ static void vfio_err_notifier_handler(void *opaque)*/ static void vfio_register_err_notifier (VFIOPCIDevice *vdev) { -int ret; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!vdev->pci_aer) {return ;@@ -2651,58 +2591,30 @@ static void vfio_register_err_notifier(VFIOPCIDevice *vdev)return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->err_notifier); +qemu_set_fd_handler (fd, vfio_err_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->err_notifier); -qemu_set_fd_handler (*pfd, vfio_err_notifier_handler,NULL , vdev); - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to set up error notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->err_notifier); vdev->pci_aer = false; } -g_free (irq_set); }static void vfio_unregister_err_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; -int ret; +Error *err =NULL ;if (!vdev->pci_aer) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_ERR_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - - ret =ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret) { -error_report ("vfio: Failed to de-assign error fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_ERR_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set);qemu_set_fd_handler (event_notifier_get_fd (&vdev->err_notifier),NULL ,NULL , vdev);event_notifier_cleanup (&vdev->err_notifier);@@ -2727,9 +2639,8 @@ static void vfio_register_req_notifier(VFIOPCIDevice *vdev) {struct vfio_irq_info irq_info = { .argsz =sizeof (irq_info), .index =VFIO_PCI_REQ_IRQ_INDEX }; -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ; +int32_t fd;if (!(vdev->features &VFIO_FEATURE_ENABLE_REQ )) {return ;@@ -2745,57 +2656,31 @@ static void vfio_register_req_notifier(VFIOPCIDevice *vdev)return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); + fd =event_notifier_get_fd (&vdev->req_notifier); +qemu_set_fd_handler (fd, vfio_req_notifier_handler,NULL , vdev); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - - *pfd =event_notifier_get_fd (&vdev->req_notifier); -qemu_set_fd_handler (*pfd, vfio_req_notifier_handler,NULL , vdev); - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to set up device request notification" ); -qemu_set_fd_handler (*pfd,NULL ,NULL , vdev); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); +qemu_set_fd_handler (fd,NULL ,NULL , vdev);event_notifier_cleanup (&vdev->req_notifier); }else { vdev->req_enabled = true; } - -g_free (irq_set); }static void vfio_unregister_req_notifier (VFIOPCIDevice *vdev) { -int argsz; -struct vfio_irq_set *irq_set; -int32_t *pfd; +Error *err =NULL ;if (!vdev->req_enabled) {return ; } - argsz =sizeof (*irq_set) +sizeof (*pfd); - - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD | -VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index =VFIO_PCI_REQ_IRQ_INDEX ; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =-1 ; - -if (ioctl (vdev->vbasedev.fd,VFIO_DEVICE_SET_IRQS , irq_set)) { -error_report ("vfio: Failed to de-assign device request fd: %m" ); +if (vfio_set_irq_signaling (&vdev->vbasedev,VFIO_PCI_REQ_IRQ_INDEX ,0 , +VFIO_IRQ_SET_ACTION_TRIGGER ,-1 , &err)) { +error_reportf_err (err,VFIO_MSG_PREFIX , vdev->vbasedev.name); } -g_free (irq_set);qemu_set_fd_handler (event_notifier_get_fd (&vdev->req_notifier),NULL ,NULL , vdev);event_notifier_cleanup (&vdev->req_notifier);hw/vfio/platform.c +20
-42@@ -106,26 +106,19 @@ static int vfio_set_trigger_eventfd(VFIOINTp *intp, eventfd_user_side_handler_t handler) {VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +int32_t fd =event_notifier_get_fd (intp->interrupt); +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_TRIGGER ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->interrupt); -qemu_set_fd_handler (*pfd, (IOHandler *)handler,NULL , intp); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set trigger eventfd: %m" ); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); +qemu_set_fd_handler (fd, (IOHandler *)handler,NULL , intp); + + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_TRIGGER , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); } -g_free (irq_set); +return ret; }@@ -330,7 +323,6 @@ static void vfio_platform_eoi(VFIODevice *vbasedev)static void vfio_start_eventfd_injection (SysBusDevice *sbdev,qemu_irq irq) { -int ret;VFIOPlatformDevice *vdev =VFIO_PLATFORM_DEVICE (sbdev);VFIOINTp *intp;@@ -341,10 +333,7 @@ static void vfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) }assert (intp); - ret =vfio_set_trigger_eventfd (intp, vfio_intp_interrupt); -if (ret) { -error_report ("vfio: failed to start eventfd signaling for IRQ %d: %m" , - intp->pin); +if (vfio_set_trigger_eventfd (intp, vfio_intp_interrupt)) {abort (); } }@@ -361,25 +350,16 @@ static void vfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq)*/ static int vfio_set_resample_eventfd (VFIOINTp *intp) { +int32_t fd =event_notifier_get_fd (intp->unmask);VFIODevice *vbasedev = &intp->vdev->vbasedev; -struct vfio_irq_set *irq_set; -int argsz, ret; -int32_t *pfd; +Error *err =NULL ; +int ret; - argsz =sizeof (*irq_set) +sizeof (*pfd); - irq_set =g_malloc0 (argsz); - irq_set->argsz = argsz; - irq_set->flags =VFIO_IRQ_SET_DATA_EVENTFD |VFIO_IRQ_SET_ACTION_UNMASK ; - irq_set->index = intp->pin; - irq_set->start =0 ; - irq_set->count =1 ; - pfd = (int32_t *)&irq_set->data; - *pfd =event_notifier_get_fd (intp->unmask); -qemu_set_fd_handler (*pfd,NULL ,NULL ,NULL ); - ret =ioctl (vbasedev->fd,VFIO_DEVICE_SET_IRQS , irq_set); -g_free (irq_set); -if (ret <0 ) { -error_report ("vfio: Failed to set resample eventfd: %m" ); +qemu_set_fd_handler (fd,NULL ,NULL ,NULL ); + ret =vfio_set_irq_signaling (vbasedev, intp->pin,0 , +VFIO_IRQ_SET_ACTION_UNMASK , fd, &err); +if (ret) { +error_reportf_err (err,VFIO_MSG_PREFIX , vbasedev->name); }return ret; }@@ -435,8 +415,6 @@ static void vfio_start_irqfd_injection(SysBusDevice *sbdev, qemu_irq irq)return ; fail_vfio:kvm_irqchip_remove_irqfd_notifier (kvm_state, intp->interrupt, irq); -error_report ("vfio: failed to start eventfd signaling for IRQ %d: %m" , - intp->pin);abort (); fail_irqfd:vfio_start_eventfd_injection (sbdev, irq);include/hw/vfio/vfio-common.h +2
-0@@ -167,6 +167,8 @@ void vfio_put_base_device(VFIODevice *vbasedev);void vfio_disable_irqindex (VFIODevice *vbasedev,int index);void vfio_unmask_single_irqindex (VFIODevice *vbasedev,int index);void vfio_mask_single_irqindex (VFIODevice *vbasedev,int index); +int vfio_set_irq_signaling (VFIODevice *vbasedev,int index,int subindex, +int action,int fd,Error **errp);void vfio_region_write (void *opaque,hwaddr addr,uint64_t data,unsigned size); uint64_t vfio_region_read(void *opaque,