patch 'net/nfp: fix set DSCP flow action' has been queued to stable release 22.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/fc325877f64eba2eca025c9a449b1a910e912566

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From fc325877f64eba2eca025c9a449b1a910e912566 Mon Sep 17 00:00:00 2001
From: Chaoyong He <chaoyong.he at corigine.com>
Date: Tue, 21 Feb 2023 18:35:13 +0800
Subject: [PATCH] net/nfp: fix set DSCP flow action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 449c68dc9c9475ba780b12046825ae643947742c ]

The former logic of set IPv4/v6 DSCP flow action don't consider the
mask filed of control message passed to the firmware.
This caused the firmware skip the set action logic, and the offloaded
packets don't have the right IPv4/v6 DSCP as expected.

Fixes: 9c665d70f7a7 ("net/nfp: support IPv4 DSCP flow action")
Fixes: 3202b003bec1 ("net/nfp: support IPv6 DSCP flow action")

Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
---
 drivers/net/nfp/nfp_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 660a777e6d..49305a4152 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -2289,6 +2289,7 @@ nfp_flow_action_set_tos(char *act_data,
 
 	tos_conf = (const struct rte_flow_action_set_dscp *)action->conf;
 	ttl_tos->ipv4_tos = tos_conf->dscp;
+	ttl_tos->ipv4_tos_mask = 0xff;
 	ttl_tos->reserved = 0;
 }
 
@@ -2312,6 +2313,7 @@ nfp_flow_action_set_tc(char *act_data,
 
 	tos_conf = (const struct rte_flow_action_set_dscp *)action->conf;
 	tc_hl->ipv6_tc = tos_conf->dscp;
+	tc_hl->ipv6_tc_mask = 0xff;
 	tc_hl->reserved = 0;
 }
 
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-04-09 21:45:39.915271700 +0800
+++ 0044-net-nfp-fix-set-DSCP-flow-action.patch	2023-04-09 21:45:38.639042200 +0800
@@ -1 +1 @@
-From 449c68dc9c9475ba780b12046825ae643947742c Mon Sep 17 00:00:00 2001
+From fc325877f64eba2eca025c9a449b1a910e912566 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 449c68dc9c9475ba780b12046825ae643947742c ]
@@ -16 +18,0 @@
-Cc: stable at dpdk.org
@@ -25 +27 @@
-index 77f249e2b9..53029d00c9 100644
+index 660a777e6d..49305a4152 100644
@@ -28 +30 @@
-@@ -2300,6 +2300,7 @@ nfp_flow_action_set_tos(char *act_data,
+@@ -2289,6 +2289,7 @@ nfp_flow_action_set_tos(char *act_data,
@@ -36 +38 @@
-@@ -2323,6 +2324,7 @@ nfp_flow_action_set_tc(char *act_data,
+@@ -2312,6 +2313,7 @@ nfp_flow_action_set_tc(char *act_data,