[dpdk-stable] patch 'net/qede: fix multicast drop in promiscuous mode' has been queued to LTS release 18.11.10

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/28f6adea3e06277ccc370be61372a88cecf6f284

Thanks.

Kevin.

---
From 28f6adea3e06277ccc370be61372a88cecf6f284 Mon Sep 17 00:00:00 2001
From: Devendra Singh Rawat <dsinghrawat@marvell.com>
Date: Thu, 18 Jun 2020 13:45:55 +0530
Subject: [PATCH] net/qede: fix multicast drop in promiscuous mode

[ upstream commit b10231aed1edb9cdd74a0a021a38267255952f00 ]

After enabling promiscuous mode all packets whose destination MAC
address is a multicast address were being dropped. This fix configures
H/W to receive all traffic in promiscuous mode. Promiscuous mode also
overrides allmulticast mode on/off status.

Fixes: 40e9f6fc1558 ("net/qede: enable VF-VF traffic with unmatched dest address")

Signed-off-by: Devendra Singh Rawat <dsinghrawat@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: Rasesh Mody <rmody@marvell.com>
---
 drivers/net/qede/qede_ethdev.c | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index b4a266444b..e279c0280e 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -536,15 +536,14 @@ qed_configure_filter_rx_mode(struct rte_eth_dev *eth_dev,
 
 	if (type == QED_FILTER_RX_MODE_TYPE_PROMISC) {
-		flags.rx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED;
+		flags.rx_accept_filter |= (ECORE_ACCEPT_UCAST_UNMATCHED |
+					   ECORE_ACCEPT_MCAST_UNMATCHED);
 		if (IS_VF(edev)) {
-			flags.tx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED;
-			DP_INFO(edev, "Enabling Tx unmatched flag for VF\n");
+			flags.tx_accept_filter |=
+						(ECORE_ACCEPT_UCAST_UNMATCHED |
+						 ECORE_ACCEPT_MCAST_UNMATCHED);
+			DP_INFO(edev, "Enabling Tx unmatched flags for VF\n");
 		}
 	} else if (type == QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC) {
 		flags.rx_accept_filter |= ECORE_ACCEPT_MCAST_UNMATCHED;
-	} else if (type == (QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC |
-				QED_FILTER_RX_MODE_TYPE_PROMISC)) {
-		flags.rx_accept_filter |= ECORE_ACCEPT_UCAST_UNMATCHED |
-			ECORE_ACCEPT_MCAST_UNMATCHED;
 	}
 
@@ -1397,13 +1396,10 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete)
 static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
 {
-	struct qede_dev *qdev = eth_dev->data->dev_private;
-	struct ecore_dev *edev = &qdev->edev;
+	struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
+	struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
 	enum qed_filter_rx_mode_type type = QED_FILTER_RX_MODE_TYPE_PROMISC;
 
 	PMD_INIT_FUNC_TRACE(edev);
 
-	if (rte_eth_allmulticast_get(eth_dev->data->port_id) == 1)
-		type |= QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
-
 	qed_configure_filter_rx_mode(eth_dev, type);
 }
@@ -1769,7 +1765,4 @@ static void qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
 	    QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
 
-	if (rte_eth_promiscuous_get(eth_dev->data->port_id) == 1)
-		type |= QED_FILTER_RX_MODE_TYPE_PROMISC;
-
 	qed_configure_filter_rx_mode(eth_dev, type);
 }
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-17 17:17:00.666248258 +0100
+++ 0012-net-qede-fix-multicast-drop-in-promiscuous-mode.patch	2020-07-17 17:16:59.982771382 +0100
@@ -1 +1 @@
-From b10231aed1edb9cdd74a0a021a38267255952f00 Mon Sep 17 00:00:00 2001
+From 28f6adea3e06277ccc370be61372a88cecf6f284 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b10231aed1edb9cdd74a0a021a38267255952f00 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -18,2 +19,2 @@
- drivers/net/qede/qede_ethdev.c | 25 +++++++++----------------
- 1 file changed, 9 insertions(+), 16 deletions(-)
+ drivers/net/qede/qede_ethdev.c | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
@@ -22 +23 @@
-index c4f8f12589..84d2d2c033 100644
+index b4a266444b..e279c0280e 100644
@@ -25 +26 @@
-@@ -626,15 +626,14 @@ qed_configure_filter_rx_mode(struct rte_eth_dev *eth_dev,
+@@ -536,15 +536,14 @@ qed_configure_filter_rx_mode(struct rte_eth_dev *eth_dev,
@@ -47,2 +48,2 @@
-@@ -1503,14 +1502,11 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete)
- static int qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
+@@ -1397,13 +1396,10 @@ qede_link_update(struct rte_eth_dev *eth_dev, __rte_unused int wait_to_complete)
+ static void qede_promiscuous_enable(struct rte_eth_dev *eth_dev)
@@ -52 +52,0 @@
-+	enum _ecore_status_t ecore_status;
@@ -56 +55,0 @@
--	enum _ecore_status_t ecore_status;
@@ -63,4 +62,4 @@
- 	ecore_status = qed_configure_filter_rx_mode(eth_dev, type);
- 
-@@ -1886,7 +1882,4 @@ static int qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
- 	enum _ecore_status_t ecore_status;
+ 	qed_configure_filter_rx_mode(eth_dev, type);
+ }
+@@ -1769,7 +1765,4 @@ static void qede_allmulticast_enable(struct rte_eth_dev *eth_dev)
+ 	    QED_FILTER_RX_MODE_TYPE_MULTI_PROMISC;
@@ -71,2 +70,2 @@
- 	ecore_status = qed_configure_filter_rx_mode(eth_dev, type);
- 
+ 	qed_configure_filter_rx_mode(eth_dev, type);
+ }