From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id ADB7DF94 for ; Tue, 18 Apr 2017 08:43:36 +0200 (CEST) Received: by mail-wm0-f43.google.com with SMTP id u2so46217170wmu.0 for ; Mon, 17 Apr 2017 23:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=stYgBh0iEunaTXn6CRmaJMpwAHc9bPRlXyEC+4eqp9U=; b=Jt6aFLKSqj/fLH/3OuhLk5Ouze19JWCVFxjOZ9UlWMRTPx1gRKwpof5K2HXRjRvQ9o 1TlYOuI5kEffzuu3MfFZ/19ILjPZlmU6BQBcFb/sZYx2EKDsTk3lFarr27hfNRDnEXvY 92gEp53fjVi7WxrgMEwgFkomz1Vi0d9XpGzAkedJ8y+erFXAptJjAx03vs8LrUgpI3hQ dpUjKg4TiCtJ/nxbHaqoDOmeA7/6JvN7pUQUa5p2gR49KInAPKRVFmUkMBkSQd2WsbKw YLV/WLGMTtS51csgT9ThJHYodQ/ZhfxqAlUMgHNV/pRcANAwmTeLbKN9bD0BAGPc2OXK xfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=stYgBh0iEunaTXn6CRmaJMpwAHc9bPRlXyEC+4eqp9U=; b=lvq/bA1hX7sBzHY3LCOKPIi1I08piCdS3oHNlrUvEJx1sXj9ZgWNw/ritcZRgtoQ6q dTV0raJP06hcvK7+cvthPKHC0MuwQ7SZXN8rBYApiis5JanIJjZny8Bv/+FarxCyY24Z x6AzHledYUUNg54JnFSmK0Dn1mHk5dOabXowyquVcmXexbjQVX4grwdyV2oXOdGnZIIO FGgAuUfs9aPOvWIjwMDbz03wnXoV2ADjyucU1XR+uiDAasGDL7c7dWzoMJ3IXpzNB/Wf vWJlNG3MSa5pV+7OIB7i7S+wXor6cIMakvLx1PbM8/H71O/uFva/oLIYcK09tKkLznjx NcnQ== X-Gm-Message-State: AN3rC/67lN2tse0rjsPyNBNMu2IjwMfX1PlAqag12npGCnb2p70kCAD8 QBF6lwAzMGGG1XO6 X-Received: by 10.28.232.72 with SMTP id f69mr7697774wmh.6.1492497816096; Mon, 17 Apr 2017 23:43:36 -0700 (PDT) Received: from autoinstall.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id w126sm13044161wmb.25.2017.04.17.23.43.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Apr 2017 23:43:35 -0700 (PDT) Date: Tue, 18 Apr 2017 08:43:28 +0200 From: =?iso-8859-1?Q?N=E9lio?= Laranjeiro To: Yongseok Koh Cc: ferruh.yigit@intel.com, dev@dpdk.org, adrien.mazarguil@6wind.com Message-ID: <20170418064328.GG14075@autoinstall.dev.6wind.com> References: <20170413174651.27860-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170413174651.27860-1-yskoh@mellanox.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-dev] [PATCH] net/mlx5: change calculating inline room for Tx X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Apr 2017 06:43:37 -0000 On Thu, Apr 13, 2017 at 10:46:51AM -0700, Yongseok Koh wrote: > Current implementation is error-prone if the max inline size > (txq->max_inilne) is decoupled from txq->inline_en and becomes zero. If it > becomes zero, HW can crash due to WQ overflow. > > Signed-off-by: Yongseok Koh > Acked-by: Shahaf Shuler > --- > drivers/net/mlx5/mlx5_rxtx.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c > index 2e208bf96..6254228a9 100644 > --- a/drivers/net/mlx5/mlx5_rxtx.c > +++ b/drivers/net/mlx5/mlx5_rxtx.c > @@ -499,6 +499,8 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) > unsigned int j = 0; > unsigned int k = 0; > unsigned int max; > + unsigned int max_inline = txq->max_inline; > + const unsigned int inline_en = !!max_inline && txq->inline_en; > uint16_t max_wqe; > unsigned int comp; > volatile struct mlx5_wqe_v *wqe = NULL; > @@ -685,14 +687,14 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) > } > } > /* Inline if enough room. */ > - if (txq->inline_en || tso) { > + if (inline_en || tso) { > uintptr_t end = (uintptr_t) > (((uintptr_t)txq->wqes) + > (1 << txq->wqe_n) * MLX5_WQE_SIZE); > - unsigned int max_inline = txq->max_inline * > - RTE_CACHE_LINE_SIZE - > - (pkt_inline_sz - 2); > - uintptr_t addr_end = (addr + max_inline) & > + unsigned int inline_room = max_inline * > + RTE_CACHE_LINE_SIZE - > + (pkt_inline_sz - 2); > + uintptr_t addr_end = (addr + inline_room) & > ~(RTE_CACHE_LINE_SIZE - 1); > unsigned int copy_b = (addr_end > addr) ? > RTE_MIN((addr_end - addr), length) : > -- > 2.11.0 Acked-by: Nelio Laranjeiro -- Nélio Laranjeiro 6WIND