vfio-pci: report recovery event after device recovery successful
Ping
Quoted 116 lines
As you all know, device faults are classified into the following
types: unrecoverable error and recoverable error. vfio-pci drvier will report error event to user-space process while device occur hardware errors, and still report the other error event after deivce recovery successful. So the user-space process just like qemu can not identify the event is an hardware error event or a device recovery successful event. So in order to solve this problem, add an eventfd namedrecov_triggerto report device recovery successful event, the user-space process can make a decision whether to process the recovery event or not.Signed-off-by Hogan Wang <[email protected]>--- drivers/vfio/pci/vfio_pci_core.c | 13 +++++++++++-- drivers/vfio/pci/vfio_pci_intrs.c | 19 +++++++++++++++++++ include/linux/vfio_pci_core.h | 1 + include/uapi/linux/vfio.h | 1 + 4 files changed, 32 insertions(+), 2 deletions(-)drivers/vfio/pci/vfio_pci_core.c +4
-0@@ -483,6 +483,10 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev)eventfd_ctx_put (vdev->err_trigger); vdev->err_trigger =NULL ; } +if (vdev->recov_trigger) { +eventfd_ctx_put (vdev->recov_trigger); + vdev->recov_trigger =NULL ; + }if (vdev->req_trigger) {eventfd_ctx_put (vdev->req_trigger);drivers/vfio/pci/vfio_pci_core.c +7
-2vdev->req_trigger =NULL ;@@ -1922,8 +1926,13 @@ pci_ers_result_t vfio_pci_core_aer_err_detected(struct pci_dev *pdev, mutex_lock(&vdev->igate); -if (vdev->err_trigger) -eventfd_signal (vdev->err_trigger,1 ); +if (state == pci_channel_io_normal) { +if (vdev->recov_trigger) +eventfd_signal (vdev->recov_trigger,1 ); + }else { +if (vdev->err_trigger) +eventfd_signal (vdev->err_trigger,1 ); + }mutex_unlock (&vdev->igate);drivers/vfio/pci/vfio_pci_intrs.c +10
-1@@ -624,6 +624,17 @@ static int vfio_pci_set_err_trigger(structvfio_pci_core_device *vdev, count, flags, data); } +static int vfio_pci_set_recov_trigger (struct vfio_pci_core_device *vdev, +unsigned index,unsigned start, +unsigned count,uint32_t flags,void *data) { +if (index !=VFIO_PCI_ERR_IRQ_INDEX || start !=0 || count >1 ) +return -EINVAL ; + +return vfio_pci_set_ctx_trigger_single (&vdev->recov_trigger, + count, flags, data); +} +static int vfio_pci_set_req_trigger (struct vfio_pci_core_device *vdev,unsigned index,unsigned start, unsigned count, uint32_t flags, void *data) @@ -684,6 +695,14 @@ int vfio_pci_set_irqs_ioctl(struct vfio_pci_core_device*vdev,
uint32_tflags,drivers/vfio/pci/vfio_pci_intrs.c +8
-0break ; }break ; +case VFIO_PCI_RECOV_IRQ_INDEX : +switch (flags &VFIO_IRQ_SET_ACTION_TYPE_MASK ) { +case VFIO_IRQ_SET_ACTION_TRIGGER : +if (pci_is_pcie (vdev->pdev)) + func = vfio_pci_set_recov_trigger; +break ; + } +break ; }if (!func)include/linux/vfio_pci_core.h index renamed from include/linux/vfio_pci_core.h +0
-0
74a4a0f17b28..d94addb18118100644include/linux/vfio_pci_core.h +1
-0@@ -128,6 +128,7 @@ struct vfio_pci_core_device {struct pci_saved_state *pm_save;int ioeventfds_nr;struct eventfd_ctx *err_trigger; +struct eventfd_ctx *recov_trigger;struct eventfd_ctx *req_trigger;struct list_head dummy_resources_list;struct mutex ioeventfds_lock;include/uapi/linux/vfio.h index renamed from include/uapi/linux/vfio.h +0
-0
fea86061b44e..f88a6ca62c49100644include/uapi/linux/vfio.h +1
-1@@ -621,6 +621,7 @@ enum {VFIO_PCI_MSIX_IRQ_INDEX ,VFIO_PCI_ERR_IRQ_INDEX ,VFIO_PCI_REQ_IRQ_INDEX , +VFIO_PCI_RECOV_IRQ_INDEX , VFIO_PCI_NUM_IRQS }; --2.33.0