[dpdk-stable] patch 'net/mlx5: remove ineffective increment in hairpin split' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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 6c277381a5949461ec7a426c0d816b091d0fad47 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at mellanox.com>
Date: Tue, 21 Jul 2020 12:00:04 +0000
Subject: [PATCH] net/mlx5: remove ineffective increment in hairpin split

[ upstream commit 8da2a608d0d727d224ff5c8eb7747083907b0beb ]

The flow_hairpin_split function defines a pointer called addr that
points to the list of items.
When the function wants to progress in the list, it adds the size of an
item to the pointer.

At the end of the function, it precedes the pointer one more time even
though it is not used afterwards. In fact, this line is unaffected and
the operation of the function would have been no different without it.

Remove the line where the pointer is preceded unnecessarily.

Fixes: d85c7b5ea59f ("net/mlx5: split hairpin flows")

Signed-off-by: Michael Baum <michaelba at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index d2e4e9aa4..a4bbb74fc 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3406,7 +3406,6 @@ flow_hairpin_split(struct rte_eth_dev *dev,
 	tag_item->data = UINT32_MAX;
 	tag_item->id = UINT16_MAX;
 	item->mask = tag_item;
-	addr += sizeof(struct mlx5_rte_flow_item_tag);
 	item->last = NULL;
 	item++;
 	item->type = RTE_FLOW_ITEM_TYPE_END;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.380459159 +0100
+++ 0015-net-mlx5-remove-ineffective-increment-in-hairpin-spl.patch	2020-08-06 10:53:15.752596451 +0100
@@ -1,8 +1,10 @@
-From 8da2a608d0d727d224ff5c8eb7747083907b0beb Mon Sep 17 00:00:00 2001
+From 6c277381a5949461ec7a426c0d816b091d0fad47 Mon Sep 17 00:00:00 2001
 From: Michael Baum <michaelba at mellanox.com>
 Date: Tue, 21 Jul 2020 12:00:04 +0000
 Subject: [PATCH] net/mlx5: remove ineffective increment in hairpin split
 
+[ upstream commit 8da2a608d0d727d224ff5c8eb7747083907b0beb ]
+
 The flow_hairpin_split function defines a pointer called addr that
 points to the list of items.
 When the function wants to progress in the list, it adds the size of an
@@ -15,7 +17,6 @@
 Remove the line where the pointer is preceded unnecessarily.
 
 Fixes: d85c7b5ea59f ("net/mlx5: split hairpin flows")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michael Baum <michaelba at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -24,10 +25,10 @@
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index 742f9dd8a..71501730b 100644
+index d2e4e9aa4..a4bbb74fc 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -3518,7 +3518,6 @@ flow_hairpin_split(struct rte_eth_dev *dev,
+@@ -3406,7 +3406,6 @@ flow_hairpin_split(struct rte_eth_dev *dev,
  	tag_item->data = UINT32_MAX;
  	tag_item->id = UINT16_MAX;
  	item->mask = tag_item;