The VFIO device fd is closed by dev_vfio_release_device() but is left
in the interrupt handle, so freeing the handle on cleanup logs a bogus
FD leak warning.

Mark dev_fd invalid after release. In secondary process the request
handle also holds the device fd, reset it too.

Fixes: d770ee9caed0 ("interrupts: warn on leaked FDs")

Signed-off-by: Stephen Hemminger <[email protected]>
---
 drivers/bus/pci/linux/pci_vfio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index fb35bc1d49..7ee8fe809a 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -1103,6 +1103,7 @@ pci_vfio_unmap_resource_primary(struct rte_pci_device 
*dev)
                PCI_LOG(ERR, "Cannot release VFIO device");
                return ret;
        }
+       rte_intr_dev_fd_set(dev->intr_handle, -1);
 
        vfio_res_list =
                RTE_TAILQ_CAST(dev_vfio_tailq.head, mapped_pci_res_list);
@@ -1142,6 +1143,8 @@ pci_vfio_unmap_resource_secondary(struct rte_pci_device 
*dev)
                PCI_LOG(ERR, "Cannot release VFIO device");
                return ret;
        }
+       rte_intr_dev_fd_set(dev->intr_handle, -1);
+       rte_intr_dev_fd_set(dev->vfio_req_intr_handle, -1);
 
        vfio_res_list =
                RTE_TAILQ_CAST(dev_vfio_tailq.head, mapped_pci_res_list);
-- 
2.53.0

Reply via email to