patch 'net/txgbe: fix VF promiscuous and allmulticast' has been queued to stable release 21.11.8

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.8

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

Thanks.

Kevin

---
>From f3924093d2c22043d5b009e8bc6e912cd80dfea4 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu at trustnetic.com>
Date: Tue, 18 Jun 2024 15:11:37 +0800
Subject: [PATCH] net/txgbe: fix VF promiscuous and allmulticast

[ upstream commit 055a51ff85112200706a07e99b92c9459774080a ]

The configuration of allmulti and promiscuous modes conflicts
together. For instance, if we enable promiscuous mode, then enable and
disable allmulti, then the promiscuous mode is wrongly disabled.

Fix this behavior by:
- doing nothing when we set/unset allmulti if promiscuous mode is on
- restorting the proper mode (none or allmulti) when we disable
  promiscuous mode

Fixes: 29072d593fe4 ("net/txgbe: support VF promiscuous and allmulticast")

Signed-off-by: Jiawen Wu <jiawenwu at trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev_vf.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index f52cd8bc19..037b7db544 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -1198,7 +1198,11 @@ txgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
 	struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
+	int mode = TXGBEVF_XCAST_MODE_NONE;
 	int ret;
 
-	switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_NONE)) {
+	if (dev->data->all_multicast)
+		mode = TXGBEVF_XCAST_MODE_ALLMULTI;
+
+	switch (hw->mac.update_xcast_mode(hw, mode)) {
 	case 0:
 		ret = 0;
@@ -1221,4 +1225,7 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
 	int ret;
 
+	if (dev->data->promiscuous)
+		return 0;
+
 	switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_ALLMULTI)) {
 	case 0:
@@ -1242,4 +1249,7 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
 	int ret;
 
+	if (dev->data->promiscuous)
+		return 0;
+
 	switch (hw->mac.update_xcast_mode(hw, TXGBEVF_XCAST_MODE_MULTI)) {
 	case 0:
-- 
2.46.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-08-23 17:18:12.640442799 +0100
+++ 0099-net-txgbe-fix-VF-promiscuous-and-allmulticast.patch	2024-08-23 17:18:09.823430465 +0100
@@ -1 +1 @@
-From 055a51ff85112200706a07e99b92c9459774080a Mon Sep 17 00:00:00 2001
+From f3924093d2c22043d5b009e8bc6e912cd80dfea4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 055a51ff85112200706a07e99b92c9459774080a ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index ec40419289..6ac34058ab 100644
+index f52cd8bc19..037b7db544 100644
@@ -27 +28 @@
-@@ -1203,7 +1203,11 @@ txgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
+@@ -1198,7 +1198,11 @@ txgbevf_dev_promiscuous_disable(struct rte_eth_dev *dev)
@@ -40 +41 @@
-@@ -1226,4 +1230,7 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
+@@ -1221,4 +1225,7 @@ txgbevf_dev_allmulticast_enable(struct rte_eth_dev *dev)
@@ -48 +49 @@
-@@ -1247,4 +1254,7 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)
+@@ -1242,4 +1249,7 @@ txgbevf_dev_allmulticast_disable(struct rte_eth_dev *dev)