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 B394843DF8 for ; Thu, 4 Apr 2024 11:52:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA9C840695; Thu, 4 Apr 2024 11:52:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 4CE85402E9 for ; Thu, 4 Apr 2024 11:52:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AI/pByIobQuQ+0XXaZK5WPo3hjzfuWCoKxm9RFRyLnI=; b=cW4Glr/NC7jdbgVeZrmHXCoSTsRewQLIgCjKMNRYREglwIVH3x9gVHlOhA1gSAO3u0s/ly 6Gzq4X5zlo+sAS0lhRArHRwU3ez2RYLQ66AddBLhnZzJcTcSkGfP4TiGi7s/mJ30Cua0Rx jCC4Gp00D89rRaZuDzGSe1h4oyzlEEE= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-196-nwYR7cc6OLWWq8dmomBsgQ-1; Thu, 04 Apr 2024 05:52:45 -0400 X-MC-Unique: nwYR7cc6OLWWq8dmomBsgQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A8DA1C05EA4; Thu, 4 Apr 2024 09:52:45 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F5F43C21; Thu, 4 Apr 2024 09:52:44 +0000 (UTC) From: Kevin Traynor To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix resource leak for PF initialization' has been queued to stable release 21.11.7 Date: Thu, 4 Apr 2024 10:51:51 +0100 Message-ID: <20240404095155.155427-21-ktraynor@redhat.com> In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com> References: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/09/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6be826afff5fdc4ceb3f6ae68d8a0b6e50aaf0a0 Thanks. Kevin --- >From 6be826afff5fdc4ceb3f6ae68d8a0b6e50aaf0a0 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Mon, 4 Dec 2023 09:57:14 +0800 Subject: [PATCH] net/nfp: fix resource leak for PF initialization [ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ] Fix the resource leak problem in the abnormal logic of PF initialize function. Fixes: 646ea79ce481 ("net/nfp: move PF functions into its own file") Fixes: 8ba461d1eecc ("net/nfp: introduce keepalive mechanism for multiple PF") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index e1da0bdebe..19076e8f18 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -941,5 +941,5 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) hwqueues_cleanup: - nfp_cpp_area_free(pf_dev->hwqueues_area); + nfp_cpp_area_release_free(pf_dev->hwqueues_area); ctrl_area_cleanup: nfp_cpp_area_free(pf_dev->ctrl_area); -- 2.44.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-04 10:49:34.527465795 +0100 +++ 0021-net-nfp-fix-resource-leak-for-PF-initialization.patch 2024-04-04 10:49:33.769457788 +0100 @@ -1 +1 @@ -From 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 Mon Sep 17 00:00:00 2001 +From 6be826afff5fdc4ceb3f6ae68d8a0b6e50aaf0a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 528812a63c4c2d74ccf2c2f2aa297fcbff3ceea9 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/nfp/nfp_ethdev.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drivers/net/nfp/nfp_ethdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -21 +22 @@ -index c132e97d1a..6fdde105ba 100644 +index e1da0bdebe..19076e8f18 100644 @@ -24 +25 @@ -@@ -1334,5 +1334,5 @@ nfp_pf_init(struct rte_pci_device *pci_dev) +@@ -941,5 +941,5 @@ static int nfp_pf_init(struct rte_pci_device *pci_dev) @@ -27,10 +28,4 @@ -- nfp_cpp_area_free(pf_dev->qc_area); -+ nfp_cpp_area_release_free(pf_dev->qc_area); - sym_tbl_cleanup: - free(sym_tbl); -@@ -1340,4 +1340,5 @@ fw_cleanup: - nfp_fw_unload(cpp); - nfp_net_keepalive_stop(&pf_dev->multi_pf); -+ nfp_net_keepalive_uninit(&pf_dev->multi_pf); - eth_table_cleanup: - free(nfp_eth_table); +- nfp_cpp_area_free(pf_dev->hwqueues_area); ++ nfp_cpp_area_release_free(pf_dev->hwqueues_area); + ctrl_area_cleanup: + nfp_cpp_area_free(pf_dev->ctrl_area);