[dpdk-stable] patch 'net/mlx5: fix drop action in tunnel offload mode' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.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/07/21. 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/86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c

Thanks.

Luca Boccassi

---
>From 86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson at nvidia.com>
Date: Wed, 20 Jan 2021 21:17:10 +0200
Subject: [PATCH] net/mlx5: fix drop action in tunnel offload mode

[ upstream commit 49be011d3c87fd1b5d5d791744e9d969dff26bc1 ]

Tunnel offload mode allows application to restore partially offloaded
tunneled packets to its original state.
The mode was designed to optimize packet recovery. It must not
block flow actions that are allowed by MLX5 PMD.

The patch allows tunnel offload match rules to use drop flow action.

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")

Signed-off-by: Gregory Etelson <getelson at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index afd80afa38..0841279f14 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6110,8 +6110,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 	 * Validate the drop action mutual exclusion with other actions.
 	 * Drop action is mutually-exclusive with any other action, except for
 	 * Count action.
+	 * Drop action compatibility with tunnel offload was already validated.
 	 */
-	if ((action_flags & MLX5_FLOW_ACTION_DROP) &&
+	if (action_flags & (MLX5_FLOW_ACTION_TUNNEL_MATCH |
+			    MLX5_FLOW_ACTION_TUNNEL_MATCH));
+	else if ((action_flags & MLX5_FLOW_ACTION_DROP) &&
 	    (action_flags & ~(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_COUNT)))
 		return rte_flow_error_set(error, EINVAL,
 					  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:39.623323295 +0000
+++ 0237-net-mlx5-fix-drop-action-in-tunnel-offload-mode.patch	2021-02-05 11:18:29.238699337 +0000
@@ -1 +1 @@
-From 49be011d3c87fd1b5d5d791744e9d969dff26bc1 Mon Sep 17 00:00:00 2001
+From 86c8dc0a650e7b155eaa4c7835c5e701c0c0c57c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 49be011d3c87fd1b5d5d791744e9d969dff26bc1 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index faafc92bc8..9ffd6ec1a8 100644
+index afd80afa38..0841279f14 100644
@@ -26 +27 @@
-@@ -6228,8 +6228,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -6110,8 +6110,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,