[dpdk-stable] patch 'net/mlx5: fix VXLAN without decap action for E-Switch' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/14/19. 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.

Kevin Traynor

---
>From efdf095669689eeda02c586665708ccd6f469c8a Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Date: Fri, 25 Jan 2019 15:29:35 +0000
Subject: [PATCH] net/mlx5: fix VXLAN without decap action for E-Switch

[ upstream commit a9c94cc05015f34cd904e7903c698be1ddefbcc6 ]

There is an intention to support VXLAN tunnel match without
hardware offloaded decapsulation, just to redirect ingress
tunnelled frame untouched. This small fix allows to specify
Flows with VXLAN VNI pattern and with or without following
decapsulation action.

Fixes: 251e8d02cf37 ("net/mlx5: add VXLAN to flow translate routine")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_tcf.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index e677404cf..dd842c896 100644
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -2572,5 +2572,5 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[],
 {
 	int size = 0;
-	uint64_t flags = 0;
+	uint64_t flags = *action_flags;
 
 	size += SZ_NLATTR_NEST; /* TCA_FLOWER_ACT. */
@@ -3585,4 +3585,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
 					(mnl_nlmsg_get_payload_tail
 						(nlh)))->ifindex;
+			} else if (decap.hdr) {
+				assert(dev_flow->tcf.tunnel);
+				dev_flow->tcf.tunnel->ifindex_ptr =
+					(unsigned int *)&tcm->tcm_ifindex;
 			}
 			mnl_attr_put(nlh, TCA_MIRRED_PARMS,
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:57.037009829 +0000
+++ 0061-net-mlx5-fix-VXLAN-without-decap-action-for-E-Switch.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,8 +1,10 @@
-From a9c94cc05015f34cd904e7903c698be1ddefbcc6 Mon Sep 17 00:00:00 2001
+From efdf095669689eeda02c586665708ccd6f469c8a Mon Sep 17 00:00:00 2001
 From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Date: Fri, 25 Jan 2019 15:29:35 +0000
 Subject: [PATCH] net/mlx5: fix VXLAN without decap action for E-Switch
 
+[ upstream commit a9c94cc05015f34cd904e7903c698be1ddefbcc6 ]
+
 There is an intention to support VXLAN tunnel match without
 hardware offloaded decapsulation, just to redirect ingress
 tunnelled frame untouched. This small fix allows to specify
@@ -10,7 +12,6 @@
 decapsulation action.
 
 Fixes: 251e8d02cf37 ("net/mlx5: add VXLAN to flow translate routine")
-Cc: stable at dpdk.org
 
 Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>
@@ -19,17 +20,17 @@
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
-index b8204df63..e132a3482 100644
+index e677404cf..dd842c896 100644
 --- a/drivers/net/mlx5/mlx5_flow_tcf.c
 +++ b/drivers/net/mlx5/mlx5_flow_tcf.c
-@@ -2684,5 +2684,5 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[],
+@@ -2572,5 +2572,5 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[],
  {
  	int size = 0;
 -	uint64_t flags = 0;
 +	uint64_t flags = *action_flags;
  
  	size += SZ_NLATTR_NEST; /* TCA_FLOWER_ACT. */
-@@ -3780,4 +3780,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
+@@ -3585,4 +3585,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
  					(mnl_nlmsg_get_payload_tail
  						(nlh)))->ifindex;
 +			} else if (decap.hdr) {