From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 739C94624E for ; Mon, 17 Feb 2025 18:06:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E738400D6; Mon, 17 Feb 2025 18:06:29 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 782EC402DA for ; Mon, 17 Feb 2025 18:06:27 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4396a4d5e3bso30697795e9.3 for ; Mon, 17 Feb 2025 09:06:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739811987; x=1740416787; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yip+uXrj2fMDzJ8AzBbxk0H4ALdSC/rM2205k4YyxXs=; b=kYs2gmNBsxHylril7HMtj3Jry+01kPisa4jKvB+8YvhXs9krjHOvgpUHKO0n2vkt+/ 4C8rDiJpP0V+s+OE1AL0cI/F3H6MVg+PAuK0aAdFOdKVA8rducrHR0nMHZffEt4mRsqt q8E5ja7H9gJ6nvW9S1UUK01rbbFHXYw5Ea0ljfWVEK/Fcq2/jPHe7duvMETbj5fb/VEg KG46PG8BLjs0X1STE2YxHJCq+IzYtEaBaz8GOoJabY0IOWDSyadj54YYn8UGlD/cEyo0 ciu6Ozgf8V95FuoJ9AvTfwfsZSUAAbMhwaG0ATVWWfhTMQeunHRqpyiM83HZc9l/1ObC EGCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739811987; x=1740416787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yip+uXrj2fMDzJ8AzBbxk0H4ALdSC/rM2205k4YyxXs=; b=O17GTtgDdLFMsJt31UV5HOo3o9Pvm06jr1TbBWvIFlCWI8EohR+F/LbNNuAJggywvO Yt+lRPX2F89lGsjkv6Co17cOp/IZji+Sq8ynAxgDuH6Z0daYKaEqDfQxcOeTKNIxo/sX Sj4mwDQn4J00AMGBWMKuWcFdVawCUzIqbXAQBqmtBWqQg+88MMCJEQwp1LHyL8LyESkP Nu1QeQSp7EMLWi2SySHuyxLLXZcj1LJ7TwYjaSmcsYgREIAEsm4OuZLzDtOdU1FGrUfb WqDUuCQ4AQoNyTRBs7FREPRV+TDem5giUr8rw/7cn85SnsSuejJag8Q6OA3FkTiD1HuS pUSg== X-Forwarded-Encrypted: i=1; AJvYcCXzd5oUmsTeN76WBBpGRgEbdCMy3oWXsHCf2muaD0KfwmZ8PbGc3RwTYIAI+px4/HROLJnrHJ8=@dpdk.org X-Gm-Message-State: AOJu0YxabJbV0Jk8cEteLoMUtTsmli6gR1aEtXMaMfuoFSnNXiTQwVLO AtxtzleMJm5EFr+LBwn64tOHX1elboj5G5opoGw7wJaoHHyClEKWgeaaZCRLgz45tw== X-Gm-Gg: ASbGncv0wZvfdaAuGcNWNGtCS4mjCjwlOaC+b5dG2FInqaPPnbYKHYNgsgq1uvlt7qV mw/k7/F4ks5sKTNHTVcHSJqcSOOBHkyqbAczruPQ6LREVsVwDCy6S8YfzBqJSz7SbRcU8BWt9Tj 6+bRrA6f70MfrQ0Dx4/Cr1+XD2+xrzku3fF4ryiO6MSRz5FY84NCgL/wqZlpfpf0FJnTBItLsrv tojUN9SyJLSUDVEMmQanXGoOwXrPcYE9ZE47C9iF7qXIRcgwdbt6+JDmJUuHzilN7Iq+661yXHI eoJXirVTDERhU7hD3bbbqw== X-Google-Smtp-Source: AGHT+IH200iaxnPQNwOPbQM0ceqTwuxQSinBDRR97745aaeA3oYgk8cPayw9AkUMVnxAjjtWy9I3FA== X-Received: by 2002:a05:600c:1d1d:b0:439:8ada:e3b0 with SMTP id 5b1f17b1804b1-4398adae4e8mr22028605e9.19.1739811986820; Mon, 17 Feb 2025 09:06:26 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4398e84efb9sm9580705e9.10.2025.02.17.09.06.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:26 -0800 (PST) From: luca.boccassi@gmail.com To: "Minggang Li (Gavin)" Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix Netlink socket leak' has been queued to stable release 22.11.8 Date: Mon, 17 Feb 2025 17:04:03 +0000 Message-ID: <20250217170456.1068278-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. So 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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d0d15d60dab85f80f6bae6528109f9981df9cf49 Thanks. Luca Boccassi --- >From d0d15d60dab85f80f6bae6528109f9981df9cf49 Mon Sep 17 00:00:00 2001 From: "Minggang Li (Gavin)" Date: Mon, 23 Dec 2024 12:10:58 +0200 Subject: [PATCH] net/mlx5: fix Netlink socket leak [ upstream commit 556a5f4ccd452d9281c3476b120d1306e0093e01 ] Fixes: 72d7efe464b1 ("common/mlx5: share interrupt management") Signed-off-by: Minggang Li (Gavin) Acked-by: Viacheslav Ovsiienko --- .mailmap | 1 + drivers/net/mlx5/linux/mlx5_os.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.mailmap b/.mailmap index fdcfe1c30a..dc5cb75b71 100644 --- a/.mailmap +++ b/.mailmap @@ -944,6 +944,7 @@ Mike Stolarchuk Mike Ximing Chen Milena Olech Min Cao +Minggang Li (Gavin) Minghuan Lian Mingjin Ye Mingshan Zhang diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 183b5e6a84..b59d559c4f 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -2657,10 +2657,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.921035248 +0000 +++ 0030-net-mlx5-fix-Netlink-socket-leak.patch 2025-02-17 16:13:16.818441593 +0000 @@ -1 +1 @@ -From 556a5f4ccd452d9281c3476b120d1306e0093e01 Mon Sep 17 00:00:00 2001 +From d0d15d60dab85f80f6bae6528109f9981df9cf49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 556a5f4ccd452d9281c3476b120d1306e0093e01 ] + @@ -7 +8,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 4bc9721321..dc3dd9e5a2 100644 +index fdcfe1c30a..dc5cb75b71 100644 @@ -20 +21 @@ -@@ -1036,6 +1036,7 @@ Mike Stolarchuk +@@ -944,6 +944,7 @@ Mike Stolarchuk @@ -29 +30 @@ -index 996c97a6a9..169c229172 100644 +index 183b5e6a84..b59d559c4f 100644 @@ -32 +33 @@ -@@ -3070,10 +3070,15 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh) +@@ -2657,10 +2657,15 @@ mlx5_os_dev_shared_handler_install(struct mlx5_dev_ctx_shared *sh)