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 2FA084625C for ; Tue, 18 Feb 2025 13:40:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B9A9402A0; Tue, 18 Feb 2025 13:40:03 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2052.outbound.protection.outlook.com [40.107.223.52]) by mails.dpdk.org (Postfix) with ESMTP id DC702402A0 for ; Tue, 18 Feb 2025 13:40:01 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=njATeJBIhcQxIEQkRnFdgKnhr2KRX/dLvcGh8IXkvWfhvWz7ABb31dylM3gw8FwLRckeDLtZX6FK+YORjY6b0Rl+Qm/DvDxvcFRl2oP2FQcHif3IChp1nzTsaGgsWB+aKqaDdclr9jP+eZnw2+OREFaISi+FxHzllwdsFY0Shbc48BzL7sRgKxaHdxTOlb7QPd5RVFj7vqj/nqI65gFfq1uZUUUsu6HcN3bq0+77ISGIdJj1mvpm1a++U6bJvzVl+nP4zxz/KnioaiaQ93ov+ugDVdP/WM54hpjFt+3XxZuZnO0rfYzIVE3wbqSXidMAXKd0rYJym017XU7TavLpMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DJeGAFlA4HryMJPwkVG+60OOM0wsgc5sR08Vvy+y4/o=; b=h+wTPvLYnFzaeiRjANGqIh2Q7TQ0jXR6g3tIASOw4sh2ODoFfELwFp3gP0toFw4rKGOQAox9xxz4MiPDpYLW39PeZ5AUS8lc1wt2IBlqPGg+P32PXh97njPet1uspaKbjVQRlNfv5dxmxCCTRVz8wzrwdvDs2yY3LN3Rs30pYSZNbEGcP5lOYZxP+Cl6CHHCrNeLqqufe/v6RAZ4ZO54tY60rDna3RSSsDnny1RpAv5Q6gT6eJoScydwDCMceWUxqHwymxci7jxaKdaodNBk0wMuostMDoJ8u7Tl3Q9AcNV1OV8WOt6SNEcdjYRaOriTx2LUzvt/5IpVQ1MRiFJUpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DJeGAFlA4HryMJPwkVG+60OOM0wsgc5sR08Vvy+y4/o=; b=n5m34vUmGmty74lKT4/02G5y0chPBEPi+BGkgkIwc6J+0RgGzbmZzaJnMObSffw5BywS7MGukx6GHKoT0+mba3kzpZ4XGMNH0iLm7ZwbsySPYM/0DTwpUMM/HVlsGCwDVyLvaJZOBMaEFw/z2M2U0nRkZrbyHLYxm2KSfNx1uVUu6pUfsrNp6mZG3uTCzAvpfYsRCY6plQm1OHGjcaT324I8FCBZhp6p8+PluYo/b/8kSBO+FhIlYHR4i9r3hhq7oziGsTYHzMMnlrJJScxnVMtyILRVdvBsQaVGWlynnA1TYC1vGe77Xg17f+yWWsHYCxHuQdI59dvHiK4HLYxkqg== Received: from MW3PR05CA0013.namprd05.prod.outlook.com (2603:10b6:303:2b::18) by BL4PR12MB9505.namprd12.prod.outlook.com (2603:10b6:208:591::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:39:55 +0000 Received: from MWH0EPF000989E5.namprd02.prod.outlook.com (2603:10b6:303:2b:cafe::68) by MW3PR05CA0013.outlook.office365.com (2603:10b6:303:2b::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:39:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989E5.mail.protection.outlook.com (10.167.241.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:39:55 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:39:47 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:39:45 -0800 From: Xueming Li To: "Minggang Li (Gavin)" CC: , Viacheslav Ovsiienko , "dpdk stable" Subject: patch 'net/mlx5: fix Netlink socket leak' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:36 +0800 Message-ID: <20250218123523.36836-42-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E5:EE_|BL4PR12MB9505:EE_ X-MS-Office365-Filtering-Correlation-Id: 43742bb3-f9b8-4da2-a257-08dd50195925 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?W3nvvcsAaXRHXaWpt44tIDsW/mONN+bJ9b8d0OVpgHflHErkUomEAqlfbGaf?= =?us-ascii?Q?5N4ZCsJpaffjdcW+79lf9o48QXwv/9H2Hq8hDQIgpCzU87uGrDIXbNfluR/2?= =?us-ascii?Q?T3iuokmJjX0lLC6Ki3/rUqx4SppR/7lDai80UtMKZm7eNoL433WiZNZ4XhF3?= =?us-ascii?Q?OEdgGgkWCqnNicySj3ymkh0oHP5EmisCy4yLbsi0jZMPSkMx6vdlnRLbMl0f?= =?us-ascii?Q?cn2MllY5HFbKT61erRDFdLmMnP+BoFTmTYtdbbSduYnGz9p3y1ePl7fWWMwJ?= =?us-ascii?Q?DUQrhZZLvxfRhWGsgLYwLW2Ye8ovHH7XLvlIHr/om22tEJ/JfEdbAHoMqIAW?= =?us-ascii?Q?fxeCDoEucxGuw/2ceqJE4WQDfapIoqwnNMKuOu6wtgUhHspLjwuxhyfdml//?= =?us-ascii?Q?COXalaBvw1D5hF/dzyxFDdbTo4XPDLktz1KtBUi6iPckpiZCtW8iJSkJKLbt?= =?us-ascii?Q?jHuOzvZa66TkNxr0q7jW0kOtwYSWP/0sjJFXcGgjw6pLmV8PzlSl+h8dx+vL?= =?us-ascii?Q?A2k5QhGxvPyOkdDAkDorq9X3UTscm1lrZ5QDI5+IO/GFmm9hPFoVUu77clp5?= =?us-ascii?Q?Rs1+XSjIOwiZgMAo/A9MmwnirLtI4K5U0sUqFMG8rFZ0SPzQsLUxZ9kXVHzD?= =?us-ascii?Q?wbBDQ9Sjr7xGFx1bjMoNgEitVog6TDxcmPorST/BuKYTxmhVn3wFTrZGzvHv?= =?us-ascii?Q?13BQPS1iFCG+atyEKm0WIissvVvx3/hhYTVThB9eTVb4R4goFx9uPbCknvp1?= =?us-ascii?Q?2siAVyxfPlMA5XJJl+erKsuOKezLW69WrcJHVMxgtQcjHWjmTy4qcJl9yb3j?= =?us-ascii?Q?NzDmcppomLaaao4mdCefRA8lbu4HPk7YffrmwQEE0UGq0M5hq42AfjdANsgE?= =?us-ascii?Q?2PzfcLsDHMlX1G5rJ5Qn3fEgYjdNHwS7m/mR5Cx7gjPH65LfALpfmP/ZP7gc?= =?us-ascii?Q?AbV+BBEOlWeB7GKt1T/VS/87pYjizdSmfgEoGw/XOZmOfqJlg+xGy4ZJTxL0?= =?us-ascii?Q?DkdcoJJ3/v1Lnesm6RDo5krnlKpYnE4gdcOQtSCc02H27cb7Wgrj9FXqpg0e?= =?us-ascii?Q?6Ee7Z0fNr80F4un6rl1I/eUgkfDwvkvc70O/FbB38pPvXx3P9N6vwJJVnoAy?= =?us-ascii?Q?T8Z+51FKjavmAFwWPNu7NL3qMAeY9uKMtymGAFNqG89s/Pw04Gf1h9RjUnAU?= =?us-ascii?Q?HYrh978F3FumJSdA79nVVH0b275AmGkmXsVM3DIMs8tFwVFygRQMlgE3ap7A?= =?us-ascii?Q?gUYLZi/I86pttrW3zbB2uOepj6zGg4RaNtcgSBhqWvmJSbi147nkGb0psmwb?= =?us-ascii?Q?L9biScuHD6ws8s3qDuAVA+9V8iOypcvOvdyLNJaBEYRddjtlCYqBzF3yEAeA?= =?us-ascii?Q?BktjXMy0uqAx/gtxhalEMegQIxap5uytecep2LaEm29TZnQdIlKfbycmDKfJ?= =?us-ascii?Q?mcnYqhriY/xW/JC6OdHfPc0rWxsh1Syd3E6sKLqSYxFSe/hoS8WXxLsPiVSW?= =?us-ascii?Q?eSNX0x4PjWcEFbA=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:39:55.5584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43742bb3-f9b8-4da2-a257-08dd50195925 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989E5.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL4PR12MB9505 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 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 --- >From e0ddea424190d6214b8b532ef03c1a45c88a1174 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 Cc: Xueming Li [ 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 60eac79c6b..6984cb9940 100644 --- a/.mailmap +++ b/.mailmap @@ -982,6 +982,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 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 + +[ upstream commit 556a5f4ccd452d9281c3476b120d1306e0093e01 ] @@ -7 +9,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ -index 4bc9721321..dc3dd9e5a2 100644 +index 60eac79c6b..6984cb9940 100644 @@ -20 +22 @@ -@@ -1036,6 +1036,7 @@ Mike Stolarchuk +@@ -982,6 +982,7 @@ Mike Stolarchuk @@ -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)