[dpdk-stable] patch 'net/mlx5: fix setting of port ID for egress rules' 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 767de68c9021ecdda8df11b5c787d8fdc74c377c Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 22 Jan 2020 14:33:06 +0200
Subject: [PATCH] net/mlx5: fix setting of port ID for egress rules

[ upstream commit 813f9bfa12c93737472f0eefe0e1a7d30502e532 ]

Previous patch fixed the setting of port-id for eswitch rules, which
are ingress only.
This patch expands the fix, to support NIC rules as well, which can
be ingress or egress.

Fixes: ce777b147bf8 ("net/mlx5: fix E-Switch flow without port item")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Ori Kam <orika at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 0079d4a8c7..6aedb3c0bc 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7271,13 +7271,13 @@ cnt_err:
 		item_flags |= last_item;
 	}
 	/*
-	 * In case of ingress traffic when E-Switch mode is enabled,
-	 * we have two cases where we need to set the source port manually.
+	 * When E-Switch mode is enabled, we have two cases where we need to
+	 * set the source port manually.
 	 * The first one, is in case of Nic steering rule, and the second is
 	 * E-Switch rule where no port_id item was found. In both cases
 	 * the source port is set according the current port in use.
 	 */
-	if ((attr->ingress && !(item_flags & MLX5_FLOW_ITEM_PORT_ID)) &&
+	if (!(item_flags & MLX5_FLOW_ITEM_PORT_ID) &&
 	    (priv->representor || priv->master)) {
 		if (flow_dv_translate_item_port_id(dev, match_mask,
 						   match_value, NULL))
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:43.991461464 +0000
+++ 0154-net-mlx5-fix-setting-of-port-ID-for-egress-rules.patch	2020-02-11 11:17:38.736007630 +0000
@@ -1,15 +1,16 @@
-From 813f9bfa12c93737472f0eefe0e1a7d30502e532 Mon Sep 17 00:00:00 2001
+From 767de68c9021ecdda8df11b5c787d8fdc74c377c Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 22 Jan 2020 14:33:06 +0200
 Subject: [PATCH] net/mlx5: fix setting of port ID for egress rules
 
+[ upstream commit 813f9bfa12c93737472f0eefe0e1a7d30502e532 ]
+
 Previous patch fixed the setting of port-id for eswitch rules, which
 are ingress only.
 This patch expands the fix, to support NIC rules as well, which can
 be ingress or egress.
 
 Fixes: ce777b147bf8 ("net/mlx5: fix E-Switch flow without port item")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Ori Kam <orika at mellanox.com>
@@ -18,10 +19,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index a32f0be803..c2900c5d0d 100644
+index 0079d4a8c7..6aedb3c0bc 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
-@@ -7602,13 +7602,13 @@ cnt_err:
+@@ -7271,13 +7271,13 @@ cnt_err:
  		item_flags |= last_item;
  	}
  	/*