[dpdk-stable] patch 'net/mlx5: fix raw encap/decap limit' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/14364aebfadbb5783acb1479214ce0d3a26d3fc1

Thanks.

Luca Boccassi

---
>From 14364aebfadbb5783acb1479214ce0d3a26d3fc1 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Date: Wed, 18 Nov 2020 07:37:30 +0000
Subject: [PATCH] net/mlx5: fix raw encap/decap limit

[ upstream commit f9210259cac7836f78893dc6b0aede8664c1077e ]

The MLX5_ENCAPSULATION_DECISION_SIZE constant is used
to check the raw encap/decap actions for the raw header
size. The header is constructed of the rte_xxx_hdr
structures instead of rte items. Hence, constant
must be defined with rte_xxx_hdr structure sizes.

Fixes: 50f576d657d7 ("net/mlx5: fix VLAN actions in meter")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
Acked-by: Ori Kam <orika at nvidia.com>
Acked-by: Suanming Mou <suanmingm at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index f8046119ec..4300e62fad 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -327,8 +327,8 @@ enum mlx5_feature_name {
 #define MLX5_GENEVE_OPT_LEN_0 14
 #define MLX5_GENEVE_OPT_LEN_1 63
 
-#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_flow_item_eth) + \
-					  sizeof(struct rte_flow_item_ipv4))
+#define MLX5_ENCAPSULATION_DECISION_SIZE (sizeof(struct rte_ether_hdr) + \
+					  sizeof(struct rte_ipv4_hdr))
 
 /* Software header modify action numbers of a flow. */
 #define MLX5_ACT_NUM_MDF_IPV4		1
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-24 16:50:36.814988409 +0000
+++ 0006-net-mlx5-fix-raw-encap-decap-limit.patch	2020-11-24 16:50:36.557496061 +0000
@@ -1 +1 @@
-From f9210259cac7836f78893dc6b0aede8664c1077e Mon Sep 17 00:00:00 2001
+From 14364aebfadbb5783acb1479214ce0d3a26d3fc1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f9210259cac7836f78893dc6b0aede8664c1077e ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index afddcfc12c..1c3c6abea2 100644
+index f8046119ec..4300e62fad 100644
@@ -26 +27 @@
-@@ -345,8 +345,8 @@ enum mlx5_feature_name {
+@@ -327,8 +327,8 @@ enum mlx5_feature_name {
@@ -35,2 +36,2 @@
- /* IPv4 fragment_offset field contains relevant data in bits 2 to 15. */
- #define MLX5_IPV4_FRAG_OFFSET_MASK \
+ /* Software header modify action numbers of a flow. */
+ #define MLX5_ACT_NUM_MDF_IPV4		1