patch 'net/nfp: fix link change return value' has been queued to stable release 21.11.9

Kevin Traynor ktraynor at redhat.com
Wed Nov 27 18:18:26 CET 2024


Hi,

FYI, your patch has been queued to stable release 21.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/02/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/f39ddff0693559f5d339ae9737e83b706842eb34

Thanks.

Kevin

---
>From f39ddff0693559f5d339ae9737e83b706842eb34 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Sat, 12 Oct 2024 10:41:02 +0800
Subject: [PATCH] net/nfp: fix link change return value

[ upstream commit 0ca4f216b89162ce8142d665a98924bdf4a23a6e ]

The return value of 'nfp_eth_set_configured()' is three ways, the
original logic considered it as two ways wrongly.

Fixes: 61d4008fe6bb ("net/nfp: support setting link up/down")

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>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/nfp/nfp_ethdev.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c
index 84562d92fd..dfe629cdda 100644
--- a/drivers/net/nfp/nfp_ethdev.c
+++ b/drivers/net/nfp/nfp_ethdev.c
@@ -217,4 +217,5 @@ static int
 nfp_net_stop(struct rte_eth_dev *dev)
 {
+	int ret;
 	int i;
 	struct nfp_net_hw *hw;
@@ -241,8 +242,10 @@ nfp_net_stop(struct rte_eth_dev *dev)
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
 	else
-		nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 				       hw->nfp_idx, 0);
+	if (ret < 0)
+		return ret;
 
 	return 0;
@@ -253,4 +256,5 @@ static int
 nfp_net_set_link_up(struct rte_eth_dev *dev)
 {
+	int ret;
 	struct nfp_net_hw *hw;
 
@@ -261,8 +265,12 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
 	else
-		return nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 					      hw->nfp_idx, 1);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
@@ -271,4 +279,5 @@ static int
 nfp_net_set_link_down(struct rte_eth_dev *dev)
 {
+	int ret;
 	struct nfp_net_hw *hw;
 
@@ -279,8 +288,12 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
 		/* Configure the physical port down */
-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
 	else
-		return nfp_eth_set_configured(dev->process_private,
+		ret = nfp_eth_set_configured(dev->process_private,
 					      hw->nfp_idx, 0);
+	if (ret < 0)
+		return ret;
+
+	return 0;
 }
 
-- 
2.47.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-27 17:17:40.749683796 +0000
+++ 0079-net-nfp-fix-link-change-return-value.patch	2024-11-27 17:17:38.282269668 +0000
@@ -1 +1 @@
-From 0ca4f216b89162ce8142d665a98924bdf4a23a6e Mon Sep 17 00:00:00 2001
+From f39ddff0693559f5d339ae9737e83b706842eb34 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0ca4f216b89162ce8142d665a98924bdf4a23a6e ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/nfp/nfp_ethdev.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
+ drivers/net/nfp/nfp_ethdev.c | 25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
@@ -21 +22 @@
-index 4b31785b9f..ef1c2a94b7 100644
+index 84562d92fd..dfe629cdda 100644
@@ -24 +25,20 @@
-@@ -528,4 +528,5 @@ static int
+@@ -217,4 +217,5 @@ static int
+ nfp_net_stop(struct rte_eth_dev *dev)
+ {
++	int ret;
+ 	int i;
+ 	struct nfp_net_hw *hw;
+@@ -241,8 +242,10 @@ nfp_net_stop(struct rte_eth_dev *dev)
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+ 	else
+-		nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 				       hw->nfp_idx, 0);
++	if (ret < 0)
++		return ret;
+ 
+ 	return 0;
+@@ -253,4 +256,5 @@ static int
@@ -29,3 +48,0 @@
- 	struct nfp_net_hw_priv *hw_priv;
-@@ -534,5 +535,9 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)
- 	hw_priv = dev->process_private;
@@ -33,2 +50,9 @@
--	return nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 1);
-+	ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 1);
+@@ -261,8 +265,12 @@ nfp_net_set_link_up(struct rte_eth_dev *dev)
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 1);
+ 	else
+-		return nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 					      hw->nfp_idx, 1);
@@ -41 +65 @@
-@@ -541,4 +546,5 @@ static int
+@@ -271,4 +279,5 @@ static int
@@ -46,3 +69,0 @@
- 	struct nfp_net_hw_priv *hw_priv;
-@@ -547,5 +553,9 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
- 	hw_priv = dev->process_private;
@@ -50,2 +71,9 @@
--	return nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
-+	ret = nfp_eth_set_configured(hw_priv->pf_dev->cpp, hw->nfp_idx, 0);
+@@ -279,8 +288,12 @@ nfp_net_set_link_down(struct rte_eth_dev *dev)
+ 	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+ 		/* Configure the physical port down */
+-		return nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
++		ret = nfp_eth_set_configured(hw->cpp, hw->nfp_idx, 0);
+ 	else
+-		return nfp_eth_set_configured(dev->process_private,
++		ret = nfp_eth_set_configured(dev->process_private,
+ 					      hw->nfp_idx, 0);



More information about the stable mailing list