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 4351643B86 for ; Tue, 5 Mar 2024 10:56:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B39C41140; Tue, 5 Mar 2024 10:56:12 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2048.outbound.protection.outlook.com [40.107.220.48]) by mails.dpdk.org (Postfix) with ESMTP id 8F3924014F for ; Tue, 5 Mar 2024 10:56:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FbOfg/9rOKXrNPoNMIWOpPxHX6qyD+wPHJEvFI4GveaZXbtZDXBnQsDjcqFIW6o6RbA4q0iMybdWnOcnqZ9Z3Zc8AMsJFo5lxk1Wk3zfVoJPWHYKaQAp9DWYSl2lCTqE7OFmzh3wyGyCLnW1fqyVELcjlLodf65AK+tZj4Hf1mEdzFGIkbKyFeekl6piee/WSOwt7BIf6K2EKGRDTf7Z1UaChUJVDkRgZWDrK6Wz12Uqgq9fG7YJPDsA+3e8/HceCO0DKdL/7RC9pXwzJ7t4VWCbZjfSoAYQvlZXIDLulH/1Fs20OSS07TSw3N16c436jiXnGGD7a6nQ6XS+nHg73g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=nKWbWeElqqIDgP6auUFAVMA1M4nTZYMZRL2S9R7Vjlo=; b=ljXJieY6mk3zzIIRd1RymJacmEOqCPBJGSNV7T4yVq6yAYD7btp7q6LPEMeiYL4DKfnMDxPFtnIcgoW/qY15x7hJ2EMzaVLOIkM/ddwThMYXoBPbfxZFM/zVx5luUVAaA25YCX87HxRIhpseBWEq1fre6RDg2bQgPZdQFYDfpciSi9sr/YW0PkgabUYe/Gdk0HXgpqS0oaksKnFOSv3cow0hLG1/6W4Hiw+G8jFN5tBN0T4LmccDp0SSJNFUe8fIPxrhEvFZOzT0yZGVZxXjmpYMc0ww+AXauem/FfjVeP5/+mG91R0z8o5GPGP+D4VjpEwoxJfHlBYI2XI3OJNtRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.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=nKWbWeElqqIDgP6auUFAVMA1M4nTZYMZRL2S9R7Vjlo=; b=mTrDwQDVwAR+fQ94Je4HuDtASM8dDsY+owfwHy0fv3jVoQZOKigDTkELU6nsXe1giPNVpKaHMMTHdEJRoqonTF1XzOtJXmvNYfsmvp/fWE9ME557X/M0yjnvikBaFUDSFvdcSFHJlTxe3ruRPp04ZR6m3P4wF6T/DN9L2OUWRehqgNL2zI0vqv0in3hQuZhyaSdUmP+tyhxY1BFGIeyJAqdNCVxkJhz84TrQa1QC86sei/eNOI6rR7NxGBm3m9cM/QZ6mRafALOtWEwvVI3De7Pl6utqKDLl2/6gg/AVL8IUW/Eu6GGFOGlmUtE7Sp1boTJ6Bkk42ymv7GOfEprzaw== Received: from BYAPR02CA0031.namprd02.prod.outlook.com (2603:10b6:a02:ee::44) by LV8PR12MB9420.namprd12.prod.outlook.com (2603:10b6:408:200::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:56:05 +0000 Received: from SJ5PEPF000001D5.namprd05.prod.outlook.com (2603:10b6:a02:ee:cafe::5d) by BYAPR02CA0031.outlook.office365.com (2603:10b6:a02:ee::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:56:05 +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 SJ5PEPF000001D5.mail.protection.outlook.com (10.167.242.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:56:05 +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.986.41; Tue, 5 Mar 2024 01:55:54 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:55:53 -0800 From: Xueming Li To: Long Wu CC: Chaoyong He , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix Rx memory leak' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:10 +0800 Message-ID: <20240305094757.439387-90-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ5PEPF000001D5:EE_|LV8PR12MB9420:EE_ X-MS-Office365-Filtering-Correlation-Id: 3dd1e3d0-8ed2-4930-4728-08dc3cfa7929 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A3wECNEEJjt3eq8NOBG0b7tGfDVXzxTRQih7WDFz/TQ1Jm8sUUtWV3LvAsfWJBRx8qgipoLIo9BHLUJ07Or0qVAX44ntGBL54U10wf8kgDeK2N5ar9H7Q6OzwU5let9+a778tR7dxzXqKlL1bL0hfQ4yLbrVv32V7YIuRRCz2XKYY6z+cTr0it62bsroH4AYw33L7bOTCwpnc/9NqiE6TGO0Sw4cvUg9dZPtuJFLNkczxyU0a5iCo4TS302jvp8wN3JoCbB3gr67fgo6AjFwIHwtAD3X667E6XOMEaP2VJkuuOrM1qiTF1ztJPEPdfghfKpJkaDt+Vgl1bBF92CH7SyvQKRcFcGtIXRkikSEYKhwC7iX35qEYUuXaysYVNH4rHxBA/gNLd00SYo4VzX1D1kOVYvC2z/dMmX8cswQpOJHeRbs/eh9RY81Du9bcqP0Qgil4EQziE+DXePpuGzqHzYlAQehQOAunAbXcwto4mVR+lzdoexUw6LIARi4g/Zq3scH4Q3EdXBbOZ61BGxcpXscWiJ1KMJafqfxAdnpIwf29IcbOssE96FLZf4b2vOPSd4fxgk6igkEOPkCasxpeglUlqrxFjevBkTpehJWVod/jQxeMtpPyKQjzMg1y++cv8LNV6oxKGJPw/1ZNbOFLF5uCaYGKN0v9WtduymHfUP6e6T3vkOnfaagSWHrWC3JY81oflOjGVeGhH5b4VhM26hxd5iq2ihVcW3NKpaRu6UTHXkRuZfGf7y5P3u5O/xZ 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:(13230031)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:56:05.1694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3dd1e3d0-8ed2-4930-4728-08dc3cfa7929 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: SJ5PEPF000001D5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9420 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/24. 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://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=e024c471f940415824c3ca508f71135bf4072bae Thanks. Xueming Li --- >From e024c471f940415824c3ca508f71135bf4072bae Mon Sep 17 00:00:00 2001 From: Long Wu Date: Mon, 11 Dec 2023 13:45:25 +0800 Subject: [PATCH] net/nfp: fix Rx memory leak Cc: Xueming Li [ upstream commit 2bef94420b9036c4ad7e41270e9623ab540fa35f ] If the Rx ring is full and do not care its return value, this will cause memory leak. Fixes: 766d51c9ce29 ("net/nfp: merge receive function") Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 3698a3d4aa..1dc9b4250b 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -133,7 +133,9 @@ nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw, return false; } - rte_ring_enqueue(repr->ring, (void *)mbuf); + if (rte_ring_enqueue(repr->ring, (void *)mbuf) != 0) + return false; + return true; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.706014490 +0800 +++ 0089-net-nfp-fix-Rx-memory-leak.patch 2024-03-05 17:39:30.843566495 +0800 @@ -1 +1 @@ -From 2bef94420b9036c4ad7e41270e9623ab540fa35f Mon Sep 17 00:00:00 2001 +From e024c471f940415824c3ca508f71135bf4072bae Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2bef94420b9036c4ad7e41270e9623ab540fa35f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index f950ae233b..94b50611f0 100644 +index 3698a3d4aa..1dc9b4250b 100644