[dpdk-stable] patch 'net/mlx5: fix item flag on GENEVE item validation' has been queued to stable release 19.11.1

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue Feb 11 12:19:48 CET 2020


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 682ac6d855b04ad70863fa821d583d1c49b13e8a Mon Sep 17 00:00:00 2001
From: Dekel Peled <dekelp at mellanox.com>
Date: Wed, 18 Dec 2019 17:09:55 +0200
Subject: [PATCH] net/mlx5: fix item flag on GENEVE item validation

[ upstream commit 953c00f763b8689f01c8d3f528abcfb243c1aa8c ]

On validation of GENEVE item, the wrong flag is used.
This patch sets the correct bit in item_flags bitmap.

Fixes: e59a5dbcfd07 ("net/mlx5: add flow match on GENEVE item")

Signed-off-by: Dekel Peled <dekelp at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73aaea4536..e50d40040b 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4418,7 +4418,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 							     error);
 			if (ret < 0)
 				return ret;
-			last_item = MLX5_FLOW_LAYER_VXLAN_GPE;
+			last_item = MLX5_FLOW_LAYER_GENEVE;
 			break;
 		case RTE_FLOW_ITEM_TYPE_MPLS:
 			ret = mlx5_flow_validate_item_mpls(dev, items,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:40.578335796 +0000
+++ 0042-net-mlx5-fix-item-flag-on-GENEVE-item-validation.patch	2020-02-11 11:17:38.388001123 +0000
@@ -1,13 +1,14 @@
-From 953c00f763b8689f01c8d3f528abcfb243c1aa8c Mon Sep 17 00:00:00 2001
+From 682ac6d855b04ad70863fa821d583d1c49b13e8a Mon Sep 17 00:00:00 2001
 From: Dekel Peled <dekelp at mellanox.com>
 Date: Wed, 18 Dec 2019 17:09:55 +0200
 Subject: [PATCH] net/mlx5: fix item flag on GENEVE item validation
 
+[ upstream commit 953c00f763b8689f01c8d3f528abcfb243c1aa8c ]
+
 On validation of GENEVE item, the wrong flag is used.
 This patch sets the correct bit in item_flags bitmap.
 
 Fixes: e59a5dbcfd07 ("net/mlx5: add flow match on GENEVE item")
-Cc: stable at dpdk.org
 
 Signed-off-by: Dekel Peled <dekelp at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -16,7 +17,7 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
-index 12cbf17200..4c162816e4 100644
+index 73aaea4536..e50d40040b 100644
 --- a/drivers/net/mlx5/mlx5_flow_dv.c
 +++ b/drivers/net/mlx5/mlx5_flow_dv.c
 @@ -4418,7 +4418,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,


More information about the stable mailing list