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 B72FA42EDA for ; Fri, 21 Jul 2023 15:35:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B43E042D3B; Fri, 21 Jul 2023 15:35:38 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id DB92942D3B for ; Fri, 21 Jul 2023 15:35:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689946537; 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=ZjXIi5+Q8/+f+DV4SunHGSk/IDJnEchC5NvNtInceYY=; b=Uwte7FbbOlsCEvZLPbK2Ds0Hn8BuU5II0jl3yA2ycq52VKotASmCZHG40T3ZBeRjeFbQ5z 9l9xtFA7QDP6YXmetB9N49ftaAk33+KfxS9iLe5ouWyYmVjsqs51KZzSB3sOHm/BLOsXOh OTSDseZKFmIQ8558cWrHwXITukB0S1c= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-537-Ap3tgnmUNzulEPpUj2g-pQ-1; Fri, 21 Jul 2023 09:35:33 -0400 X-MC-Unique: Ap3tgnmUNzulEPpUj2g-pQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1A2663813F3A; Fri, 21 Jul 2023 13:35:33 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18DC3140E949; Fri, 21 Jul 2023 13:35:31 +0000 (UTC) From: Kevin Traynor To: Heng Jiang Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix LRO TCP checksum' has been queued to stable release 21.11.5 Date: Fri, 21 Jul 2023 14:35:04 +0100 Message-ID: <20230721133509.348959-9-ktraynor@redhat.com> In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com> References: <20230721133509.348959-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.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 07/25/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/2788848cca3e531f425e809ce9715cbe3d83f403 Thanks. Kevin --- >From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001 From: Heng Jiang Date: Tue, 18 Jul 2023 11:56:13 +0300 Subject: [PATCH] net/mlx5: fix LRO TCP checksum [ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ] The variable csum is the sum of three 16 bits integers, the max value is 0x2FFFD. The corner case of sum of 3 is 0x1FFFF gives the wrong result: 0x1 + 0xFFFF = 0x10000, the upper 16 bits are not 0. It must be folded again to ensure that the upper 16 bits are 0. Fixes: e4c2a16eb1de ("net/mlx5: handle LRO packets in Rx queue") Signed-off-by: Heng Jiang Acked-by: Viacheslav Ovsiienko --- .mailmap | 1 + drivers/net/mlx5/mlx5_rx.c | 1 + 2 files changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 495f89e75d..7de8dbf81d 100644 --- a/.mailmap +++ b/.mailmap @@ -483,4 +483,5 @@ Hemant Agrawal Heng Ding Hengjian Zhang +Heng Jiang Heng Wang Henning Schild diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c index d354862cff..ab88f2526f 100644 --- a/drivers/net/mlx5/mlx5_rx.c +++ b/drivers/net/mlx5/mlx5_rx.c @@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, csum += rte_raw_cksum(tcp, (tcp->data_off >> 4) * 4); csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff); + csum = ((csum & 0xffff0000) >> 16) + (csum & 0xffff); csum = (~csum) & 0xffff; if (csum == 0) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-21 14:33:59.228180227 +0100 +++ 0009-net-mlx5-fix-LRO-TCP-checksum.patch 2023-07-21 14:33:59.020253274 +0100 @@ -1 +1 @@ -From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001 +From 2788848cca3e531f425e809ce9715cbe3d83f403 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 9ce554451b..864d33ee46 100644 +index 495f89e75d..7de8dbf81d 100644 @@ -25 +26 @@ -@@ -497,4 +497,5 @@ Hemant Agrawal +@@ -483,4 +483,5 @@ Hemant Agrawal @@ -32 +33 @@ -index 71c4638251..392784050f 100644 +index d354862cff..ab88f2526f 100644 @@ -35 +36 @@ -@@ -1091,4 +1091,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, +@@ -1028,4 +1028,5 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,