From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 47C91A0C4C for ; Mon, 12 Jul 2021 15:15:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 416CA40685; Mon, 12 Jul 2021 15:15:01 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id A959E40685 for ; Mon, 12 Jul 2021 15:14:59 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id i94so25547330wri.4 for ; Mon, 12 Jul 2021 06:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sIedETQiC9I0b0UJpF24fhyomXO+89MxXmZek03+lTU=; b=NFfHJakZch+u2uoGQvJ6M+zESen6t9UycQPXOI+uzjMc/ZPv2d+BYR/P+Lko5cI+Dc 47P3dBSfP97L5wnKcCljz5OkfiilRip7IzcRDW8nz0B7FPmpEf2UJowNmeph2cSP2Zq+ keUpdqNRnw3h8uu1HRryacXzodpcpIjTf5YIg7Jh/R58BhoKIsT2/upn7vHJaMZIuMno 1kFYPPURNecYttOQa50Xas8fCfbsuifUHPD1ekGry3CuQv3ZjUWgNRJETB7KgLhfuElV UvCbypB6A3Fd/kPostu+biKYPuE8H5KGc7E/J+gr8+/9ycqnk31Cz3/TPCmslEm9CK7g CpTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sIedETQiC9I0b0UJpF24fhyomXO+89MxXmZek03+lTU=; b=EHZx71IPMtlHxtyoxVwMHOiEXGf8dFUFWC6tPX53FUJuo+EEdTDpytZxlYwB8O9bm7 TieeqoPSkhWG/pEO36jQ94PXss4tydfMCuK6G6cLaa2l4AHsWnsBsD/4nhhV2HO1iJ0v iultos/o30qTMgeDIxxACj/K+UOaZqo1KG2Bnth/uSnjp5bqipxob6aVU6GhO3wPV1Lx cHAQQurqPDltXG0jZaYjiOI8zMhIlrOtDaUIaJK1k9ALprFCsBri0Y7ePpI3Ibf21qzv QF8IvfQltFamJSN+/jdVlTV0v6ZBGyW7oBYe41smhZHxGTNMZcUg/Yx1sP86Z+dJYJjW 5okQ== X-Gm-Message-State: AOAM531kpOFl4DM5L9FTnY2CtEZjF15nyrSTpcT6w88LK/Jd3yMyV2CE LRCucxIBYWCGSaqhiDL6uQ0= X-Google-Smtp-Source: ABdhPJxOOiT0T/BKCz5o/iqiQlSwzGsM6XA2GzkDIPPGAg6hvLQikDmYc5LWFhYkU7yIYhYooJYscQ== X-Received: by 2002:a5d:6992:: with SMTP id g18mr42065427wru.118.1626095699515; Mon, 12 Jul 2021 06:14:59 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id f7sm10187849wml.35.2021.07.12.06.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:14:58 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: dpdk stable Date: Mon, 12 Jul 2021 14:05:29 +0100 Message-Id: <20210712130551.2462159-94-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix TSO multi-segment inline length' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/4a3fe74d9dc570fed8c8638caf387ca324d870a8 Thanks. Luca Boccassi --- >From 4a3fe74d9dc570fed8c8638caf387ca324d870a8 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Sun, 20 Jun 2021 09:30:28 +0300 Subject: [PATCH] net/mlx5: fix TSO multi-segment inline length [ upstream commit 52e1ece50aaf526b900120283284834b0a59e3ce ] The inline data length for TSO ethernet segment should be calculated from the TSO header instead of the inline size configured by txq_inline_min devarg or reported by the NIC. It is imposed by the nature of TSO offload - inline header is being duplicated to every output TCP packet. Fixes: cacb44a09962 ("net/mlx5: add no-inline Tx flag") Signed-off-by: Viacheslav Ovsiienko --- 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 64bba34ffc..5ec823b024 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -2743,7 +2743,8 @@ mlx5_tx_eseg_mdat(struct mlx5_txq_data *__rte_restrict txq, * Copying may be interrupted inside the routine * if run into no inline hint flag. */ - copy = tlen >= txq->inlen_mode ? 0 : (txq->inlen_mode - tlen); + copy = tso ? inlen : txq->inlen_mode; + copy = tlen >= copy ? 0 : (copy - tlen); copy = mlx5_tx_mseg_memcpy(pdst, loc, part, copy, olx); tlen += copy; if (likely(inlen <= tlen) || copy < part) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.432925134 +0100 +++ 0094-net-mlx5-fix-TSO-multi-segment-inline-length.patch 2021-07-12 13:41:36.790128860 +0100 @@ -1 +1 @@ -From 52e1ece50aaf526b900120283284834b0a59e3ce Mon Sep 17 00:00:00 2001 +From 4a3fe74d9dc570fed8c8638caf387ca324d870a8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 52e1ece50aaf526b900120283284834b0a59e3ce ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/mlx5/mlx5_tx.h | 3 ++- + drivers/net/mlx5/mlx5_rxtx.c | 3 ++- @@ -20,5 +21,5 @@ -diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h -index 634c9d754a..1a35919371 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -1338,7 +1338,8 @@ mlx5_tx_eseg_mdat(struct mlx5_txq_data *__rte_restrict txq, +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index 64bba34ffc..5ec823b024 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -2743,7 +2743,8 @@ mlx5_tx_eseg_mdat(struct mlx5_txq_data *__rte_restrict txq,