diff mbox series

net/mlx5: fix assert in tx inline settings ajustment

Message ID 1574169189-872-1-git-send-email-viacheslavo@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix assert in tx inline settings ajustment |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compilation success Compile Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail apply issues

Commit Message

Slava Ovsiienko Nov. 19, 2019, 1:13 p.m. UTC 
  Assert condition is fixed to not alert for the case
when multi-packet write is not supported/engaged at all.

Fixes: b53cd86965a1 ("net/mlx5: adjust inline setting for large Tx queue sizes")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_txq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Raslan Darawsheh Nov. 19, 2019, 3:59 p.m. UTC | #1 
Hi,

> -----Original Message-----
> From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> Sent: Tuesday, November 19, 2019 3:13 PM
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@mellanox.com>; Raslan Darawsheh
> <rasland@mellanox.com>; Ori Kam <orika@mellanox.com>
> Subject: [PATCH] net/mlx5: fix assert in tx inline settings ajustment
> 
> Assert condition is fixed to not alert for the case when multi-packet write is
> not supported/engaged at all.
> 
> Fixes: b53cd86965a1 ("net/mlx5: adjust inline setting for large Tx queue
> sizes")
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_txq.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
> index a0d6164..47b1de8 100644
> --- a/drivers/net/mlx5/mlx5_txq.c
> +++ b/drivers/net/mlx5/mlx5_txq.c
> @@ -1210,7 +1210,8 @@ struct mlx5_txq_obj *
>  	assert(txq_ctrl->max_inline_data <= max_inline);
>  	assert(txq_ctrl->txq.inlen_mode <= max_inline);
>  	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_send);
> -	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_empw);
> +	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_empw ||
> +	       !txq_ctrl->txq.inlen_empw);
>  	return 0;
>  error:
>  	rte_errno = ENOMEM;
> --
> 1.8.3.1


Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index a0d6164..47b1de8 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -1210,7 +1210,8 @@  struct mlx5_txq_obj *
 	assert(txq_ctrl->max_inline_data <= max_inline);
 	assert(txq_ctrl->txq.inlen_mode <= max_inline);
 	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_send);
-	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_empw);
+	assert(txq_ctrl->txq.inlen_mode <= txq_ctrl->txq.inlen_empw ||
+	       !txq_ctrl->txq.inlen_empw);
 	return 0;
 error:
 	rte_errno = ENOMEM;