patch 'net/mlx5: fix Netlink socket leak' has been queued to stable release 23.11.4

Xueming Li xuemingl at nvidia.com
Tue Feb 18 13:34:36 CET 2025


Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
Please shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e0ddea424190d6214b8b532ef03c1a45c88a1174

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From e0ddea424190d6214b8b532ef03c1a45c88a1174 Mon Sep 17 00:00:00 2001
From: "Minggang Li (Gavin)" <gavinl at nvidia.com>
Date: Mon, 23 Dec 2024 12:10:58 +0200
Subject: [PATCH] net/mlx5: fix Netlink socket leak
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 556a5f4ccd452d9281c3476b120d1306e0093e01 ]

Fixes: 72d7efe464b1 ("common/mlx5: share interrupt management")

Signed-off-by: Minggang Li (Gavin) <gavinl at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 .mailmap                         | 1 +
 drivers/net/mlx5/linux/mlx5_os.c | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/.mailmap b/.mailmap
index 60eac79c6b..6984cb9940 100644
--- a/.mailmap
+++ b/.mailmap
@@ -982,6 +982,7 @@ Mike Stolarchuk <mike.stolarchuk at bigswitch.com>
 Mike Ximing Chen <mike.ximing.chen at intel.com>
 Milena Olech <milena.olech at intel.com>
 Min Cao <min.cao at intel.com>
+Minggang Li (Gavin) <gavinl at nvidia.com>
 Minghuan Lian <minghuan.lian at nxp.com>
 Mingjin Ye <mingjinx.ye at intel.com>
 Mingshan Zhang <mingshan.zhang at intel.com>
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 9dcdc8581a..fdc4dc1cf8 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2968,10 +2968,15 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh)
 void
 mlx5_os_dev_shared_handler_uninstall(struct mlx5_dev_ctx_shared *sh)
 {
+	int fd;
+
 	mlx5_os_interrupt_handler_destroy(sh->intr_handle,
 					  mlx5_dev_interrupt_handler, sh);
+	fd = rte_intr_fd_get(sh->intr_handle_nl);
 	mlx5_os_interrupt_handler_destroy(sh->intr_handle_nl,
 					  mlx5_dev_interrupt_handler_nl, sh);
+	if (fd >= 0)
+		close(fd);
 #ifdef HAVE_IBV_DEVX_ASYNC
 	mlx5_os_interrupt_handler_destroy(sh->intr_handle_devx,
 					  mlx5_dev_interrupt_handler_devx, sh);
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:02.186725979 +0800
+++ 0041-net-mlx5-fix-Netlink-socket-leak.patch	2025-02-18 19:39:00.558244060 +0800
@@ -1 +1 @@
-From 556a5f4ccd452d9281c3476b120d1306e0093e01 Mon Sep 17 00:00:00 2001
+From e0ddea424190d6214b8b532ef03c1a45c88a1174 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 556a5f4ccd452d9281c3476b120d1306e0093e01 ]
@@ -7 +9,0 @@
-Cc: stable at dpdk.org
@@ -17 +19 @@
-index 4bc9721321..dc3dd9e5a2 100644
+index 60eac79c6b..6984cb9940 100644
@@ -20 +22 @@
-@@ -1036,6 +1036,7 @@ Mike Stolarchuk <mike.stolarchuk at bigswitch.com>
+@@ -982,6 +982,7 @@ Mike Stolarchuk <mike.stolarchuk at bigswitch.com>
@@ -29 +31 @@
-index 996c97a6a9..169c229172 100644
+index 9dcdc8581a..fdc4dc1cf8 100644
@@ -32 +34 @@
-@@ -3070,10 +3070,15 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh)
+@@ -2968,10 +2968,15 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh)


More information about the stable mailing list