diff mbox series

net/mlx5: fix asserts for multi-segment Tx offload misconfig

Message ID 1573132704-6637-1-git-send-email-viacheslavo@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Raslan Darawsheh
Headers
Series net/mlx5: fix asserts for multi-segment Tx offload misconfig |

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 Compilation issues

Commit Message

Slava Ovsiienko Nov. 7, 2019, 1:18 p.m. UTC 
  To support multi-segment packet sending the Tx datapath
DEV_TX_OFFLOAD_MULTI_SEGS offload must be configured.
In debug configuration the asserts arise if the multi-segment
packet is being sent and no DEV_TX_OFFLOAD_MULTI_SEGS is set.
It was found that in some execution paths asserts were missed,
this patch adds ones.

Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template")

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

Comments

Matan Azrad Nov. 8, 2019, 6:18 a.m. UTC | #1 
From: Viacheslav Ovsiienko
> To support multi-segment packet sending the Tx datapath
> DEV_TX_OFFLOAD_MULTI_SEGS offload must be configured.
> In debug configuration the asserts arise if the multi-segment packet is being
> sent and no DEV_TX_OFFLOAD_MULTI_SEGS is set.
> It was found that in some execution paths asserts were missed, this patch
> adds ones.
> 
> Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template")
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
Raslan Darawsheh Nov. 8, 2019, 2:33 p.m. UTC | #2 
Hi,

> -----Original Message-----
> From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> Sent: Thursday, November 7, 2019 3:18 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 asserts for multi-segment Tx offload misconfig
> 
> To support multi-segment packet sending the Tx datapath
> DEV_TX_OFFLOAD_MULTI_SEGS offload must be configured.
> In debug configuration the asserts arise if the multi-segment
> packet is being sent and no DEV_TX_OFFLOAD_MULTI_SEGS is set.
> It was found that in some execution paths asserts were missed,
> this patch adds ones.
> 
> Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template")
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_rxtx.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
> index 887e283..ecebd72 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.c
> +++ b/drivers/net/mlx5/mlx5_rxtx.c
> @@ -3870,6 +3870,7 @@ enum mlx5_txcmp_code {
>  		unsigned int slen = 0;
> 
>  next_empw:
> +		assert(NB_SEGS(loc->mbuf) == 1);
>  		part = RTE_MIN(pkts_n, MLX5_EMPW_MAX_PACKETS);
>  		if (unlikely(loc->elts_free < part)) {
>  			/* We have no enough elts to save all mbufs. */
> @@ -3929,6 +3930,7 @@ enum mlx5_txcmp_code {
>  					return MLX5_TXCMP_CODE_EXIT;
>  				return MLX5_TXCMP_CODE_MULTI;
>  			}
> +			assert(NB_SEGS(loc->mbuf) == 1);
>  			if (ret == MLX5_TXCMP_CODE_TSO) {
>  				part -= loop;
>  				mlx5_tx_sdone_empw(txq, loc, part, slen,
> olx);
> @@ -4028,6 +4030,7 @@ enum mlx5_txcmp_code {
>  		unsigned int room, part, nlim;
>  		unsigned int slen = 0;
> 
> +		assert(NB_SEGS(loc->mbuf) == 1);
>  		/*
>  		 * Limits the amount of packets in one WQE
>  		 * to improve CQE latency generation.
> @@ -4168,6 +4171,7 @@ enum mlx5_txcmp_code {
>  					return MLX5_TXCMP_CODE_EXIT;
>  				return MLX5_TXCMP_CODE_MULTI;
>  			}
> +			assert(NB_SEGS(loc->mbuf) == 1);
>  			if (ret == MLX5_TXCMP_CODE_TSO) {
>  				part -= room;
>  				mlx5_tx_idone_empw(txq, loc, part, slen,
> olx);
> --
> 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_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 887e283..ecebd72 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -3870,6 +3870,7 @@  enum mlx5_txcmp_code {
 		unsigned int slen = 0;
 
 next_empw:
+		assert(NB_SEGS(loc->mbuf) == 1);
 		part = RTE_MIN(pkts_n, MLX5_EMPW_MAX_PACKETS);
 		if (unlikely(loc->elts_free < part)) {
 			/* We have no enough elts to save all mbufs. */
@@ -3929,6 +3930,7 @@  enum mlx5_txcmp_code {
 					return MLX5_TXCMP_CODE_EXIT;
 				return MLX5_TXCMP_CODE_MULTI;
 			}
+			assert(NB_SEGS(loc->mbuf) == 1);
 			if (ret == MLX5_TXCMP_CODE_TSO) {
 				part -= loop;
 				mlx5_tx_sdone_empw(txq, loc, part, slen, olx);
@@ -4028,6 +4030,7 @@  enum mlx5_txcmp_code {
 		unsigned int room, part, nlim;
 		unsigned int slen = 0;
 
+		assert(NB_SEGS(loc->mbuf) == 1);
 		/*
 		 * Limits the amount of packets in one WQE
 		 * to improve CQE latency generation.
@@ -4168,6 +4171,7 @@  enum mlx5_txcmp_code {
 					return MLX5_TXCMP_CODE_EXIT;
 				return MLX5_TXCMP_CODE_MULTI;
 			}
+			assert(NB_SEGS(loc->mbuf) == 1);
 			if (ret == MLX5_TXCMP_CODE_TSO) {
 				part -= room;
 				mlx5_tx_idone_empw(txq, loc, part, slen, olx);