[dpdk-stable] patch 'net/iavf: fix port start during configuration restore' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From 02b72cde0b073b0fb0978ffc8b56717d547caa9c Mon Sep 17 00:00:00 2001
From: Steve Yang <stevex.yang at intel.com>
Date: Fri, 4 Sep 2020 07:29:04 +0000
Subject: [PATCH] net/iavf: fix port start during configuration restore

[ upstream commit dd184a454111b54b0e45a3271becc3dd19ec8616 ]

If configuring VF promiscuous mode is not supported,
return -ENOTSUP error code in .promiscuous_enable/disable dev_ops.
This is to fix the port start during configuration restore,
where if .promiscuous_enable/disable dev_ops exists
and return any value other than -ENOTSUP, start will fail.

Same is done for .allmulticast_enable/disable dev_ops.

Fixes: ca041cd44fcc ("ethdev: change allmulticast callbacks to return status")
Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status")

Signed-off-by: Steve Yang <stevex.yang at intel.com>
Acked-by: Beilei Xing <beilei.xing at intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 1556c146ea..d65412ae94 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -658,6 +658,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev)
 	ret = iavf_config_promisc(adapter, TRUE, vf->promisc_multicast_enabled);
 	if (!ret)
 		vf->promisc_unicast_enabled = TRUE;
+	else if (ret == IAVF_NOT_SUPPORTED)
+		ret = -ENOTSUP;
 	else
 		ret = -EAGAIN;
 
@@ -678,6 +680,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev)
 	ret = iavf_config_promisc(adapter, FALSE, vf->promisc_multicast_enabled);
 	if (!ret)
 		vf->promisc_unicast_enabled = FALSE;
+	else if (ret == IAVF_NOT_SUPPORTED)
+		ret = -ENOTSUP;
 	else
 		ret = -EAGAIN;
 
@@ -698,6 +702,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev)
 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, TRUE);
 	if (!ret)
 		vf->promisc_multicast_enabled = TRUE;
+	else if (ret == IAVF_NOT_SUPPORTED)
+		ret = -ENOTSUP;
 	else
 		ret = -EAGAIN;
 
@@ -718,6 +724,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev)
 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, FALSE);
 	if (!ret)
 		vf->promisc_multicast_enabled = FALSE;
+	else if (ret == IAVF_NOT_SUPPORTED)
+		ret = -ENOTSUP;
 	else
 		ret = -EAGAIN;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:12.449047049 +0000
+++ 0021-net-iavf-fix-port-start-during-configuration-restore.patch	2020-10-28 10:35:11.440829082 +0000
@@ -1,8 +1,10 @@
-From dd184a454111b54b0e45a3271becc3dd19ec8616 Mon Sep 17 00:00:00 2001
+From 02b72cde0b073b0fb0978ffc8b56717d547caa9c Mon Sep 17 00:00:00 2001
 From: Steve Yang <stevex.yang at intel.com>
 Date: Fri, 4 Sep 2020 07:29:04 +0000
 Subject: [PATCH] net/iavf: fix port start during configuration restore
 
+[ upstream commit dd184a454111b54b0e45a3271becc3dd19ec8616 ]
+
 If configuring VF promiscuous mode is not supported,
 return -ENOTSUP error code in .promiscuous_enable/disable dev_ops.
 This is to fix the port start during configuration restore,
@@ -13,7 +15,6 @@
 
 Fixes: ca041cd44fcc ("ethdev: change allmulticast callbacks to return status")
 Fixes: 9039c8125730 ("ethdev: change promiscuous callbacks to return status")
-Cc: stable at dpdk.org
 
 Signed-off-by: Steve Yang <stevex.yang at intel.com>
 Acked-by: Beilei Xing <beilei.xing at intel.com>
@@ -22,40 +23,40 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
-index ec4b1a1487..5f3aea8a04 100644
+index 1556c146ea..d65412ae94 100644
 --- a/drivers/net/iavf/iavf_ethdev.c
 +++ b/drivers/net/iavf/iavf_ethdev.c
-@@ -690,6 +690,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev)
- 	ret = iavf_config_promisc(adapter, true, vf->promisc_multicast_enabled);
+@@ -658,6 +658,8 @@ iavf_dev_promiscuous_enable(struct rte_eth_dev *dev)
+ 	ret = iavf_config_promisc(adapter, TRUE, vf->promisc_multicast_enabled);
  	if (!ret)
- 		vf->promisc_unicast_enabled = true;
+ 		vf->promisc_unicast_enabled = TRUE;
 +	else if (ret == IAVF_NOT_SUPPORTED)
 +		ret = -ENOTSUP;
  	else
  		ret = -EAGAIN;
  
-@@ -711,6 +713,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev)
- 				  vf->promisc_multicast_enabled);
+@@ -678,6 +680,8 @@ iavf_dev_promiscuous_disable(struct rte_eth_dev *dev)
+ 	ret = iavf_config_promisc(adapter, FALSE, vf->promisc_multicast_enabled);
  	if (!ret)
- 		vf->promisc_unicast_enabled = false;
+ 		vf->promisc_unicast_enabled = FALSE;
 +	else if (ret == IAVF_NOT_SUPPORTED)
 +		ret = -ENOTSUP;
  	else
  		ret = -EAGAIN;
  
-@@ -731,6 +735,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev)
- 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, true);
+@@ -698,6 +702,8 @@ iavf_dev_allmulticast_enable(struct rte_eth_dev *dev)
+ 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, TRUE);
  	if (!ret)
- 		vf->promisc_multicast_enabled = true;
+ 		vf->promisc_multicast_enabled = TRUE;
 +	else if (ret == IAVF_NOT_SUPPORTED)
 +		ret = -ENOTSUP;
  	else
  		ret = -EAGAIN;
  
-@@ -751,6 +757,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev)
- 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, false);
+@@ -718,6 +724,8 @@ iavf_dev_allmulticast_disable(struct rte_eth_dev *dev)
+ 	ret = iavf_config_promisc(adapter, vf->promisc_unicast_enabled, FALSE);
  	if (!ret)
- 		vf->promisc_multicast_enabled = false;
+ 		vf->promisc_multicast_enabled = FALSE;
 +	else if (ret == IAVF_NOT_SUPPORTED)
 +		ret = -ENOTSUP;
  	else