[dpdk-dev] net/mlx5: fix disabling Tx packet inlining

Message ID 20180226175057.27565-1-yskoh@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Yongseok Koh Feb. 26, 2018, 5:50 p.m. UTC
  Adding 'txq_inline=0' to PMD parameter should disable Tx packet inlining
but it doesn't work properly for Enhanced Multi-Packet Send.

Fixes: 6ce84bd88919 ("net/mlx5: add enhanced multi-packet send for ConnectX-5")
Cc: stable@dpdk.org

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Nélio Laranjeiro Feb. 27, 2018, 7:50 a.m. UTC | #1
On Mon, Feb 26, 2018 at 09:50:57AM -0800, Yongseok Koh wrote:
> Adding 'txq_inline=0' to PMD parameter should disable Tx packet inlining
> but it doesn't work properly for Enhanced Multi-Packet Send.
> 
> Fixes: 6ce84bd88919 ("net/mlx5: add enhanced multi-packet send for ConnectX-5")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> Acked-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
>  drivers/net/mlx5/mlx5_rxtx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
> index dc4ead934..049f7e6c1 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.c
> +++ b/drivers/net/mlx5/mlx5_rxtx.c
> @@ -1382,7 +1382,7 @@ txq_burst_empw(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
>  				(!txq->mpw_hdr_dseg ||
>  				 mpw.total_len >= MLX5_WQE_SIZE);
>  		}
> -		if (do_inline) {
> +		if (max_inline && do_inline) {
>  			/* Inline packet into WQE. */
>  			unsigned int max;
>  
> -- 
> 2.11.0
>
  
Shahaf Shuler March 11, 2018, 1:19 p.m. UTC | #2
Tuesday, February 27, 2018 9:51 AM, Nélio Laranjeiro
> On Mon, Feb 26, 2018 at 09:50:57AM -0800, Yongseok Koh wrote:
> > Adding 'txq_inline=0' to PMD parameter should disable Tx packet
> > inlining but it doesn't work properly for Enhanced Multi-Packet Send.
> >
> > Fixes: 6ce84bd88919 ("net/mlx5: add enhanced multi-packet send for
> > ConnectX-5")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
> > Acked-by: Shahaf Shuler <shahafs@mellanox.com>
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

Applied to next-net-mlx, thanks.
  

Patch

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index dc4ead934..049f7e6c1 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -1382,7 +1382,7 @@  txq_burst_empw(struct mlx5_txq_data *txq, struct rte_mbuf **pkts,
 				(!txq->mpw_hdr_dseg ||
 				 mpw.total_len >= MLX5_WQE_SIZE);
 		}
-		if (do_inline) {
+		if (max_inline && do_inline) {
 			/* Inline packet into WQE. */
 			unsigned int max;