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 09B8BA00C4 for ; Fri, 18 Nov 2022 00:09:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05CE040DFB; Fri, 18 Nov 2022 00:09:54 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 243F24021F for ; Fri, 18 Nov 2022 00:09:52 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id m7-20020a05600c090700b003cf8a105d9eso2799177wmp.5 for ; Thu, 17 Nov 2022 15:09:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+kr98rFxjisE4+QOtOCn+ZYst5Dgta3oKu8AGaTVqdA=; b=ltDlNe7pdqEefhpHbhZ3lAUbFQ1PmkvecGtwFMsFEm6Eh8h9BiLa9mHQhUbHaub9GQ nUE0rD+GNNN0kyqpsHCcdT8uMwpwK4JklqPBurjuVWEgEQ9sMPgXfNNnJotbciaWve03 80hIcSzTtNhEzZtKtxUdKBc5OMQfa4Z6LQvbHfbovN/Rvf5f4deWcT3eq0sBYUUocp1x NX3ALdQPSYhWI0RW7azEmXy2eU2ekyQG0Zlhtj1gBnYstmvlnfUDnI6xFvukdJ4dlWVx fqKaNm9ucU2Cpbb/fMRqYnvu6DzRxMlwTl6PRZP4UGg3WXMt60agZQI0IEJwIZrB7c73 xHpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+kr98rFxjisE4+QOtOCn+ZYst5Dgta3oKu8AGaTVqdA=; b=vmgCY2lGvfPMiZ8Qa8rj5AnIh6cYQwnF6R3cCLeERA47iA/XcDU/nCJw7PLzBQt2C+ AGkiNcLkwfm7g0r0pEI9yAx+pHPGLTtXmHUw47k9KT2MLQowGEWR8GKIYNgGePBxLN5o B4SBo+Q50jslO8C6hsW3LJUiTy36FXHkQBzI9FKlQ9rAIEFgHcv3PSI+7mi6OX+9Hwe0 DtGaT0iwQ5G1aAFOcDlNSuCOvvEBbkQcpE1AtIMCHrrmBKfJvPR7x3CXW4h7HeMGDE2q 2jyLgpciMrJl3WyI0iMlK9cM9VXHBTtHh/dPJTEGjXzDeRrVhcdXBvlRPVnCXo0A7+KV lTWQ== X-Gm-Message-State: ANoB5pnUsFj+33EjZfFCydACP2ihA6OZO4TpJ4hfOvoA5RRyFAOtXHAZ EukKq15Nes7c2YnG5zek/4UrdZL+Hlo= X-Google-Smtp-Source: AA0mqf5VydiOtlXm2CrGK4hM5khFvIN9JIHMb8lcsEnc0MuVrJI7DILqthl/upW9fWB4OSqXbjWu3Q== X-Received: by 2002:a05:600c:19d1:b0:3cf:ca1a:332a with SMTP id u17-20020a05600c19d100b003cfca1a332amr6788394wmq.118.1668726591878; Thu, 17 Nov 2022 15:09:51 -0800 (PST) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id f19-20020a05600c155300b003c6f3e5ba42sm7815453wmg.46.2022.11.17.15.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:09:51 -0800 (PST) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix first segment inline length' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:38 +0000 Message-Id: <20221117230859.611465-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/19/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c8c70e90664f5a9eb87737b2ad2ffafade607b29 Thanks. Luca Boccassi --- >From c8c70e90664f5a9eb87737b2ad2ffafade607b29 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 8 Nov 2022 15:45:00 +0200 Subject: [PATCH] net/mlx5: fix first segment inline length [ upstream commit da4470cb178b87c9637cb575719e022182ea38da ] Packets can be split into several mbufs with various data sizes. There is no limitation on how small these segments can be. But there is a limitation on Tx side for inline configuration: send WQEs with inline headers less than the required are dropped. The very first segment must be more than minimal inline eth segment. Enforce this requirement by merging a few segments in this case. Fixes: ec837ad0fc7c ("net/mlx5: fix multi-segment inline for the first segments") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index fb4b8544ae..12a1eff681 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -3490,6 +3490,8 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq, } else if (mbuf->ol_flags & PKT_TX_DYNF_NOINLINE || nxlen > txq->inlen_send) { return mlx5_tx_packet_multi_send(txq, loc, olx); + } else if (nxlen <= MLX5_ESEG_MIN_INLINE_SIZE) { + inlen = MLX5_ESEG_MIN_INLINE_SIZE; } else { goto do_first; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.116889750 +0000 +++ 0014-net-mlx5-fix-first-segment-inline-length.patch 2022-11-17 23:07:55.484330187 +0000 @@ -1 +1 @@ -From da4470cb178b87c9637cb575719e022182ea38da Mon Sep 17 00:00:00 2001 +From c8c70e90664f5a9eb87737b2ad2ffafade607b29 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit da4470cb178b87c9637cb575719e022182ea38da ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - drivers/net/mlx5/mlx5_tx.h | 2 ++ + drivers/net/mlx5/mlx5_rxtx.c | 2 ++ @@ -22,6 +23,6 @@ -diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h -index 6471ebf59f..a44050a1ce 100644 ---- a/drivers/net/mlx5/mlx5_tx.h -+++ b/drivers/net/mlx5/mlx5_tx.h -@@ -1994,6 +1994,8 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq, - } else if (mbuf->ol_flags & RTE_MBUF_F_TX_DYNF_NOINLINE || +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index fb4b8544ae..12a1eff681 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -3490,6 +3490,8 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq, + } else if (mbuf->ol_flags & PKT_TX_DYNF_NOINLINE ||