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 AC0E543345 for ; Thu, 16 Nov 2023 14:25:24 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5D90410EE; Thu, 16 Nov 2023 14:25:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5945240DF5 for ; Thu, 16 Nov 2023 14:25:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vz7jVjZ1VZ8duOqBQ1KjKpi+BLwaVXxNZEeWhV8ajDk=; b=J5kD1I2G1FoX5lMU1Q9EwmHxbfAmsxUHbZuqR6DKnuGhIQGOgcNkyUDxBPAem5imlFKoxh an7SN8W+n63q8YVxess0cyDXKFnms3o0aHWtSg74kA/fNmyTLLgaro8pU6/H6d95aQL4e3 7pFjCVXCppzWWoWJDRSsfk+6sI8hJgw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-dhWGCG5qPUWeqZuFvBdguQ-1; Thu, 16 Nov 2023 08:25:19 -0500 X-MC-Unique: dhWGCG5qPUWeqZuFvBdguQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 93319101A54C; Thu, 16 Nov 2023 13:25:19 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id E65D52166B27; Thu, 16 Nov 2023 13:25:18 +0000 (UTC) From: Kevin Traynor To: Viacheslav Ovsiienko Cc: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix multi-segment Tx inline data length' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:44 +0000 Message-ID: <20231116132348.557257-62-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 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/21/23. 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/d4eebaf47c552011149a6fda7e7cf2dd7dfd4a2c Thanks. Kevin --- >From d4eebaf47c552011149a6fda7e7cf2dd7dfd4a2c Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Fri, 10 Nov 2023 11:49:38 +0200 Subject: [PATCH] net/mlx5: fix multi-segment Tx inline data length [ upstream commit e3c7bb56b4583ccb1304219f52639d898727e65d ] If packet data length exceeds the configured limit for packet to be inlined in the queue descriptor the driver checks if hardware requires to do minimal data inline or the VLAN insertion offload is requested and not supported in hardware (that means we have to do VLAN insertion in software with inline data). Then driver scans the mbuf chain to find the minimal segment amount to satisfy the data needed for minimal inline. There was incorrect first segment inline data length calculation with missing VLAN header being inserted, that could lead to the segmentation fault in the mbuf chain scanning, for example for the packets: packet: mbuf0 pkt_len = 288, data_len = 156 mbuf1 pkt_len = 132, data_len = 132 txq->inlen_send = 290 The driver was trying to reach the inlen_send inline data length with missing VLAN header length added and was running out of the mbuf chain (there were just not enough data in the packet to satisfy the criteria). Fixes: 18a1c20044c0 ("net/mlx5: implement Tx burst template") Fixes: ec837ad0fc7c ("net/mlx5: fix multi-segment inline for the first segments") Signed-off-by: Viacheslav Ovsiienko Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_tx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h index 9e097944cd..e2d0d6de0b 100644 --- a/drivers/net/mlx5/mlx5_tx.h +++ b/drivers/net/mlx5/mlx5_tx.h @@ -1923,5 +1923,5 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq, mbuf = loc->mbuf; - nxlen = rte_pktmbuf_data_len(mbuf); + nxlen = rte_pktmbuf_data_len(mbuf) + vlan; /* * Packet length exceeds the allowed inline data length, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:54.033406962 +0000 +++ 0062-net-mlx5-fix-multi-segment-Tx-inline-data-length.patch 2023-11-16 13:21:52.588946777 +0000 @@ -1 +1 @@ -From e3c7bb56b4583ccb1304219f52639d898727e65d Mon Sep 17 00:00:00 2001 +From d4eebaf47c552011149a6fda7e7cf2dd7dfd4a2c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e3c7bb56b4583ccb1304219f52639d898727e65d ] + @@ -32 +33,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ -index 264cc192dc..e59ce37667 100644 +index 9e097944cd..e2d0d6de0b 100644 @@ -44 +45 @@ -@@ -2047,5 +2047,5 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq, +@@ -1923,5 +1923,5 @@ mlx5_tx_packet_multi_inline(struct mlx5_txq_data *__rte_restrict txq,