[dpdk-stable] patch 'net/mlx5: fix hairpin flow split decision' 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/f66821ebc55ff70b57321b2465229c1772bd36fa

Thanks.

Luca Boccassi

---
>From f66821ebc55ff70b57321b2465229c1772bd36fa Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at nvidia.com>
Date: Sun, 10 Jan 2021 19:37:56 +0200
Subject: [PATCH] net/mlx5: fix hairpin flow split decision

[ upstream commit 19e13263ed2fc47a32e9ec3ddcfdbf44168d72ac ]

Previously, the identification of hairpin queue was done using
mlx5_rxq_get_type() function.
Recent patch replaced it with use of mlx5_rxq_get_hairpin_conf(),
and check of the return value conf != NULL.
The case of return value is NULL (queue is not hairpin) was not handled.
As result, non-hairpin flows were wrongly handled.
This patch adds the required check for return value is NULL.

Fixes: 509f8470de55 ("net/mlx5: do not split hairpin flow in explicit mode")

Signed-off-by: Dekel Peled <dekelp at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_flow.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 5138af9208..bceecdb902 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3548,7 +3548,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 			if (queue == NULL)
 				return 0;
 			conf = mlx5_rxq_get_hairpin_conf(dev, queue->index);
-			if (conf != NULL && !!conf->tx_explicit)
+			if (conf == NULL || conf->tx_explicit != 0)
 				return 0;
 			queue_action = 1;
 			action_n++;
@@ -3558,7 +3558,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
 			if (rss == NULL || rss->queue_num == 0)
 				return 0;
 			conf = mlx5_rxq_get_hairpin_conf(dev, rss->queue[0]);
-			if (conf != NULL && !!conf->tx_explicit)
+			if (conf == NULL || conf->tx_explicit != 0)
 				return 0;
 			queue_action = 1;
 			action_n++;
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:34.165150083 +0000
+++ 0110-net-mlx5-fix-hairpin-flow-split-decision.patch	2021-02-05 11:18:28.974694310 +0000
@@ -1 +1 @@
-From 19e13263ed2fc47a32e9ec3ddcfdbf44168d72ac Mon Sep 17 00:00:00 2001
+From f66821ebc55ff70b57321b2465229c1772bd36fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 19e13263ed2fc47a32e9ec3ddcfdbf44168d72ac ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 9c2e0900b6..1790e774ba 100644
+index 5138af9208..bceecdb902 100644
@@ -27 +28 @@
-@@ -3543,7 +3543,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -3548,7 +3548,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
@@ -36 +37 @@
-@@ -3553,7 +3553,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,
+@@ -3558,7 +3558,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev,