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 AE50C42EC5 for ; Thu, 20 Jul 2023 12:59:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA32E40EE3; Thu, 20 Jul 2023 12:59:24 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 90A0242BD9 for ; Thu, 20 Jul 2023 12:59:22 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3fbc5d5746cso5363935e9.2 for ; Thu, 20 Jul 2023 03:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689850762; x=1690455562; 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=t2+ZgPvKzJxaqCqdGzGmIDcRKl8Qx6eEtVmydxUPMBU=; b=Sf5rnIA9ipa/kEhAQ/m3hnolmrDEKDY9+lRn+hK7S6+0QLEWgE4L3syH3oWo/V/pPq bWDburyAn0O9SPGKQipzBsxAucrKdW+nFaLbt6Anr6KjgORrWMM9EdnKYW81nt9ZIVlg 88wx4ZPQAvPZKo99dJuMNnAKXe1ekuG4JwR4KMIMyWlAuV71XuqHmU/YG4bEUrTIh0tb BMkT6TsetT1SgTNkNbwDOMj1JIJwFu6WyWLPtJaonGRZ91gFzssd6oFndNrR1Lqt1Y17 /DlBkkpHpfWdPirHAslEeXHoGil1uaouw5JWcu/zeKHJapvs05SAm1XcQC4VPXjYTpFx ei8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689850762; x=1690455562; 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=t2+ZgPvKzJxaqCqdGzGmIDcRKl8Qx6eEtVmydxUPMBU=; b=XA5NBQvjfxLUBQ6qlVJoO43o4rzs+alyb5vWd020HWkm9D3aFXklQPkfMUADs+Fspa NU90KssqJYGSvh5uWJKONDv3Sa6zB5NxTqGNrbuBGPsH3j6/ycjGL2afvWrtQk3P70mB m7L4mMT2NR2UOUmXoOJ+zUnDdUIFr1Rv6kHx01xU90NZLrw2Vrl+3D9UvyZi143u29uN gzesf27t0I7DBqeo+df0u51CosHO8xMJD+Rl8vr9IXsCcECFj4V/NQi2L/r4a87kFPTt 54QXBCF9V9FjNLRAQeq6D0nf0QjWYu/yYdWPTimUmamSQ6Q9m8R9S8L9IdAnS7tSBkNZ TRSA== X-Gm-Message-State: ABy/qLbmB00PK8UzGrI1Ib1uP876wy6JIQk7ZTMptIKjpqzhWqjsjeM/ 4Qbuin8w7T8Axr4di8PDGIM= X-Google-Smtp-Source: APBJJlHjQUtSdC/bgJRcTcC2s5O7h/TCZ60bAHuC6L/DhfL4jIIx/RBkJI9qWuOs3e7EdzJ7XiwZYA== X-Received: by 2002:a05:600c:204b:b0:3fa:9561:3016 with SMTP id p11-20020a05600c204b00b003fa95613016mr6373185wmg.30.1689850762193; Thu, 20 Jul 2023 03:59:22 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id n23-20020a7bcbd7000000b003fa999cefc0sm869113wmi.36.2023.07.20.03.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 03:59:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Heng Jiang Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix LRO TCP checksum' has been queued to stable release 20.11.9 Date: Thu, 20 Jul 2023 11:58:57 +0100 Message-Id: <20230720105859.2537307-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720105859.2537307-1-luca.boccassi@gmail.com> References: <20230714223447.1092828-18-luca.boccassi@gmail.com> <20230720105859.2537307-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.9 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/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/09c57bff240fa74e6ac389516dce60f4da998b97 Thanks. Luca Boccassi --- >From 09c57bff240fa74e6ac389516dce60f4da998b97 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 --- drivers/net/mlx5/mlx5_rxtx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index c8f24dd4ef..ed22612737 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -1620,6 +1620,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, tcp->cksum = 0; 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) csum = 0xffff; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 11:54:24.566507997 +0100 +++ 0008-net-mlx5-fix-LRO-TCP-checksum.patch 2023-07-20 11:54:24.249504750 +0100 @@ -1 +1 @@ -From 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 Mon Sep 17 00:00:00 2001 +From 09c57bff240fa74e6ac389516dce60f4da998b97 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 776209c4b865ad3e0eaff202c5ff7358b8f5ab57 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,3 +18,2 @@ - .mailmap | 1 + - drivers/net/mlx5/mlx5_rx.c | 1 + - 2 files changed, 2 insertions(+) + drivers/net/mlx5/mlx5_rxtx.c | 1 + + 1 file changed, 1 insertion(+) @@ -21,17 +21,5 @@ -diff --git a/.mailmap b/.mailmap -index 9ce554451b..864d33ee46 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -496,6 +496,7 @@ Helin Zhang - Hemant Agrawal - Heng Ding - Hengjian Zhang -+Heng Jiang - Heng Wang - Henning Schild - Henry Cai -diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c -index 71c4638251..392784050f 100644 ---- a/drivers/net/mlx5/mlx5_rx.c -+++ b/drivers/net/mlx5/mlx5_rx.c -@@ -1090,6 +1090,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp, +diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c +index c8f24dd4ef..ed22612737 100644 +--- a/drivers/net/mlx5/mlx5_rxtx.c ++++ b/drivers/net/mlx5/mlx5_rxtx.c +@@ -1620,6 +1620,7 @@ mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,