From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shahaf Shuler Subject: [PATCH] net/mlx5: fix packet inline on Tx queue wraparound Date: Sun, 10 Mar 2019 10:14:10 +0200 Message-ID: <20190310081410.94830-1-shahafs@mellanox.com> Cc: dev@dpdk.org, stable@dpdk.org To: yskoh@mellanox.com Return-path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id EE58FA3 for ; Sun, 10 Mar 2019 09:14:18 +0100 (CET) List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Inlining a packet to WQE that cross the WQ wraparound, i.e. the WQE starts on the end of the ring and ends on the beginning, is not supported and blocked by the data path logic. However, in case of TSO, an extra inline header is required before inlining. This inline header is not taken into account when checking if there is enough room left for the required inline size. On some corner cases were (ring_tailroom - inline header) < inline size < ring_tailroom , this can lead to WQE being written outsize of the ring buffer. Fixing it by always assuming the worse case that inline of packet will require the inline header. Fixes: 3f13f8c23a7c ("net/mlx5: support hardware TSO") Cc: stable@dpdk.org Signed-off-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index baa4079c14..38ce0e29a2 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -693,7 +693,8 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) RTE_CACHE_LINE_SIZE); copy_b = (addr_end > addr) ? RTE_MIN((addr_end - addr), length) : 0; - if (copy_b && ((end - (uintptr_t)raw) > copy_b)) { + if (copy_b && ((end - (uintptr_t)raw) > + (copy_b + sizeof(inl)))) { /* * One Dseg remains in the current WQE. To * keep the computation positive, it is -- 2.12.0