From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: stephen@networkplumber.org, hkalra@marvell.com,
Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>,
Jakub Grajciar <jgrajcia@cisco.com>,
Thomas Monjalon <thomas@monjalon.net>
Subject: [PATCH 7/9] net/memif: reset FD in interrupt handle
Date: Wed, 21 Oct 2026 11:23:16 +0200 [thread overview]
Message-ID: <20261021092318.1554295-8-david.marchand@redhat.com> (raw)
In-Reply-To: <20261021092318.1554295-1-david.marchand@redhat.com>
Clear FD references before freeing interrupt handles to avoid
spurious leak warnings. In error paths where the socket fd is
closed separately, clear the reference. In cleanup paths, use
rte_intr_fd_close() to close and clear in one call.
Fixes: d770ee9caed0 ("interrupts: warn on leaked FDs")
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/memif/memif_socket.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index bd52a95473..b47c7a3b1b 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -638,7 +638,7 @@ memif_disconnect(struct rte_eth_dev *dev)
pmd->cc,
memif_intr_unregister_handler);
} else if (ret > 0) {
- close(rte_intr_fd_get(ih));
+ rte_intr_fd_close(ih);
rte_intr_instance_free(ih);
rte_free(pmd->cc);
}
@@ -962,6 +962,8 @@ memif_listener_handler(void *arg)
if (cc != NULL) {
rte_intr_callback_unregister(cc->intr_handle, memif_intr_handler,
cc);
+ /* fd is closed below, clear reference here. */
+ rte_intr_fd_set(cc->intr_handle, -1);
rte_intr_instance_free(cc->intr_handle);
rte_free(cc);
}
@@ -1060,6 +1062,8 @@ memif_socket_create(char *key, uint8_t listener, bool is_abstract, uid_t owner_u
error:
MIF_LOG(ERR, "Failed to setup socket %s: %s", key, strerror(errno));
if (sock != NULL) {
+ /* fd is closed below, clear reference here. */
+ rte_intr_fd_set(sock->intr_handle, -1);
rte_intr_instance_free(sock->intr_handle);
rte_free(sock);
}
@@ -1118,8 +1122,7 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)
if (socket->listener) {
rte_intr_callback_unregister(socket->intr_handle,
memif_listener_handler, socket);
- close(rte_intr_fd_get(socket->intr_handle));
- rte_intr_fd_set(socket->intr_handle, -1);
+ rte_intr_fd_close(socket->intr_handle);
rte_intr_instance_free(socket->intr_handle);
}
rte_free(socket);
@@ -1191,8 +1194,7 @@ memif_socket_remove_device(struct rte_eth_dev *dev)
if (pmd->role != MEMIF_ROLE_CLIENT) {
rte_intr_callback_unregister(socket->intr_handle, memif_listener_handler,
socket);
- close(rte_intr_fd_get(socket->intr_handle));
- rte_intr_fd_set(socket->intr_handle, -1);
+ rte_intr_fd_close(socket->intr_handle);
rte_intr_instance_free(socket->intr_handle);
}
rte_free(socket);
@@ -1290,6 +1292,8 @@ memif_connect_client(struct rte_eth_dev *dev)
sockfd = -1;
}
if (pmd->cc != NULL) {
+ /* fd is closed above, clear reference here. */
+ rte_intr_fd_set(pmd->cc->intr_handle, -1);
rte_intr_instance_free(pmd->cc->intr_handle);
rte_free(pmd->cc);
pmd->cc = NULL;
--
2.54.0
next prev parent reply other threads:[~2026-10-21 9:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-21 9:23 [PATCH 0/9] Interrupt fixes for leaks and warnings David Marchand
2026-10-21 9:23 ` [PATCH 1/9] eal/linux: fix FD leak in alarm subsystem David Marchand
2026-10-21 9:23 ` [PATCH 2/9] eal/linux: reset FD in interrupt handle for uevent David Marchand
2026-10-21 9:23 ` [PATCH 3/9] interrupts: do not duplicate interrupt handles David Marchand
2026-10-21 9:23 ` [PATCH 4/9] bus/pci: reset VFIO device FD after release David Marchand
2026-10-21 9:23 ` [PATCH 5/9] net/mana: reset FD in interrupt handle David Marchand
2026-10-21 9:23 ` [PATCH 6/9] net/memif: fix some interrupt FD leaks David Marchand
2026-10-21 9:23 ` David Marchand [this message]
2026-10-21 9:23 ` [PATCH 8/9] net/sxe2: reset FD in interrupt handle David Marchand
2026-10-21 9:23 ` [PATCH 9/9] raw/ifpga: " David Marchand
2026-10-24 13:21 ` [PATCH v2 00/12] Interrupt fixes for leaks and warnings David Marchand
2026-10-24 13:21 ` [PATCH v2 01/12] eal/linux: fix FD leak in alarm subsystem David Marchand
2026-10-24 13:21 ` [PATCH v2 02/12] eal/linux: reset FD in interrupt handle for uevent David Marchand
2026-10-24 14:07 ` Burakov, Anatoly
2026-10-24 13:21 ` [PATCH v2 03/12] interrupts: do not duplicate interrupt handles David Marchand
2026-10-24 14:11 ` Burakov, Anatoly
2026-10-26 15:39 ` David Marchand
2026-10-24 13:21 ` [PATCH v2 04/12] bus/pci: reset VFIO device FD after release David Marchand
2026-10-24 14:11 ` Burakov, Anatoly
2026-10-24 13:21 ` [PATCH v2 05/12] net/mana: reset FD in interrupt handle David Marchand
2026-10-24 13:21 ` [PATCH v2 06/12] net/memif: fix some interrupt FD leaks David Marchand
2026-10-24 13:21 ` [PATCH v2 07/12] net/memif: reset FD in interrupt handle David Marchand
2026-10-24 13:21 ` [PATCH v2 08/12] net/sxe2: " David Marchand
2026-10-24 13:21 ` [PATCH v2 09/12] raw/ifpga: " David Marchand
2026-10-24 13:21 ` [PATCH v2 10/12] eal/linux: fix closing of event FDs not owned by EAL David Marchand
2026-10-24 13:21 ` [PATCH v2 11/12] eal/linux: fix eventfd leaks when enabling interrupts David Marchand
2026-10-24 13:21 ` [PATCH v2 12/12] interrupts: warn on leaked event FDs David Marchand
2026-10-27 17:16 ` [PATCH v2 00/12] Interrupt fixes for leaks and warnings David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261021092318.1554295-8-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=hkalra@marvell.com \
--cc=jgrajcia@cisco.com \
--cc=sriram.yagnaraman@ericsson.com \
--cc=stephen@networkplumber.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox