From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C3BA0A0351 for ; Thu, 6 Aug 2020 11:59:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6DE31C12A; Thu, 6 Aug 2020 11:59:07 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 7F0F21C123 for ; Thu, 6 Aug 2020 11:59:06 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id a15so43378783wrh.10 for ; Thu, 06 Aug 2020 02:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RY8aTjrFR23FY8YSFVhTp7ipEp4NyKQQWtPaEJ1NInQ=; b=ohSf0oHTwPEiB2yfNfHytl8zuHw0XTzAqnNl+Oyin/caxPTTY19oWgCAsv4lfwgv+z YuPtkPdsC115LYZv+/6/qURwQw+5I0YnFYiMMk2B+AkjcYrqyc6nmkdAke/g6VyyZJ26 KNot3gOX3WbjrolDxD1uzSCAEYwRtzoRcJteioMGxYvZibCXRLLpHhlev2pdPOg+iesm UiM3iGG7BtgGqUN1Wskz2I2Zh44Y5+pelX62qTShoTwRW/XTWEVyfTJSmTCxoJi/tWzQ Wuxq4QCBLrsQKgXCPKDQjzAQtNLQOY/rVFMZoXyq1hDBzlXCiAraIbiAQdeGvaBSMw0i PfDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RY8aTjrFR23FY8YSFVhTp7ipEp4NyKQQWtPaEJ1NInQ=; b=uOycg00BXpYBWNXLF93TEOJvrlBoNZTRdNlN0+7FTI3F79ezrWbqyPfixpS+7UD6OZ QfDz2/yvPr6iN1TQJYIKvWloWsJDCc/0I9M8rmvaH0OofQIxTMhClYIe3DCI9avORDUx ytNWXJecyZ+118S8Zd3D7GnZxxrymr5T6OeThsoUH0HtFwyU6vj+598DFYdSeFm94ulU jju7das8JZt9VouC1F4GXHAq0vCQJPH0ookjIzJspUiwafrKx5xuKDThqYwwzE9zqtZu +8ORiRJd0nkvCHlDVku+m7kw6ETHbzavr4N8a7fiXdoU6KtF0YJSp+Djn4cP0aMYHr94 n+Ww== X-Gm-Message-State: AOAM532C9nDde6qD2PBLEt3HDk7H75mrzcn4p68m4r08fjrczPEX6a6x DUfe3fCfm/MLxssT1/yQTb7b+KfeKsJ+pA== X-Google-Smtp-Source: ABdhPJzE/mXIQRa2mFNUKMyOqPMAn0mKWm+aZsPvehUhudCgH5juH8xWMooFQrRkn/jLqEUn21tPXw== X-Received: by 2002:adf:ef92:: with SMTP id d18mr7180091wro.71.1596707946277; Thu, 06 Aug 2020 02:59:06 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w64sm6144274wmb.26.2020.08.06.02.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Haiyue Wang Cc: Qi Zhang , dpdk stable Date: Thu, 6 Aug 2020 10:53:58 +0100 Message-Id: <20200806095411.774624-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix TCP checksum offload' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. 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. Thanks. Luca Boccassi --- >From 5d4e7bd58bed63d8c3d13c1e0958ad9515cba0c5 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Tue, 28 Jul 2020 21:42:03 +0800 Subject: [PATCH] net/ice: fix TCP checksum offload [ upstream commit 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 ] The L4LEN field of the Descriptor Header Offset for TCP should be the real length including the TCP options. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Signed-off-by: Haiyue Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 110b38646..bd4a50ab9 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, switch (ol_flags & PKT_TX_L4_MASK) { case PKT_TX_TCP_CKSUM: *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP; - *td_offset |= (sizeof(struct rte_tcp_hdr) >> 2) << + *td_offset |= (tx_offload.l4_len >> 2) << ICE_TX_DESC_LEN_L4_LEN_S; break; case PKT_TX_SCTP_CKSUM: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.961148877 +0100 +++ 0030-net-ice-fix-TCP-checksum-offload.patch 2020-08-06 10:53:15.816597718 +0100 @@ -1,13 +1,14 @@ -From 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 Mon Sep 17 00:00:00 2001 +From 5d4e7bd58bed63d8c3d13c1e0958ad9515cba0c5 Mon Sep 17 00:00:00 2001 From: Haiyue Wang Date: Tue, 28 Jul 2020 21:42:03 +0800 Subject: [PATCH] net/ice: fix TCP checksum offload +[ upstream commit 2a0c9ae4f646d8325eaaa0cd44b5def34f5a23b3 ] + The L4LEN field of the Descriptor Header Offset for TCP should be the real length including the TCP options. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") -Cc: stable@dpdk.org Signed-off-by: Haiyue Wang Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c -index cc3139042..ddf6a93fb 100644 +index 110b38646..bd4a50ab9 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c -@@ -2234,7 +2234,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, +@@ -2261,7 +2261,7 @@ ice_txd_enable_checksum(uint64_t ol_flags, switch (ol_flags & PKT_TX_L4_MASK) { case PKT_TX_TCP_CKSUM: *td_cmd |= ICE_TX_DESC_CMD_L4T_EOFT_TCP;