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 0D6BBA0A0C for ; Tue, 3 Aug 2021 14:23:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07DC8411CE; Tue, 3 Aug 2021 14:23:07 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 4E66D411D1 for ; Tue, 3 Aug 2021 14:23:06 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id z4so25134226wrv.11 for ; Tue, 03 Aug 2021 05:23: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=t3zv2NL+VEUyQ9IhtiKzuomr7rtT/PvkzZyr7NE+1qQ=; b=tFN3rr6wFcRBqYKJz7prBGyev2J9PgXBYhuMYFVa7HvZPAcQttWzYHCLCCmrhiuTau qdX5YKQUxRYT7T9/1hAZUR100kz5tkHbbhr5G2YidQwWfUlXEyLlNqz+yk81JhHeIbfD YEnVaV2g65YGSkMD3+nKkxsw/G3inGNoruoQ4Lm2Q2KWsLyflr+aq1YHqa/8kxdQJeSD tlzie6eXbbkMePikGGosJd/3/Y3K1vyLUSOm9638ZlAr+Rj0o51ijGZPgA/ILmKYCghX nu5sDmvd1GnRgus+64n+/BnnfXAvuMQ2Wp/UIdZAt4dVvHbfF47Soj5mnMIfuGJZMYHD fGQw== 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=t3zv2NL+VEUyQ9IhtiKzuomr7rtT/PvkzZyr7NE+1qQ=; b=uLspCf1aHr4wXLF4qR4d+hV1r6nWwwlfhpFZsxfxZN5wpSb826NEO3q0kAHQAGd2aQ X6vrln5DDxSjEDUcTckntzBviSwHXv1akqEcTtSCJO5H7Oxsshl0ZhEwk2btiniTKswU 7xyUXmhf43owrjLxy7V8wGFJnlJDOk0Ik2jNNujXGLrh+Z0pOUgzo/YL+dGVRIVvVTCM AnJ8mEUDvAd0qRRfKBdRFv01NIoBfUT0gHXYZC5foDRJcfw0H8ZqjuhWZEJw+CfIkJtg nZdt36CrJKjsrSFrR/RPJRY2xgo48EnQ+dYxpQCG7WPZcbLL2/G0KGoQSckzuLLvSckO vgTA== X-Gm-Message-State: AOAM532X44OdYKpMOp7N2z8IHR6PgHH4vj/0Fm4+SYyJScMRUZ56Xal0 vpXlEMy3HnBkwc4E19vle+Y= X-Google-Smtp-Source: ABdhPJwCmaswofBBxDTn1ITyYuNiVzsw/oRVH5BF8X/q6wAuPhmBPFcxhX4B+RxVjbVulceKKAS2cA== X-Received: by 2002:a05:6000:10c6:: with SMTP id b6mr23051261wrx.110.1627993386012; Tue, 03 Aug 2021 05:23:06 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id 104sm14836879wrc.4.2021.08.03.05.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Aug 2021 05:23:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Gregory Etelson Cc: Ori Kam , Ajit Khaparde , Xiaoyun Li , Olivier Matz , dpdk stable Date: Tue, 3 Aug 2021 13:22:06 +0100 Message-Id: <20210803122214.1094992-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210803122214.1094992-1-luca.boccassi@gmail.com> References: <20210726135322.149850-59-luca.boccassi@gmail.com> <20210803122214.1094992-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix Tx checksum calculation for tunnel' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 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/05/21. 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/c9c391ea6083a312e532f1f3139d36eb7b3de20e Thanks. Luca Boccassi --- >From c9c391ea6083a312e532f1f3139d36eb7b3de20e Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 29 Jul 2021 20:01:41 +0300 Subject: [PATCH] app/testpmd: fix Tx checksum calculation for tunnel [ upstream commit b2a9e4a855d0e5b4e3fdba5b126bcf00aa8f0ada ] csumonly engine calculates Tx checksum of a tunnelled packet for outer headers only or separately for outer and inner headers. The calculation method is determined by checksum configuration options. If Tx checksum calculation is separated, the inner headers are processed before outer headers. Inner headers processing sets checksum values to 0 unconditionally. If Tx configuration offloads inner checksums only, outer checksum calculation in software will read 0 instead of real values and produce wrong result. The patch zeroes inner checksums only before software calculation. Fixes: 6b520d54ebfe ("app/testpmd: use Tx preparation in checksum engine") Signed-off-by: Gregory Etelson Acked-by: Ori Kam Acked-by: Ajit Khaparde Acked-by: Xiaoyun Li Acked-by: Olivier Matz --- app/test-pmd/csumonly.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index d813d4fae0..73a78f955c 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -480,17 +480,18 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV4)) { ipv4_hdr = l3_hdr; - ipv4_hdr->hdr_checksum = 0; ol_flags |= PKT_TX_IPV4; if (info->l4_proto == IPPROTO_TCP && tso_segsz) { ol_flags |= PKT_TX_IP_CKSUM; } else { - if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) + if (tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM) { ol_flags |= PKT_TX_IP_CKSUM; - else + } else if (ipv4_hdr->hdr_checksum != 0) { + ipv4_hdr->hdr_checksum = 0; ipv4_hdr->hdr_checksum = rte_ipv4_cksum(ipv4_hdr); + } } } else if (info->ethertype == _htons(RTE_ETHER_TYPE_IPV6)) ol_flags |= PKT_TX_IPV6; @@ -501,10 +502,10 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, udp_hdr = (struct rte_udp_hdr *)((char *)l3_hdr + info->l3_len); /* do not recalculate udp cksum if it was 0 */ if (udp_hdr->dgram_cksum != 0) { - udp_hdr->dgram_cksum = 0; - if (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM) + if (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM) { ol_flags |= PKT_TX_UDP_CKSUM; - else { + } else { + udp_hdr->dgram_cksum = 0; udp_hdr->dgram_cksum = get_udptcp_checksum(l3_hdr, udp_hdr, info->ethertype); @@ -514,12 +515,12 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, ol_flags |= PKT_TX_UDP_SEG; } else if (info->l4_proto == IPPROTO_TCP) { tcp_hdr = (struct rte_tcp_hdr *)((char *)l3_hdr + info->l3_len); - tcp_hdr->cksum = 0; if (tso_segsz) ol_flags |= PKT_TX_TCP_SEG; - else if (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM) + else if (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM) { ol_flags |= PKT_TX_TCP_CKSUM; - else { + } else if (tcp_hdr->cksum != 0) { + tcp_hdr->cksum = 0; tcp_hdr->cksum = get_udptcp_checksum(l3_hdr, tcp_hdr, info->ethertype); @@ -529,13 +530,13 @@ process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info, } else if (info->l4_proto == IPPROTO_SCTP) { sctp_hdr = (struct rte_sctp_hdr *) ((char *)l3_hdr + info->l3_len); - sctp_hdr->cksum = 0; /* sctp payload must be a multiple of 4 to be * offloaded */ if ((tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) && ((ipv4_hdr->total_length & 0x3) == 0)) { ol_flags |= PKT_TX_SCTP_CKSUM; - } else { + } else if (sctp_hdr->cksum != 0) { + sctp_hdr->cksum = 0; /* XXX implement CRC32c, example available in * RFC3309 */ } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-03 12:35:08.906339131 +0100 +++ 0017-app-testpmd-fix-Tx-checksum-calculation-for-tunnel.patch 2021-08-03 12:35:08.238819208 +0100 @@ -1 +1 @@ -From b2a9e4a855d0e5b4e3fdba5b126bcf00aa8f0ada Mon Sep 17 00:00:00 2001 +From c9c391ea6083a312e532f1f3139d36eb7b3de20e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b2a9e4a855d0e5b4e3fdba5b126bcf00aa8f0ada ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index 0161f72175..bd5ad64a57 100644 +index d813d4fae0..73a78f955c 100644