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 A2445A0C4C for ; Mon, 12 Jul 2021 15:13:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C60F4069E; Mon, 12 Jul 2021 15:13:40 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id D378F406B4 for ; Mon, 12 Jul 2021 15:13:39 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id l7so24638186wrv.7 for ; Mon, 12 Jul 2021 06:13:39 -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=oV/zQ9XAkLI6XK2vF4z7b38JL/ZpDrFfoEvcW1u3pkk=; b=X8abu8GNvlDLkdIP4U+McCuLyN2yKZjG5wVZ1g88aPuLVdmjV3oIi2cZA/cxYFgqIO ZZEi48k4wNlWBKNmUFC/5xAaQfridpMttSJqh6JEpOjGabCo72lDgedSHuFjBs77PCcA koIODPNS09BizgNPZiQtgpm+WNyiXS3BBf8E8pC3CFlmCOkwHt79yTjcjZc8wJipDKiL TtBz7EeqFaJrKnLOhzflplI6N0R4FiV0jULeHoPank0W8dzZMG7Fwue9miQjt5XSrEEA 3sIi4cXvNCVenrEUwLaZfAOlhVQNHaNtx/0vh2IZb2GogWSoMP/s6ASjUJwpcMDlWQUw R6zg== 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=oV/zQ9XAkLI6XK2vF4z7b38JL/ZpDrFfoEvcW1u3pkk=; b=otEl/0ery9AE8+4beLl5KUf/mGeoMScg2K0GVW2LxiVYxKC5vHauomk8tBujjz2ydc b02KiP0MJqgcsCpd1gsVB7v2hBXmRESdCDgt9E+gVL+XGvtCcCAExGjtdXkrPSenKkWD Jo6NngmdVdMVR6zPvFWPOLtV1Co/5apj7rdaRLokxx4GpmQhfmNf78OF2ZY6p/ATlbHV wshsduCq3Y3C0aWNpy9MbI/xqJDng9/4GrblRVlDXgU3yzfOmXXmaDNHDKkRbCkUQE3Q So+75IQh3MK0iXYaFCa9YKinzr5oq7cBZ+S0bFTiCQNVQn2kchWe5VmEJKJZylD2wWEA +33w== X-Gm-Message-State: AOAM533eisMc0DobGVBmDyH5PIwCCA7gl4qNALRGbbrEw+fOLD2qpdFs yaFRf8FFbuNligj47cDWsOk= X-Google-Smtp-Source: ABdhPJwn4evRRLiS82eZPpBikWmoaOy59HcGyXyGryCfzirD+8OxlqG1ahJFVBesfqwiG5crzkHFyw== X-Received: by 2002:a5d:4bc4:: with SMTP id l4mr57913701wrt.67.1626095619683; Mon, 12 Jul 2021 06:13:39 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id w15sm2150845wmi.3.2021.07.12.06.13.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:13:39 -0700 (PDT) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Andrew Rybchenko , dpdk stable Date: Mon, 12 Jul 2021 14:05:02 +0100 Message-Id: <20210712130551.2462159-67-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix Rx checksum flags on IP options packets' 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 07/14/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/d355f3ba883cd36486f3a5cf2b7cdcb62b43b30a Thanks. Luca Boccassi --- >From d355f3ba883cd36486f3a5cf2b7cdcb62b43b30a Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 30 Jun 2021 15:51:55 +0200 Subject: [PATCH] net/tap: fix Rx checksum flags on IP options packets [ upstream commit a46bd97f60e6be8ac5d8d3a0657a60e66176a405 ] When packet type is IPV4_EXT, the checksum is always marked as good in the mbuf offload flags. Since we know the header lengths, we can easily call rte_ipv4_udptcp_cksum() in this case too. Fixes: 8ae3023387e9 ("net/tap: add Rx/Tx checksum offload support") Signed-off-by: Olivier Matz Reviewed-by: Andrew Rybchenko --- drivers/net/tap/rte_eth_tap.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index c0a348a641..cf42809461 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -342,7 +342,11 @@ tap_verify_csum(struct rte_mbuf *mbuf) rte_pktmbuf_data_len(mbuf)) return; } else { - /* IPv6 extensions are not supported */ + /* - RTE_PTYPE_L3_IPV4_EXT_UNKNOWN cannot happen because + * mbuf->packet_type is filled by rte_net_get_ptype() which + * never returns this value. + * - IPv6 extensions are not supported. + */ return; } if (l4 == RTE_PTYPE_L4_UDP || l4 == RTE_PTYPE_L4_TCP) { @@ -350,7 +354,7 @@ tap_verify_csum(struct rte_mbuf *mbuf) /* Don't verify checksum for multi-segment packets. */ if (mbuf->nb_segs > 1) return; - if (l3 == RTE_PTYPE_L3_IPV4) { + if (l3 == RTE_PTYPE_L3_IPV4 || l3 == RTE_PTYPE_L3_IPV4_EXT) { if (l4 == RTE_PTYPE_L4_UDP) { udp_hdr = (struct rte_udp_hdr *)l4_hdr; if (udp_hdr->dgram_cksum == 0) { @@ -364,7 +368,7 @@ tap_verify_csum(struct rte_mbuf *mbuf) } } cksum = ~rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr); - } else if (l3 == RTE_PTYPE_L3_IPV6) { + } else { /* l3 == RTE_PTYPE_L3_IPV6, checked above */ cksum = ~rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr); } mbuf->ol_flags |= cksum ? -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:40.152637882 +0100 +++ 0067-net-tap-fix-Rx-checksum-flags-on-IP-options-packets.patch 2021-07-12 13:41:36.562124111 +0100 @@ -1 +1 @@ -From a46bd97f60e6be8ac5d8d3a0657a60e66176a405 Mon Sep 17 00:00:00 2001 +From d355f3ba883cd36486f3a5cf2b7cdcb62b43b30a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a46bd97f60e6be8ac5d8d3a0657a60e66176a405 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 5735988e7c..5513cfd2d7 100644 +index c0a348a641..cf42809461 100644