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 68A5341EA5 for ; Wed, 15 Mar 2023 23:46:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 644BD4161A; Wed, 15 Mar 2023 23:46:53 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 31DD542686 for ; Wed, 15 Mar 2023 23:46:51 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id p23-20020a05600c1d9700b003ead4835046so2659063wms.0 for ; Wed, 15 Mar 2023 15:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920411; 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=VBjUe7dXtW5eCrOXleJfI3Jq9yZ0M7ikasLlp5UDz/Q=; b=OAt7wuqNjz7R+bzrsHt1MA2VW6xpiZzgBwXYrUhkaTiaUHwcpiU+OoCPb8IJuYVZ1Z OayURg3iocPIqpBBWcTRIYm/cPn49onzCscz6VHmf3fJwYuA+Zj/ZVLVayR2btFdrb+o QCea5sCptlx5defqkkJAdqyR30YgPVyOTc0sKPVQKYVdC4yFWgXhT31abqFUhfqKT9yx 1wQg9tbMLZm+zK7MBqMYavPX0W+8XrLfneS/ll/LaqLhl2zasLjMMY3kU/QHNNk6Plp+ Dx2ecuNyCtBw7V3UiJs8VvPFOvQilQbs11uqNANrUshlk8/5Pr2hePcpfdEkAEsGrHwu tFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920411; 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=VBjUe7dXtW5eCrOXleJfI3Jq9yZ0M7ikasLlp5UDz/Q=; b=afT0tp4oEPEs6hxemI5dMSbIRTv8oGWDY4Zd4ii0tqtOpUH1fQo9+IYAVb0OSHEz+x WxXelfoyp/TODPBhhGEWcsE9a9YSW0fkBUrY/GmxdwoiWkgfY66L4PzhL6UwMWuygI7e vAZZaSAqHloI4+N3sr1N5ZYmSQztB1LLGLOAoVbo2u95rnjsX03PjMM2Y/mnhVGRPZNQ 2joQDHEsf1FPKEOySifonM2/gobu8zzEZop16M857YWdkxaW6Q2hkBP87veW+chHglhS bPtfNshhVbhD2JX5m1wK8Q5Kb8dbdnqUQeFM8GvjyHjPnnjHELpJjuN/62uZAdrjWOi1 6iXA== X-Gm-Message-State: AO0yUKVFxtNBFItLpszGecjkFUTvEpsBP0Lnp/aadx9SbE6TSYxqF3pI BmPzm+pxNZ4tElVL06Y3lv+T2xm+TAS4Kw== X-Google-Smtp-Source: AK7set+zwYNbNQ64w9ZOMHJSiQa9Ao+74mTr/1gwn3nawkTgxFAYzNa2O43hZV9yxmiPod+fd1KW4w== X-Received: by 2002:a05:600c:4f07:b0:3ed:3cec:d2ec with SMTP id l7-20020a05600c4f0700b003ed3cecd2ecmr2166161wmq.15.1678920410869; Wed, 15 Mar 2023 15:46:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id j8-20020a05600c1c0800b003ebf73acf9asm8458119wms.3.2023.03.15.15.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:46:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Boleslav Stankevich Cc: Andrew Rybchenko , Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: deduce IP length for TSO checksum' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:45:59 +0000 Message-Id: <20230315224631.1025649-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/17/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/74a0293db637e616478d0a55de93e002c6d52641 Thanks. Luca Boccassi --- >From 74a0293db637e616478d0a55de93e002c6d52641 Mon Sep 17 00:00:00 2001 From: Boleslav Stankevich Date: Fri, 3 Mar 2023 14:19:29 +0300 Subject: [PATCH] net/virtio: deduce IP length for TSO checksum [ upstream commit d069c80a5d8c0a05033932421851cdb7159de0df ] The length of TSO payload could not fit into 16 bits provided by the IPv4 total length and IPv6 payload length fields. Thus, deduce it from the length of the packet. Fixes: 696573046e9e ("net/virtio: support TSO") Signed-off-by: Boleslav Stankevich Reviewed-by: Andrew Rybchenko Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index fe6f9942a9..469da168ec 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -421,29 +421,36 @@ virtio_tso_fix_cksum(struct rte_mbuf *m) if (likely(rte_pktmbuf_data_len(m) >= m->l2_len + m->l3_len + m->l4_len)) { struct rte_ipv4_hdr *iph; - struct rte_ipv6_hdr *ip6h; struct rte_tcp_hdr *th; - uint16_t prev_cksum, new_cksum, ip_len, ip_paylen; + uint16_t prev_cksum, new_cksum; + uint32_t ip_paylen; uint32_t tmp; iph = rte_pktmbuf_mtod_offset(m, struct rte_ipv4_hdr *, m->l2_len); th = RTE_PTR_ADD(iph, m->l3_len); + + /* + * Calculate IPv4 header checksum with current total length value + * (whatever it is) to have correct checksum after update on edits + * done by TSO. + */ if ((iph->version_ihl >> 4) == 4) { iph->hdr_checksum = 0; iph->hdr_checksum = rte_ipv4_cksum(iph); - ip_len = iph->total_length; - ip_paylen = rte_cpu_to_be_16(rte_be_to_cpu_16(ip_len) - - m->l3_len); - } else { - ip6h = (struct rte_ipv6_hdr *)iph; - ip_paylen = ip6h->payload_len; } + /* + * Do not use IPv4 total length and IPv6 payload length fields to get + * TSO payload length since it could not fit into 16 bits. + */ + ip_paylen = rte_cpu_to_be_32(rte_pktmbuf_pkt_len(m) - m->l2_len - + m->l3_len); + /* calculate the new phdr checksum not including ip_paylen */ prev_cksum = th->cksum; tmp = prev_cksum; - tmp += ip_paylen; + tmp += (ip_paylen & 0xffff) + (ip_paylen >> 16); tmp = (tmp & 0xffff) + (tmp >> 16); new_cksum = tmp; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:50.100977161 +0000 +++ 0008-net-virtio-deduce-IP-length-for-TSO-checksum.patch 2023-03-15 22:44:49.515848835 +0000 @@ -1 +1 @@ -From d069c80a5d8c0a05033932421851cdb7159de0df Mon Sep 17 00:00:00 2001 +From 74a0293db637e616478d0a55de93e002c6d52641 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d069c80a5d8c0a05033932421851cdb7159de0df ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17 +17,0 @@ - .mailmap | 1 + @@ -19 +19 @@ - 2 files changed, 17 insertions(+), 9 deletions(-) + 1 file changed, 16 insertions(+), 9 deletions(-) @@ -21,12 +20,0 @@ -diff --git a/.mailmap b/.mailmap -index a9f4f28fba..8e7d78f37e 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -167,6 +167,7 @@ Bin Huang - Bin Zheng - Björn Töpel - Bo Chen -+Boleslav Stankevich - Boon Ang - Boris Pismenny - Brandon Lo @@ -34 +22 @@ -index 2d0afd3302..e48ff3cca7 100644 +index fe6f9942a9..469da168ec 100644 @@ -37 +25 @@ -@@ -404,29 +404,36 @@ virtio_tso_fix_cksum(struct rte_mbuf *m) +@@ -421,29 +421,36 @@ virtio_tso_fix_cksum(struct rte_mbuf *m)