[dpdk-stable] patch 'net/mlx5: fix crash on null operation' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

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

Thanks.

Kevin Traynor

---
>From ddddaf1a3a361afe33d078cc0da1d04630b19320 Mon Sep 17 00:00:00 2001
From: Moti Haimovsky <motih at mellanox.com>
Date: Mon, 1 Jul 2019 12:34:21 +0300
Subject: [PATCH] net/mlx5: fix crash on null operation

[ upstream commit 8f0fa0c0adf5dac18641af89143eabea0662f5a2 ]

mlx5 implements mlx5_flow_null_drv_ops to be used when a specific
flow typei/driver is not available or invalid.
This routines return error without modifying the rte_flow_error
parameter passed to them which causes testpmd, for example, to crash.
This commit addresses the issue by modifying the rte_flow_error
parameter in theses routines.

Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")

Signed-off-by: Moti Haimovsky <motih at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 4918bb5ee..5eb6c7b55 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1671,8 +1671,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
 		   const struct rte_flow_item items[] __rte_unused,
 		   const struct rte_flow_action actions[] __rte_unused,
-		   struct rte_flow_error *error __rte_unused)
+		   struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1681,7 +1681,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
 		  const struct rte_flow_item items[] __rte_unused,
 		  const struct rte_flow_action actions[] __rte_unused,
-		  struct rte_flow_error *error __rte_unused)
+		  struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
+	rte_flow_error_set(error, ENOTSUP,
+			   RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 	return NULL;
 }
@@ -1693,8 +1694,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
 		    const struct rte_flow_item items[] __rte_unused,
 		    const struct rte_flow_action actions[] __rte_unused,
-		    struct rte_flow_error *error __rte_unused)
+		    struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1702,8 +1703,8 @@ static int
 flow_null_apply(struct rte_eth_dev *dev __rte_unused,
 		struct rte_flow *flow __rte_unused,
-		struct rte_flow_error *error __rte_unused)
+		struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
@@ -1725,8 +1726,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,
 		const struct rte_flow_action *actions __rte_unused,
 		void *data __rte_unused,
-		struct rte_flow_error *error __rte_unused)
+		struct rte_flow_error *error)
 {
-	rte_errno = ENOTSUP;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.496819935 +0100
+++ 0011-net-mlx5-fix-crash-on-null-operation.patch	2019-08-27 09:40:10.862145796 +0100
@@ -1 +1 @@
-From 8f0fa0c0adf5dac18641af89143eabea0662f5a2 Mon Sep 17 00:00:00 2001
+From ddddaf1a3a361afe33d078cc0da1d04630b19320 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f0fa0c0adf5dac18641af89143eabea0662f5a2 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index c03eb4c37..251da41c0 100644
+index 4918bb5ee..5eb6c7b55 100644
@@ -27 +28 @@
-@@ -1695,8 +1695,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
+@@ -1671,8 +1671,8 @@ flow_null_validate(struct rte_eth_dev *dev __rte_unused,
@@ -39 +40 @@
-@@ -1705,7 +1705,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
+@@ -1681,7 +1681,8 @@ flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
@@ -50 +51 @@
-@@ -1717,8 +1718,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
+@@ -1693,8 +1694,8 @@ flow_null_translate(struct rte_eth_dev *dev __rte_unused,
@@ -62 +63 @@
-@@ -1726,8 +1727,8 @@ static int
+@@ -1702,8 +1703,8 @@ static int
@@ -74 +75 @@
-@@ -1749,8 +1750,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,
+@@ -1725,8 +1726,8 @@ flow_null_query(struct rte_eth_dev *dev __rte_unused,