[dpdk-stable] patch 'net/mlx5: fix RSS validation function' has been queued to LTS release 18.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/13/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f55be1a96226fef54d7a5fa122d124c4010108d3

Thanks.

Kevin Traynor

---
From f55be1a96226fef54d7a5fa122d124c4010108d3 Mon Sep 17 00:00:00 2001
From: Ori Kam <orika@mellanox.com>
Date: Sun, 14 Apr 2019 07:05:21 +0000
Subject: [PATCH] net/mlx5: fix RSS validation function

[ upstream commit 1183f12f14becc160a084c5c081317c3927cdaa4 ]

The RSS validation function was missing the verifcation that
if RSS is requested on inner packet, the flow must have tunnel data.

Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function")

Signed-off-by: Ori Kam <orika@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c       | 9 +++++++++
 drivers/net/mlx5/mlx5_flow.h       | 1 +
 drivers/net/mlx5/mlx5_flow_dv.c    | 6 +++---
 drivers/net/mlx5/mlx5_flow_verbs.c | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 15302533d..222cd81d0 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -876,4 +876,6 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
  * @param[in] attr
  *   Attributes of flow that includes this action.
+ * @param[in] item_flags
+ *   Items that were detected.
  * @param[out] error
  *   Pointer to error structure.
@@ -887,8 +889,10 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
 			      struct rte_eth_dev *dev,
 			      const struct rte_flow_attr *attr,
+			      uint64_t item_flags,
 			      struct rte_flow_error *error)
 {
 	struct mlx5_priv *priv = dev->data->dev_private;
 	const struct rte_flow_action_rss *rss = action->conf;
+	int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 	unsigned int i;
 
@@ -951,4 +955,9 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
 					  "rss action not supported for "
 					  "egress");
+	if (rss->level > 1 &&  !tunnel)
+		return rte_flow_error_set(error, EINVAL,
+					  RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+					  "inner RSS is not supported for "
+					  "non-tunnel flows");
 	return 0;
 }
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 4a7c05293..e1424c789 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -364,4 +364,5 @@ int mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
 				  struct rte_eth_dev *dev,
 				  const struct rte_flow_attr *attr,
+				  uint64_t item_flags,
 				  struct rte_flow_error *error);
 int mlx5_flow_validate_attributes(struct rte_eth_dev *dev,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d34c11152..207edcbc5 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -777,5 +777,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 	uint64_t item_flags = 0;
 	uint64_t last_item = 0;
-	int tunnel = 0;
 	uint8_t next_protocol = 0xff;
 	int actions_n = 0;
@@ -787,5 +786,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 		return ret;
 	for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
-		tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
+		int tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
 		switch (items->type) {
 		case RTE_FLOW_ITEM_TYPE_VOID:
@@ -959,5 +958,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
 			ret = mlx5_flow_validate_action_rss(actions,
 							    action_flags, dev,
-							    attr, error);
+							    attr, item_flags,
+							    error);
 			if (ret < 0)
 				return ret;
diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index aef855f24..1fdbca3d2 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -1192,5 +1192,5 @@ flow_verbs_validate(struct rte_eth_dev *dev,
 			ret = mlx5_flow_validate_action_rss(actions,
 							    action_flags, dev,
-							    attr,
+							    attr, item_flags,
 							    error);
 			if (ret < 0)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-08 11:05:06.219985007 +0100
+++ 0007-net-mlx5-fix-RSS-validation-function.patch	2019-05-08 11:05:05.767934059 +0100
@@ -1 +1 @@
-From 1183f12f14becc160a084c5c081317c3927cdaa4 Mon Sep 17 00:00:00 2001
+From f55be1a96226fef54d7a5fa122d124c4010108d3 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1183f12f14becc160a084c5c081317c3927cdaa4 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 1c78a5f8e..a0683ee98 100644
+index 15302533d..222cd81d0 100644
@@ -25 +26 @@
-@@ -883,4 +883,6 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
+@@ -876,4 +876,6 @@ mlx5_flow_validate_action_queue(const struct rte_flow_action *action,
@@ -32 +33 @@
-@@ -894,8 +896,10 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
+@@ -887,8 +889,10 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
@@ -43 +44 @@
-@@ -966,4 +970,9 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
+@@ -951,4 +955,9 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
@@ -54 +55 @@
-index 622e305ea..9f47fd4ee 100644
+index 4a7c05293..e1424c789 100644
@@ -57 +58 @@
-@@ -444,4 +444,5 @@ int mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
+@@ -364,4 +364,5 @@ int mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
@@ -64 +65 @@
-index ccb2f7593..3862b26c5 100644
+index d34c11152..207edcbc5 100644
@@ -67 +68 @@
-@@ -1800,5 +1800,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -777,5 +777,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -73 +74 @@
-@@ -1810,5 +1809,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -787,5 +786,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -80 +81 @@
-@@ -1982,5 +1981,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+@@ -959,5 +958,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
@@ -89 +90 @@
-index 3956df1a7..773213e14 100644
+index aef855f24..1fdbca3d2 100644
@@ -92 +93 @@
-@@ -1195,5 +1195,5 @@ flow_verbs_validate(struct rte_eth_dev *dev,
+@@ -1192,5 +1192,5 @@ flow_verbs_validate(struct rte_eth_dev *dev,