From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro Subject: Re: [PATCH] net/mlx5: fix Tx max inline with TSO Date: Wed, 3 May 2017 08:59:31 +0200 Message-ID: <20170503065931.GK31330@autoinstall.dev.6wind.com> References: <20170503065535.188899-1-shahafs@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Cc: adrien.mazarguil@6wind.com, dev@dpdk.org To: Shahaf Shuler Return-path: Received: from mail-wr0-f179.google.com (mail-wr0-f179.google.com [209.85.128.179]) by dpdk.org (Postfix) with ESMTP id 650995A6E for ; Wed, 3 May 2017 08:59:38 +0200 (CEST) Received: by mail-wr0-f179.google.com with SMTP id w50so98561877wrc.0 for ; Tue, 02 May 2017 23:59:38 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20170503065535.188899-1-shahafs@mellanox.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Wed, May 03, 2017 at 09:55:35AM +0300, Shahaf Shuler wrote: > When TSO is enabled, Verbs layer aggregates the TSO > inline size with the txq inline size for the Tx creation, > while the PMD takes the maximum among them. > > Fixing it by adjusting the max inline parameter before > passing to to Verbs. > > Fixes: 3f13f8c23a7c ("net/mlx5: support hardware TSO") > > Signed-off-by: Shahaf Shuler > Acked-by: Yongseok Koh > --- > drivers/net/mlx5/mlx5_txq.c | 17 +++++++++++++---- > 1 file changed, 13 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c > index f80740a13..24bd8c615 100644 > --- a/drivers/net/mlx5/mlx5_txq.c > +++ b/drivers/net/mlx5/mlx5_txq.c > @@ -230,6 +230,9 @@ txq_ctrl_setup(struct rte_eth_dev *dev, struct txq_ctrl *txq_ctrl, > struct ibv_exp_cq_attr cq_attr; > } attr; > unsigned int cqe_n; > + const unsigned int max_tso_inline = ((MLX5_MAX_TSO_HEADER + > + (RTE_CACHE_LINE_SIZE - 1)) / > + RTE_CACHE_LINE_SIZE); > int ret = 0; > > if (mlx5_getenv_int("MLX5_ENABLE_CQE_COMPRESSION")) { > @@ -307,16 +310,22 @@ txq_ctrl_setup(struct rte_eth_dev *dev, struct txq_ctrl *txq_ctrl, > priv->inline_max_packet_sz) + > (RTE_CACHE_LINE_SIZE - 1)) / > RTE_CACHE_LINE_SIZE) * RTE_CACHE_LINE_SIZE; > + } else if (priv->tso) { > + int inline_diff = tmpl.txq.max_inline - max_tso_inline; > + > + /* Adjust inline value as Verbs aggregates > + * tso_inline and txq_inline fields. > + */ > + attr.init.cap.max_inline_data = inline_diff > 0 ? > + inline_diff * > + RTE_CACHE_LINE_SIZE : > + 0; > } else { > attr.init.cap.max_inline_data = > tmpl.txq.max_inline * RTE_CACHE_LINE_SIZE; > } > } > if (priv->tso) { > - uint16_t max_tso_inline = ((MLX5_MAX_TSO_HEADER + > - (RTE_CACHE_LINE_SIZE - 1)) / > - RTE_CACHE_LINE_SIZE); > - > attr.init.max_tso_header = > max_tso_inline * RTE_CACHE_LINE_SIZE; > attr.init.comp_mask |= IBV_EXP_QP_INIT_ATTR_MAX_TSO_HEADER; > -- > 2.12.0 > Acked-by: Nelio Laranjeiro -- Nélio Laranjeiro 6WIND