[dpdk-stable] patch 'net/mlx5: fix zero out UDP checksum in encap data' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/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 bca9bb5550c52b1e3f69c92bd2561b44e0225d49 Mon Sep 17 00:00:00 2001
From: Eli Britstein <elibr at mellanox.com>
Date: Wed, 22 Jan 2020 15:03:58 +0000
Subject: [PATCH] net/mlx5: fix zero out UDP checksum in encap data

[ upstream commit 27767e217f8a7a9333967ddf5f98abe7943393aa ]

The cited commit zeroed the UDP checksum for raw-encap case.
Add the same handling for vxlan-encap case.

Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation")

Signed-off-by: Eli Britstein <elibr at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 3fa34f5e8c..0079d4a8c7 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -2782,8 +2782,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
 			(const struct rte_flow_action_raw_encap *)action->conf;
 		res.size = raw_encap_data->size;
 		memcpy(res.buf, raw_encap_data->data, res.size);
-		if (flow_dv_zero_encap_udp_csum(res.buf, error))
-			return -rte_errno;
 	} else {
 		if (action->type == RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP)
 			encap_data =
@@ -2797,6 +2795,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
 					       &res.size, error))
 			return -rte_errno;
 	}
+	if (flow_dv_zero_encap_udp_csum(res.buf, error))
+		return -rte_errno;
 	if (flow_dv_encap_decap_resource_register(dev, &res, dev_flow, error))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.957294736 +0000
+++ 0153-net-mlx5-fix-zero-out-UDP-checksum-in-encap-data.patch	2020-02-11 11:17:38.728007480 +0000
@@ -1,13 +1,14 @@
-From 27767e217f8a7a9333967ddf5f98abe7943393aa Mon Sep 17 00:00:00 2001
+From bca9bb5550c52b1e3f69c92bd2561b44e0225d49 Mon Sep 17 00:00:00 2001
 From: Eli Britstein <elibr at mellanox.com>
 Date: Wed, 22 Jan 2020 15:03:58 +0000
 Subject: [PATCH] net/mlx5: fix zero out UDP checksum in encap data
 
+[ upstream commit 27767e217f8a7a9333967ddf5f98abe7943393aa ]
+
 The cited commit zeroed the UDP checksum for raw-encap case.
 Add the same handling for vxlan-encap case.
 
 Fixes: bf1d7d9a033a ("net/mlx5: zero out UDP checksum in encapsulation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Eli Britstein <elibr at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -16,10 +17,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index fc156a348f..a32f0be803 100644
+index 3fa34f5e8c..0079d4a8c7 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -2883,8 +2883,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
+@@ -2782,8 +2782,6 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
  			(const struct rte_flow_action_raw_encap *)action->conf;
  		res.size = raw_encap_data->size;
  		memcpy(res.buf, raw_encap_data->data, res.size);
@@ -28,7 +29,7 @@
  	} else {
  		if (action->type == RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP)
  			encap_data =
-@@ -2898,6 +2896,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
+@@ -2797,6 +2795,8 @@ flow_dv_create_action_l2_encap(struct rte_eth_dev *dev,
  					       &res.size, error))
  			return -rte_errno;
  	}