From: Anatoly Burakov <[email protected]> Extend the leak warning in rte_intr_instance_free() to the event FD array, in the same way as the handle FD and device FD.
rte_intr_efd_disable() used to close the eventfds it owns but left the stale descriptors in the array, and never cleared the entry that merely references the handle FD in the non-MSI-X case. For all types but VDEV, reset all entries in use to -1 so a properly disabled handle is not reported. Drivers filling the event FD array themselves are expected to reset the entries once the descriptors are closed or no longer referenced. Suggested-by: David Marchand <[email protected]> Signed-off-by: Anatoly Burakov <[email protected]> Signed-off-by: David Marchand <[email protected]> --- Changes since Anatoly v4: - added check on type != VDEV when disabling, --- lib/eal/common/eal_common_interrupts.c | 5 +++++ lib/eal/include/rte_interrupts.h | 7 ++++++- lib/eal/linux/eal_interrupts.c | 9 ++++++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/eal/common/eal_common_interrupts.c b/lib/eal/common/eal_common_interrupts.c index 1208a2597d..f3eee636df 100644 --- a/lib/eal/common/eal_common_interrupts.c +++ b/lib/eal/common/eal_common_interrupts.c @@ -167,6 +167,11 @@ void rte_intr_instance_free(struct rte_intr_handle *intr_handle) if (rte_intr_dev_fd_get(intr_handle) >= 0) EAL_LOG(NOTICE, "Some interrupt handle is leaking a device FD: %d", rte_intr_dev_fd_get(intr_handle)); + for (int i = 0; i < intr_handle->nb_intr; i++) { + if (intr_handle->efds[i] >= 0) + EAL_LOG(NOTICE, "Some interrupt handle is leaking an event FD: %d (index %d)", + intr_handle->efds[i], i); + } if (RTE_INTR_INSTANCE_USES_RTE_MEMORY(intr_handle->alloc_flags)) { rte_free(intr_handle->efds); rte_free(intr_handle->elist); diff --git a/lib/eal/include/rte_interrupts.h b/lib/eal/include/rte_interrupts.h index bb06180bea..85b5546dee 100644 --- a/lib/eal/include/rte_interrupts.h +++ b/lib/eal/include/rte_interrupts.h @@ -389,6 +389,7 @@ rte_intr_efd_enable(struct rte_intr_handle *intr_handle, uint32_t nb_efd); * @internal * It disables the packet I/O interrupt event. * It deletes registered eventfds and closes the open fds. + * All event fd entries in use are reset to -1. * * @param intr_handle * Pointer to the interrupt handle. @@ -605,12 +606,16 @@ rte_intr_efd_counter_size_get(const struct rte_intr_handle *intr_handle); * @internal * Set the event fd array index with the given fd. * + * Entries still holding a valid fd when the instance is freed are reported + * as leaks, so callers managing the array themselves must reset entries + * to -1 once the fd is closed or no longer referenced. + * * @param intr_handle * pointer to the interrupt handle. * @param index * efds array index to be set * @param fd - * event fd + * event fd, or -1 to clear the entry * * @return * - On success, zero. diff --git a/lib/eal/linux/eal_interrupts.c b/lib/eal/linux/eal_interrupts.c index 73f23c314b..dfe1660dd0 100644 --- a/lib/eal/linux/eal_interrupts.c +++ b/lib/eal/linux/eal_interrupts.c @@ -1626,17 +1626,20 @@ RTE_EXPORT_INTERNAL_SYMBOL(rte_intr_efd_disable) void rte_intr_efd_disable(struct rte_intr_handle *intr_handle) { - uint32_t i; - rte_intr_free_epoll_fd(intr_handle); /* Only eventfds created by rte_intr_efd_enable() for MSI-X are owned * by the handle. In other modes the entries reference fds owned by * the device or the driver and must not be closed here. */ if (rte_intr_type_get(intr_handle) == RTE_INTR_HANDLE_VFIO_MSIX) { - for (i = 0; i < (uint32_t)rte_intr_nb_efd_get(intr_handle); i++) + for (int i = 0; i < rte_intr_nb_efd_get(intr_handle); i++) close(rte_intr_efds_index_get(intr_handle, i)); } + /* VDEV is responsible for efds, see rte_intr_efd_enable(). */ + if (rte_intr_type_get(intr_handle) != RTE_INTR_HANDLE_VDEV) { + for (int i = 0; i < rte_intr_nb_efd_get(intr_handle); i++) + rte_intr_efds_index_set(intr_handle, i, -1); + } rte_intr_nb_efd_set(intr_handle, 0); rte_intr_max_intr_set(intr_handle, 0); } -- 2.54.0
