diff mbox series

[v5,1/2] net/mlx5: fix crashing testpmd on null drv opts

Message ID c8ba2c5cd00582bdd25baa4d0ee6c573e3e62281.1560918818.git.motih@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Raslan Darawsheh
Headers
Series [v5,1/2] net/mlx5: fix crashing testpmd on null drv opts |

Checks

Context Check Description
ci/Intel-compilation fail apply issues
ci/checkpatch success coding style OK

Commit Message

Moti Haimovsky June 19, 2019, 4:52 a.m. UTC 
  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")
Cc: stable@dpdk.org

Signed-off-by: Moti Haimovsky <motih@mellanox.com>
---
v4,v5:
 * Resend the message from a server not inserting DOS line-termination
   symbols.

v3:
 * Modified patch subject.

v2:
 * Fixed checkpatch warnings.
---
 drivers/net/mlx5/mlx5_flow.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Comments

Slava Ovsiienko July 1, 2019, 4:38 a.m. UTC | #1 
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Thanks

> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Moti Haimovsky
> Sent: Wednesday, June 19, 2019 7:52
> To: Shahaf Shuler <shahafs@mellanox.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv
> opts
> 
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Moti Haimovsky <motih@mellanox.com>
> ---
> v4,v5:
>  * Resend the message from a server not inserting DOS line-termination
>    symbols.
> 
> v3:
>  * Modified patch subject.
> 
> v2:
>  * Fixed checkpatch warnings.
> ---
>  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 9887018..e5a8e33 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>  		   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;
> -	return -rte_errno;
> +	return rte_flow_error_set(error, ENOTSUP,
> +				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  static struct mlx5_flow *
>  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;
>  }
> 
> @@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>  		    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;
> -	return -rte_errno;
> +	return rte_flow_error_set(error, ENOTSUP,
> +				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  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);
>  }
> 
>  static void
> @@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>  		struct rte_flow *flow __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);
>  }
> 
>  /* Void driver to protect from null pointer reference. */
> --
> 1.8.3.1
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9887018..e5a8e33 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1694,19 +1694,20 @@  uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
 		   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;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
 static struct mlx5_flow *
 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;
 }
 
@@ -1716,19 +1717,19 @@  uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
 		    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;
-	return -rte_errno;
+	return rte_flow_error_set(error, ENOTSUP,
+				  RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, NULL);
 }
 
 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);
 }
 
 static void
@@ -1748,10 +1749,10 @@  uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev *dev, int32_t priority,
 		struct rte_flow *flow __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);
 }
 
 /* Void driver to protect from null pointer reference. */