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 10A314625C for ; Tue, 18 Feb 2025 13:37:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06D74402A0; Tue, 18 Feb 2025 13:37:37 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2066.outbound.protection.outlook.com [40.107.212.66]) by mails.dpdk.org (Postfix) with ESMTP id 99F2E402A0 for ; Tue, 18 Feb 2025 13:37:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Tj66tmHOzOtDczsu/k7+abHzpFifzRzcNknW+hBahLLfv7S67wir8DMsSA3o88CfTMivBD5rOtzT6qlY5extFcHsdaWyuFAqO0SIrPE4PMif+UKafPPq02fPVMd3TRsaYTOTiSqnrJNjlxXhM6+1EUEMyEwfQIxxcuaPrO+hx2o50MVYlD4H7S9KS2AVZpXLvjK1BpVfIRHmrumY5UP8fSPJavc62y3/LZdx5ii3/4jxT19DTBGK+9qVROtvRJ/fa3ZV+N1QSLt/5OTzjh6eWSVFUVCfgCQCx5op6GrZBAqkO9AkjOzwb+IzZfAlrC16aReKL9n+eI6y2jwUuedPaw== 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=9sCPPaDqQSi6uuJvsKt2h9yCDpBshxxcrjc1OD71CmQ=; b=VkeiYJvjITDoWI+StjY0UlB6Z+BqDS/N7y2wlUa+SgxHZX9dTnPp7lirIb9MWY30FefjqDzNKK8l+/6QrP9PonIkGvNIUQDXHE/xKdPaa6HJLp2R8ygdzFpkHGPV0HRjfPOBg09qV2fOjb6Cuf+fW/nSBR9lN8Ra+p78a60WRqzvd2epaLy0aNzvepVLv6/gfhWE6ePbBRRo6F+gG+PuF2O+xvzr2xmqXmSAr17xfSQhii/9dt+6dOsk6BszLVFs6lYQyyw3eZFBHguxiVUVXW0FaOu56FHX7n52dVs/fZ/dGqmtjFpQ6NMC/ExzkXPEP+9nwQVJ81PzwmHGTmMCww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=9sCPPaDqQSi6uuJvsKt2h9yCDpBshxxcrjc1OD71CmQ=; b=sOx2QvtdGDo94qc0I2AkUxIQmdGwGkh/5ryP01/TbRBPYYGOlAObDaG2Bf5lQA/20thHAVjMIkKKvjX3LV1hJLXtku/CVVXYzZXevJ1fvKmBbhZYkzeDeIFfwgKE0+91ozegYVazqLPORG0PcumK9eIw+wOhY65lIa9K1h/P+YS4dw1xtySUWQvjoft0x8RkA/U2Zvv7flJgJ3rCr6A32BYCQqPHMxoZAWNGlK2ZECnuED8VJc9rq2eL1b/xV0WgjbsT/xLa6d76D6eRtEeOk6TPs4qMA7pDhuePv5FpjKf/sDZZqY/JnQ8UW3PszYlMqxOEzyAAYaP2agY2Xxg+sQ== Received: from MW4PR03CA0202.namprd03.prod.outlook.com (2603:10b6:303:b8::27) by CH2PR12MB4070.namprd12.prod.outlook.com (2603:10b6:610:ae::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.14; Tue, 18 Feb 2025 12:37:33 +0000 Received: from MWH0EPF000989E6.namprd02.prod.outlook.com (2603:10b6:303:b8:cafe::32) by MW4PR03CA0202.outlook.office365.com (2603:10b6:303:b8::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Tue, 18 Feb 2025 12:37:33 +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 MWH0EPF000989E6.mail.protection.outlook.com (10.167.241.133) 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:37:33 +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:37:21 -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:37:19 -0800 From: Xueming Li To: Vladimir Medvedkin CC: , Bruce Richardson , "dpdk stable" Subject: patch 'net/ice: fix memory leak in scalar Rx' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:12 +0800 Message-ID: <20250218123523.36836-18-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: MWH0EPF000989E6:EE_|CH2PR12MB4070:EE_ X-MS-Office365-Filtering-Correlation-Id: ae08b41d-0ff9-42ea-8aff-08dd50190445 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?giq6hO4PDtyUvIei3j6vU0Q1OH2rCzE6MJRyAMOjQdwra1g1dNfgpr08H6Zt?= =?us-ascii?Q?zxfdesGVyjYwDEtvlDikgDICGa6+VsBzt3QFH4tqpnszV6m3h8jSTiBKmp+V?= =?us-ascii?Q?INFkjrObnbZkBhALvbd3t5LZ6EzjbNWzdlFLrizpzfSXoAHjNYL4siGKEJ/o?= =?us-ascii?Q?8XbujjnDS3rHyfw8I4kG592G0gFEJt99DUtUG9MN5Mun3N8KPIMEWnSHAdwp?= =?us-ascii?Q?Tu9wADENStATVUKaXgm9ptGJXXV8G0iUMh4oie0KG+7QaB9/mNYD6kB7Jenl?= =?us-ascii?Q?gL2VMNZHA2dKj1cv5eCiafOGbhc0Q7pOQRXgJ5pve7rbhBxlCc3CvMAfFIA0?= =?us-ascii?Q?413kxeySqnAsa0wZCeQwcsimhN6oUkz1xLR2ZmecL/EQdsO2a1xzNFRYIRA0?= =?us-ascii?Q?E+TsAKEV2GldYFA0FW2YgVnz1JcT7aOjVxjxxVxGt+OnOvRXBKIJqeiF5Mwh?= =?us-ascii?Q?Z+M/0Gb3N2aXbvQ7XinQ3TTW1ptap4lMNiIFfsdbLto6wTGbR/LZcJnlP5rI?= =?us-ascii?Q?6rhb4VIS2Hng64kPIH+MVID9s/nWbRfcqSMce2QvO5VOUm7Xdue2C2qu4IRY?= =?us-ascii?Q?+yL0JVsKgLKKJ+aLaj6q+tpfqytMQJZkJdg9ZPgJBverTup51ktsGMyAmosw?= =?us-ascii?Q?BpuKzWwkkaWig5b1Ck8Z2pcZ4w742eGO1MwuqEhnbZFEXs2B9Hwmoue5AEuh?= =?us-ascii?Q?ZXvBkU5uDMfXon1RHdYOPWKahJU4jIgaJdA/4SVjk3rtgrXfL2D2merRg4EF?= =?us-ascii?Q?hKI2RwF0gkUscGuH1PSYB8gtqXYYc1JjuaJF3wqUu2OyYQQarWXIZRYqLvaG?= =?us-ascii?Q?nyIUuoB5D1V2OIsJdKi1o5NpkWdWN32iYKrDYZDWtDw7zK0Ws4ufkoOa+y1M?= =?us-ascii?Q?tyyGJkk2BDR1OQInKSW9SA8J35eAEmRVSBuWAjb0t/fIaF48yMH736rCvME1?= =?us-ascii?Q?UlvPdgjw6FA7uZh4dte8lAJdJaexRG7R9ECtBG9Jt0LQhkppQf3nN4bD8EgD?= =?us-ascii?Q?gcHUuzyofMaT21T1QB1jf2HdNtVL989j14NqemKchDwixp7hK+6PhMpSJawr?= =?us-ascii?Q?A97Q9GHOlAPWpaghoz7dDKktX24y78brQOFV3xfbin1qTO0DkKjW/vnoLadg?= =?us-ascii?Q?e+2cwfyL7VCALrnqBdtGzMRdThZRJp3zxb23rv+MbsCc1h4hQ0KrS5LTQGpO?= =?us-ascii?Q?GXG44koRGNISmNuxMG8fyVEtTcWHU6mKrSmgEIKwj3+O7e+h3O/J8SvatNmM?= =?us-ascii?Q?556d8qswSh47wQPL2rraqhvO9Jh89btWnyq8nWUmQ4nmRc5DdoUgs+Ec/Et2?= =?us-ascii?Q?H4jCXkBHO7rsgl6VccDDbJG2W+VVNlMKpmlLy7x+fqwf87Nv0S4LIiCRLJfU?= =?us-ascii?Q?LHqF2bzT21dbfcdyItcLsoJeVNaZgHNCm3/C/JX4ksszGZqE5EtExA/ykURI?= =?us-ascii?Q?J6r2l7tatS9fiYHMqrGQNLnytIYRPfMbdcfWFmvyOBkHkh4tCzUq7k7jF12N?= =?us-ascii?Q?PqqgeNTTFLG24uE=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)(1800799024)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:33.1611 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae08b41d-0ff9-42ea-8aff-08dd50190445 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: MWH0EPF000989E6.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4070 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=fb6aaabf7945b8fd242286cd69368b5cf42a4a91 Thanks. Xueming Li --- >From fb6aaabf7945b8fd242286cd69368b5cf42a4a91 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Fri, 17 Jan 2025 17:52:05 +0000 Subject: [PATCH] net/ice: fix memory leak in scalar Rx Cc: Xueming Li [ upstream commit 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 ] If the buffer splitting feature is configured and the payload mbuf allocation fails, the previously allocated header mbuf may be returned not fully initialized or a memory leak may occur. This patch handles this case correctly by freeing the corresponding header buffer. Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx") Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- drivers/net/ice/ice_rxtx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 644d106814..6af16f9aed 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -484,6 +484,7 @@ ice_alloc_rx_queue_mbufs(struct ice_rx_queue *rxq) struct rte_mbuf *mbuf_pay; mbuf_pay = rte_mbuf_raw_alloc(rxq->rxseg[1].mp); if (unlikely(!mbuf_pay)) { + rte_pktmbuf_free(mbuf); PMD_DRV_LOG(ERR, "Failed to allocate payload mbuf for RX"); return -ENOMEM; } @@ -1874,6 +1875,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq) diag_pay = rte_mempool_get_bulk(rxq->rxseg[1].mp, (void *)mbufs_pay, rxq->rx_free_thresh); if (unlikely(diag_pay != 0)) { + rte_mempool_put_bulk(rxq->mp, (void *)rxep, + rxq->rx_free_thresh); PMD_RX_LOG(ERR, "Failed to get payload mbufs in bulk"); return -ENOMEM; } @@ -2580,6 +2583,13 @@ ice_recv_pkts(void *rx_queue, nmb_pay = rte_mbuf_raw_alloc(rxq->rxseg[1].mp); if (unlikely(!nmb_pay)) { rxq->vsi->adapter->pf.dev_data->rx_mbuf_alloc_failed++; + rxe->mbuf = NULL; + nb_hold--; + if (unlikely(rx_id == 0)) + rx_id = rxq->nb_rx_desc; + + rx_id--; + rte_pktmbuf_free(nmb); break; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.356617522 +0800 +++ 0017-net-ice-fix-memory-leak-in-scalar-Rx.patch 2025-02-18 19:39:00.458244077 +0800 @@ -1 +1 @@ -From 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 Mon Sep 17 00:00:00 2001 +From fb6aaabf7945b8fd242286cd69368b5cf42a4a91 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 07cbd0b43ce4af9d628c8ad751789934d0a8c4a7 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 0c7106c7e0..f58df9bdfe 100644 +index 644d106814..6af16f9aed 100644 @@ -32 +34 @@ -@@ -1900,6 +1901,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq) +@@ -1874,6 +1875,8 @@ ice_rx_alloc_bufs(struct ice_rx_queue *rxq) @@ -41 +43 @@ -@@ -2607,6 +2610,13 @@ ice_recv_pkts(void *rx_queue, +@@ -2580,6 +2583,13 @@ ice_recv_pkts(void *rx_queue,