From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C9123A00E6 for ; Tue, 16 Apr 2019 16:37:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BB00C1B4DE; Tue, 16 Apr 2019 16:37:50 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 256EB1B4DE for ; Tue, 16 Apr 2019 16:37:49 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8CEC33092663; Tue, 16 Apr 2019 14:37:48 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-214.ams2.redhat.com [10.36.117.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F91D1001E93; Tue, 16 Apr 2019 14:37:47 +0000 (UTC) From: Kevin Traynor To: Shahaf Shuler Cc: Yongseok Koh , dpdk stable Date: Tue, 16 Apr 2019 15:36:28 +0100 Message-Id: <20190416143719.21601-10-ktraynor@redhat.com> In-Reply-To: <20190416143719.21601-1-ktraynor@redhat.com> References: <20190416143719.21601-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 16 Apr 2019 14:37:48 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix packet inline on Tx queue wraparound' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/24/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >From a7e7ada7027799d81513300a4524e2f151fe61e7 Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Sun, 10 Mar 2019 10:14:10 +0200 Subject: [PATCH] net/mlx5: fix packet inline on Tx queue wraparound [ upstream commit 57c0e2494c51421033771122e8972a41dddb4cb7 ] 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") Signed-off-by: Shahaf Shuler Acked-by: Yongseok Koh --- 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 baa4079c1..38ce0e29a 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -694,5 +694,6 @@ pkt_inline: 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 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-16 15:34:25.663281776 +0100 +++ 0010-net-mlx5-fix-packet-inline-on-Tx-queue-wraparound.patch 2019-04-16 15:34:25.128181104 +0100 @@ -1,8 +1,10 @@ -From 57c0e2494c51421033771122e8972a41dddb4cb7 Mon Sep 17 00:00:00 2001 +From a7e7ada7027799d81513300a4524e2f151fe61e7 Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Sun, 10 Mar 2019 10:14:10 +0200 Subject: [PATCH] net/mlx5: fix packet inline on Tx queue wraparound +[ upstream commit 57c0e2494c51421033771122e8972a41dddb4cb7 ] + 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. @@ -18,7 +20,6 @@ require the inline header. Fixes: 3f13f8c23a7c ("net/mlx5: support hardware TSO") -Cc: stable@dpdk.org Signed-off-by: Shahaf Shuler Acked-by: Yongseok Koh