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 22341A0032 for ; Fri, 18 Feb 2022 13:45:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DE0A40395; Fri, 18 Feb 2022 13:45:39 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id 79AEF40141 for ; Fri, 18 Feb 2022 13:45:37 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id u1so14371266wrg.11 for ; Fri, 18 Feb 2022 04:45:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G1MmmnoUNPVgJTextXbEM+Yt1fMdL5h/6vtNKWdzyns=; b=dDMZ1bpwq/m1CroUSt5ijYBDkCaKwJVPsfP7bfaN3r8HThhil01Gxdn0Va8Gb5uR+X DeJt1yV5TbEsHGwb1PTa3ZEyOv2G7u1Th2hoEU+EuLfj9czt7rWFOcRuAebVlvwC6wmf KEZ5V3qj4Ysmn929cLAmiHnE990GkU/rlsPqJipox6YPJPIpkDyrPi7hfG2Uo21bltUJ 5V1dyuuIT3wwAAHfAi8wtgIY6mvvH2ZROKUTj5ewsEUxDRSgHADV0eS4SySI2g7h7FAf ekCyGuTvsB+HY3IJcDM5mcXy67C0BfRt3wzfMIqRiR3T6qJzj6Jbi986uH68EaZgMiCB zyJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G1MmmnoUNPVgJTextXbEM+Yt1fMdL5h/6vtNKWdzyns=; b=PA6Av4oegyVxcGl2Ti8ag9K1x0f2N01zr/PPDR1o1MTQQjYFhtM5Nx7zl2Wxvcq2Ny t0JpuoOcazKb0FbGnNw6m4TNuLn8L0hiLYImHMQan6Kp25az8W5K/YZ9wYcUsgXtv4IM xBB5h+3zq7XI++fMoWtEq/LqEzccGHOBCMtKddFXKyou6nubzaKZHYTjgtYvUvMBQhr3 uq7OFRm9xxPYZN0wP7ROG7xmNPFF3DvFiWlwRQbdcc6H8vB5MFiXsMVw8cnao1isXMED iz9afUrjX97m7tCO3Mxb2xVBpXe9G1/51r3+zgH9C/pPGn7ideu2omH7w9XGi6b6jhyM 26wA== X-Gm-Message-State: AOAM533qXiiEIzaC5iTJSX8dVOUDU8UEH7FfAmySlCyX5VuJfv12b0Eq WZHMew+eQTV7MbxIoDMO3PUB+TWJ2qKt+kJb X-Google-Smtp-Source: ABdhPJyMwdV5/ErAtYqMK/2+iaVRTpLr6y6ICBeSqNatPqn24nl5s7ghRC8o3BZJXOGT3nD3zrcoDw== X-Received: by 2002:a05:6000:1a43:b0:1e7:8794:647c with SMTP id t3-20020a0560001a4300b001e78794647cmr5992645wry.261.1645188337148; Fri, 18 Feb 2022 04:45:37 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id t2sm23360236wrr.55.2022.02.18.04.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:45:36 -0800 (PST) From: luca.boccassi@gmail.com To: Dariusz Sosnowski Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix inline length for multi-segment TSO' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:26 +0000 Message-Id: <20220218123931.1749595-117-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/c9eb38cd065bfc2cdb9bdefc37863cd37595c1d7 Thanks. Luca Boccassi --- >From c9eb38cd065bfc2cdb9bdefc37863cd37595c1d7 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Mon, 7 Feb 2022 17:48:56 +0200 Subject: [PATCH] net/mlx5: fix inline length for multi-segment TSO [ upstream commit 864678e420f00225572be476559a087bfecaafbf ] This patch removes a redundant assert in mlx5_tx_packet_multi_tso(). That assert assured that the amount of bytes requested to be inlined is greater than or equal to the minimum amount of bytes required to be inlined. This requirement is either derived from the NIC inlining mode or configured through devargs. When using TSO this requirement can be disregarded, because on all NICs it is satisfied by TSO inlining requirements, since TSO requires L2, L3, and L4 headers to be inlined. Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template") Signed-off-by: Dariusz Sosnowski Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 5012f2a74f..ba98277cf8 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -3239,7 +3239,6 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, inlen <= MLX5_ESEG_MIN_INLINE_SIZE || inlen > (dlen + vlan))) return MLX5_TXCMP_CODE_ERROR; - MLX5_ASSERT(inlen >= txq->inlen_mode); /* * Check whether there are enough free WQEBBs: * - Control Segment -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:42.232939642 +0000 +++ 0117-net-mlx5-fix-inline-length-for-multi-segment-TSO.patch 2022-02-18 12:37:37.878796119 +0000 @@ -1 +1 @@ -From 864678e420f00225572be476559a087bfecaafbf Mon Sep 17 00:00:00 2001 +From c9eb38cd065bfc2cdb9bdefc37863cd37595c1d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 864678e420f00225572be476559a087bfecaafbf ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ - drivers/net/mlx5/mlx5_tx.h | 1 - + drivers/net/mlx5/mlx5_rxtx.c | 1 - @@ -24,5 +25,5 @@ -diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h -index 099e72935a..398cadfeaa 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -1710,7 +1710,6 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq, +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index 5012f2a74f..ba98277cf8 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -3239,7 +3239,6 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq,