[dpdk-stable] patch 'net/mlx5: fix initialization of steering registers' 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 ed3c247e81869b88ce068b4551bfe0b3d7dba538 Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba at mellanox.com>
Date: Tue, 21 Jul 2020 11:57:21 +0000
Subject: [PATCH] net/mlx5: fix initialization of steering registers

[ upstream commit 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 ]

The mlx5_flow_action_copy_mreg structure contains a field called src
type enum modify_reg, similarly the mlx5_rte_flow_item_tag field
contains a field called id type enum modify_reg.
The enum modify_reg variable represents different registers in the
system and it also has a field called REG_NONE whose value is 0 which
means that the register does not exist.

The flow_mreg_add_copy_action function sets a variable of struct
mlx5_flow_action_copy_mreg type, and initializes the src field to be 0.
Similarly the flow_create_split_metadata function sets a variable of
struct mlx5_rte_flow_item_tag type and initializes the id field to be 0.
In both functions, they initialize a enum modify_reg type variable with
an int type value while modify_reg has an appropriate field for that
value (REG_NONE).

Replace assigning 0 with REG_NONE in both functions.

Fixes: dd3c774f6ffb ("net/mlx5: add metadata register copy table")
Fixes: 71e254bc0294 ("net/mlx5: split Rx flows to provide metadata copy")

Signed-off-by: Michael Baum <michaelba at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.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 be45091f4..d2e4e9aa4 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2934,7 +2934,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id,
 	};
 	struct mlx5_flow_action_copy_mreg cp_mreg = {
 		.dst = REG_B,
-		.src = 0,
+		.src = REG_NONE,
 	};
 	struct rte_flow_action_jump jump = {
 		.group = MLX5_FLOW_MREG_ACT_TABLE_GROUP,
@@ -3945,7 +3945,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
 		/* Internal PMD action to set register. */
 		struct mlx5_rte_flow_item_tag q_tag_spec = {
 			.data = qrss_id,
-			.id = 0,
+			.id = REG_NONE,
 		};
 		struct rte_flow_item q_items[] = {
 			{
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:16.293523751 +0100
+++ 0013-net-mlx5-fix-initialization-of-steering-registers.patch	2020-08-06 10:53:15.740596213 +0100
@@ -1,8 +1,10 @@
-From 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 Mon Sep 17 00:00:00 2001
+From ed3c247e81869b88ce068b4551bfe0b3d7dba538 Mon Sep 17 00:00:00 2001
 From: Michael Baum <michaelba at mellanox.com>
 Date: Tue, 21 Jul 2020 11:57:21 +0000
 Subject: [PATCH] net/mlx5: fix initialization of steering registers
 
+[ upstream commit 4868ae8322892ca916d71d5f8cf74cb2e5e0b5c4 ]
+
 The mlx5_flow_action_copy_mreg structure contains a field called src
 type enum modify_reg, similarly the mlx5_rte_flow_item_tag field
 contains a field called id type enum modify_reg.
@@ -22,7 +24,6 @@
 
 Fixes: dd3c774f6ffb ("net/mlx5: add metadata register copy table")
 Fixes: 71e254bc0294 ("net/mlx5: split Rx flows to provide metadata copy")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michael Baum <michaelba at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -31,10 +32,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index 40a8575b8..742f9dd8a 100644
+index be45091f4..d2e4e9aa4 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -3011,7 +3011,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id,
+@@ -2934,7 +2934,7 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id,
  	};
  	struct mlx5_flow_action_copy_mreg cp_mreg = {
  		.dst = REG_B,
@@ -43,7 +44,7 @@
  	};
  	struct rte_flow_action_jump jump = {
  		.group = MLX5_FLOW_MREG_ACT_TABLE_GROUP,
-@@ -4067,7 +4067,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
+@@ -3945,7 +3945,7 @@ flow_create_split_metadata(struct rte_eth_dev *dev,
  		/* Internal PMD action to set register. */
  		struct mlx5_rte_flow_item_tag q_tag_spec = {
  			.data = qrss_id,