patch 'net/ixgbe: fix IPv6 mask in flow director' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

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

Thanks.

Kevin

---
>From 617735f8fb1b539ca9a97713f095fb077aa13441 Mon Sep 17 00:00:00 2001
From: Kaiwen Deng <kaiwenx.deng at intel.com>
Date: Fri, 3 Mar 2023 12:52:26 +0800
Subject: [PATCH] net/ixgbe: fix IPv6 mask in flow director

[ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ]

Rules without addr mask cannot be created together in ixgbe
when setting IPv6 addr mask to default value as 0.

This commit is to change the default value of IPv6 addr mask as '0xFF'.

Fixes: cba954b7beda ("net/ixgbe: enable IPv6 mask in flow rules")
Fixes: 7d629cacedee ("net/ixgbe: enable IPv6 for consistent API")

Signed-off-by: Kaiwen Deng <kaiwenx.deng at intel.com>
Tested-by: Song Jiale <songx.jiale at intel.com>
---
 drivers/net/ixgbe/ixgbe_flow.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 44486c8e8e..6c5ca631d2 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -1646,8 +1646,4 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
 	rule->mask.vlan_tci_mask = 0;
 	rule->mask.flex_bytes_mask = 0;
-	rule->mask.dst_port_mask = 0;
-	rule->mask.src_port_mask = 0;
-	rule->mask.src_ipv6_mask = 0;
-	rule->mask.dst_ipv6_mask = 0;
 
 	/**
@@ -1923,7 +1919,7 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
 		/* check src addr mask */
 		for (j = 0; j < 16; j++) {
-			if (ipv6_mask->hdr.src_addr[j] == UINT8_MAX) {
-				rule->mask.src_ipv6_mask |= 1 << j;
-			} else if (ipv6_mask->hdr.src_addr[j] != 0) {
+			if (ipv6_mask->hdr.src_addr[j] == 0) {
+				rule->mask.src_ipv6_mask &= ~(1 << j);
+			} else if (ipv6_mask->hdr.src_addr[j] != UINT8_MAX) {
 				memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
 				rte_flow_error_set(error, EINVAL,
@@ -1936,7 +1932,7 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
 		/* check dst addr mask */
 		for (j = 0; j < 16; j++) {
-			if (ipv6_mask->hdr.dst_addr[j] == UINT8_MAX) {
-				rule->mask.dst_ipv6_mask |= 1 << j;
-			} else if (ipv6_mask->hdr.dst_addr[j] != 0) {
+			if (ipv6_mask->hdr.dst_addr[j] == 0) {
+				rule->mask.dst_ipv6_mask &= ~(1 << j);
+			} else if (ipv6_mask->hdr.dst_addr[j] != UINT8_MAX) {
 				memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
 				rte_flow_error_set(error, EINVAL,
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:21.118017053 +0000
+++ 0021-net-ixgbe-fix-IPv6-mask-in-flow-director.patch	2023-03-15 14:30:20.582123689 +0000
@@ -1 +1 @@
-From 444505f933f197bd064c7f801fa86e88d5edfce5 Mon Sep 17 00:00:00 2001
+From 617735f8fb1b539ca9a97713f095fb077aa13441 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +18,0 @@
- .mailmap                       |  1 +
@@ -20 +20 @@
- 2 files changed, 7 insertions(+), 10 deletions(-)
+ 1 file changed, 6 insertions(+), 10 deletions(-)
@@ -22,10 +21,0 @@
-diff --git a/.mailmap b/.mailmap
-index 69b6f4de1d..5b42f87d1e 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -1254,4 +1254,5 @@ Solal Pirelli <solal.pirelli at gmail.com>
- Solganik Alexander <sashas at lightbitslabs.com>
- Somnath Kotur <somnath.kotur at broadcom.com>
-+Song Jiale <songx.jiale at intel.com>
- Song Zhu <song.zhu at arm.com>
- Sony Chacko <sony.chacko at qlogic.com>
@@ -33 +23 @@
-index 79c84044af..eac81ee489 100644
+index 44486c8e8e..6c5ca631d2 100644