From: longli@linuxonhyperv.com
To: stable@dpdk.org
Cc: christian.ehrhardt@canonical.com, Long Li <longli@microsoft.com>
Subject: [PATCH 19.11] net/netvsc: fix calculation of checksums based on mbuf flag
Date: Thu, 14 Jul 2022 14:16:07 -0700 [thread overview]
Message-ID: <1657833368-8212-1-git-send-email-longli@linuxonhyperv.com> (raw)
From: Long Li <longli@microsoft.com>
[ upstream commit 559a1f2eeaaddccc83e1668a8ee375c34699e48b ]
The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the masked value
to decide the correct way to calculate checksums.
Not checking for RTE_MBUF_F_TX_L4_MASK results in incorrect RNDIS
packets sent to VSP and incorrect checksums calculated by the VSP.
Fixes: 4e9c73e96e ("net/netvsc: add Hyper-V network device")
Cc: stable@dpdk.org
Signed-off-by: Long Li <longli@microsoft.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
---
drivers/net/netvsc/hn_rxtx.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index af702dafe6..ece242f84b 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1262,8 +1262,11 @@ static void hn_encap(struct rndis_packet_msg *pkt,
*pi_data = NDIS_LSO2_INFO_MAKEIPV4(hlen,
m->tso_segsz);
}
- } else if (m->ol_flags &
- (PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM)) {
+ } else if ((m->ol_flags & PKT_TX_L4_MASK) ==
+ PKT_TX_TCP_CKSUM ||
+ (m->ol_flags & PKT_TX_L4_MASK) ==
+ PKT_TX_UDP_CKSUM ||
+ (m->ol_flags & PKT_TX_IP_CKSUM)) {
pi_data = hn_rndis_pktinfo_append(pkt, NDIS_TXCSUM_INFO_SIZE,
NDIS_PKTINFO_TYPE_CSUM);
*pi_data = 0;
@@ -1277,9 +1280,11 @@ static void hn_encap(struct rndis_packet_msg *pkt,
*pi_data |= NDIS_TXCSUM_INFO_IPCS;
}
- if (m->ol_flags & PKT_TX_TCP_CKSUM)
+ if ((m->ol_flags & PKT_TX_L4_MASK) ==
+ PKT_TX_TCP_CKSUM)
*pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(hlen);
- else if (m->ol_flags & PKT_TX_UDP_CKSUM)
+ else if ((m->ol_flags & PKT_TX_L4_MASK) ==
+ PKT_TX_UDP_CKSUM)
*pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(hlen);
}
--
2.17.1
next reply other threads:[~2022-07-14 21:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 21:16 longli [this message]
2022-07-14 21:16 ` [PATCH 19.11] net/netvsc: fix vmbus device reference in multi-process longli
2022-07-15 5:04 ` Christian Ehrhardt
2022-07-15 5:04 ` [PATCH 19.11] net/netvsc: fix calculation of checksums based on mbuf flag Christian Ehrhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1657833368-8212-1-git-send-email-longli@linuxonhyperv.com \
--to=longli@linuxonhyperv.com \
--cc=christian.ehrhardt@canonical.com \
--cc=longli@microsoft.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).