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 9BDD4A04F3 for ; Thu, 19 Dec 2019 15:38:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 90BC91BF7B; Thu, 19 Dec 2019 15:38:45 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id A08431BF7B for ; Thu, 19 Dec 2019 15:38:44 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id t2so6241162wrr.1 for ; Thu, 19 Dec 2019 06:38:44 -0800 (PST) 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=eosfLx0BJHCLeuMLUN829ZycD9aIqa+cbyWO8y60foU=; b=SoP3eb14PUQUvozOuqpap5agEaBBFUFKft4PWnM5DxZ0t7zQdIEUczsZEDnj7B+1/v YI1im662ZFY5SIhmPTVFoB+JXB20wbIAvg9XVkWB1w/EKv4Ci27b6U6qtBRdnNYsuF+4 uJr0k2FI1FOcuweAkwMSIHQgXvYcuZYQmzgi1i2LfbAnSZfzi1lgmPnoOhmQfKWM8dY0 WzlwWiF22lxQ7+223qj7TShkA3gQ8r1SmfotNaZnmyjaiiyupZ0zgNW0eBA5d0+QRzmI uCYE/fBG+ja5pjLCSISAQ+50PYDppEa5NOSt2Jgf508sstPoWbeAJYtY0DgzJ8mNhHt4 4fbw== 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=eosfLx0BJHCLeuMLUN829ZycD9aIqa+cbyWO8y60foU=; b=tPAjUm8MotDWVq+sXxhYp9HIHnHC2+MvQIiKUf6DXXKCoyvDyPeYt9xHbu9B890iPH lVXmEiuz7bk4d2SOH43WkHqBBczTMUCFTmY3JMFd0kUyPOjhoH6xwt/d4c/neZ5UTG8k 35pKoD27/kQ0gQSdHVi+HJhtigvC3fpv2xwbZ9dcWwjfhrPDBtBqcXY5WqKS6gNzgipG syAESkQEedQMJo+8eMaNOE/7QZCdXXxMZq/V577E5niz6QFBkHjhJLfwK+VOAS4c7JFx grCrm4yWHbAcHSXaQ65wDjPqsC45UG7uodDdHDmYPmyO04jMCsYV8PFQCBFROk+OMVzU 8kOA== X-Gm-Message-State: APjAAAUhpsu1ktFd3wORxFY+aEfE2iZucOF/om1qKSrvFQu8Op+VNhwt lLkao8J1+OR+qYJ36x+dVFKHHcTJPq4= X-Google-Smtp-Source: APXvYqzetjSAt4af2PFm12eyvItIy0Cxj4J8yn6xNojw29xh055BKvOkLQx/MCTyv+IssEUFaO0v7Q== X-Received: by 2002:adf:fa12:: with SMTP id m18mr9454314wrr.309.1576766324198; Thu, 19 Dec 2019 06:38:44 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o4sm6454430wrw.97.2019.12.19.06.38.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:38:43 -0800 (PST) From: luca.boccassi@gmail.com To: Peng Huang Cc: Bernard Iremonger , dpdk stable Date: Thu, 19 Dec 2019 14:33:55 +0000 Message-Id: <20191219143447.21506-88-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix Tx checksum when TSO enabled' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 7daf128b8294ddd1599ab34a105ada53b0305284 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Thu, 24 Oct 2019 09:37:34 +0000 Subject: [PATCH] app/testpmd: fix Tx checksum when TSO enabled [ upstream commit 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 ] This patch fixed the TX checksum value problem when enabled TSO in tunnel packets, because outer UDP checksum calculation depend on the TSO configuration. Fixes: 0f62d63593ed ("app/testpmd: support tunneled TSO in checksum engine") Signed-off-by: Peng Huang Acked-by: Bernard Iremonger --- app/test-pmd/csumonly.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index ae59e76c31..70f3b392cf 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -432,6 +432,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len); + if (tso_enabled) + ol_flags |= PKT_TX_TCP_SEG; + /* outer UDP checksum is done in software as we have no hardware * supporting it today, and no API for it. In the other side, for * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:29.855222072 +0000 +++ 0088-app-testpmd-fix-Tx-checksum-when-TSO-enabled.patch 2019-12-19 14:32:26.209299888 +0000 @@ -1,14 +1,15 @@ -From 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 Mon Sep 17 00:00:00 2001 +From 7daf128b8294ddd1599ab34a105ada53b0305284 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Thu, 24 Oct 2019 09:37:34 +0000 Subject: [PATCH] app/testpmd: fix Tx checksum when TSO enabled +[ upstream commit 0322272c9fd39e1a5942c73232d43d3ebeeff7b1 ] + This patch fixed the TX checksum value problem when enabled TSO in tunnel packets, because outer UDP checksum calculation depend on the TSO configuration. Fixes: 0f62d63593ed ("app/testpmd: support tunneled TSO in checksum engine") -Cc: stable@dpdk.org Signed-off-by: Peng Huang Acked-by: Bernard Iremonger @@ -17,19 +18,19 @@ 1 file changed, 3 insertions(+) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c -index e12695d947..5738128e69 100644 +index ae59e76c31..70f3b392cf 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c -@@ -544,6 +544,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, - udp_hdr = (struct rte_udp_hdr *) - ((char *)outer_l3_hdr + info->outer_l3_len); +@@ -432,6 +432,9 @@ process_outer_cksums(void *outer_l3_hdr, struct testpmd_offload_info *info, + + udp_hdr = (struct udp_hdr *)((char *)outer_l3_hdr + info->outer_l3_len); + if (tso_enabled) + ol_flags |= PKT_TX_TCP_SEG; + - /* Skip SW outer UDP checksum generation if HW supports it */ - if (tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) { - if (info->outer_ethertype == _htons(RTE_ETHER_TYPE_IPV4)) + /* outer UDP checksum is done in software as we have no hardware + * supporting it today, and no API for it. In the other side, for + * UDP tunneling, like VXLAN or Geneve, outer UDP checksum can be -- 2.20.1