patch 'net/nfp: fix initialization failure flow' has been queued to stable release 23.11.1

Xueming Li xuemingl at nvidia.com
Sat Apr 13 14:49:27 CEST 2024


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 04/15/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=0884b3bd36a9880955f5b7d9a59c5a71619e3c0f

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 0884b3bd36a9880955f5b7d9a59c5a71619e3c0f Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Thu, 14 Mar 2024 15:40:19 +0800
Subject: [PATCH] net/nfp: fix initialization failure flow
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit fdaa8f98d754a704e00c7738c177efd43b669081 ]

CI found there has unreachable control flow, fix it by remove the
missing delete 'return' statement.

Coverity issue: 414938
Fixes: 369945667251 ("net/nfp: fix resource leak for device initialization")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Peng Zhang <peng.zhang at corigine.com>
---
 drivers/net/nfp/nfp_ethdev.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 5e473d9c16..7baacd18b0 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -669,7 +669,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	err = nfp_net_tlv_caps_parse(eth_dev);
 	if (err != 0) {
 		PMD_INIT_LOG(ERR, "Failed to parser TLV caps");
-		return err;
 		goto free_area;
 	}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:07.672265038 +0800
+++ 0087-net-nfp-fix-initialization-failure-flow.patch	2024-04-13 20:43:05.037753879 +0800
@@ -1 +1 @@
-From fdaa8f98d754a704e00c7738c177efd43b669081 Mon Sep 17 00:00:00 2001
+From 0884b3bd36a9880955f5b7d9a59c5a71619e3c0f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit fdaa8f98d754a704e00c7738c177efd43b669081 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +23 @@
-index 31c54a595c..568de1d024 100644
+index 5e473d9c16..7baacd18b0 100644
@@ -24 +26 @@
-@@ -936,7 +936,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
+@@ -669,7 +669,6 @@ nfp_net_init(struct rte_eth_dev *eth_dev)


More information about the stable mailing list