From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>, Andrew <andrew@daynix.com>,
qemu-devel@nongnu.org
Subject: [PULL 2/7] hw/net: Added CSO for IPv6
Date: Wed, 15 Jul 2020 21:53:16 +0800 [thread overview]
Message-ID: <1594821201-3708-3-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1594821201-3708-1-git-send-email-jasowang@redhat.com>
From: Andrew <andrew@daynix.com>
Added fix for checksum offload for IPv6 if a backend doesn't
have a virtual header.
This patch is a part of IPv6 fragmentation.
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/net_tx_pkt.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index 162f802..331c73c 100644
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@@ -468,8 +468,8 @@ static void net_tx_pkt_do_sw_csum(struct NetTxPkt *pkt)
/* num of iovec without vhdr */
uint32_t iov_len = pkt->payload_frags + NET_TX_PKT_PL_START_FRAG - 1;
uint16_t csl;
- struct ip_header *iphdr;
size_t csum_offset = pkt->virt_hdr.csum_start + pkt->virt_hdr.csum_offset;
+ uint16_t l3_proto = eth_get_l3_proto(iov, 1, iov->iov_len);
/* Put zero to checksum field */
iov_from_buf(iov, iov_len, csum_offset, &csum, sizeof csum);
@@ -477,9 +477,18 @@ static void net_tx_pkt_do_sw_csum(struct NetTxPkt *pkt)
/* Calculate L4 TCP/UDP checksum */
csl = pkt->payload_len;
+ csum_cntr = 0;
+ cso = 0;
/* add pseudo header to csum */
- iphdr = pkt->vec[NET_TX_PKT_L3HDR_FRAG].iov_base;
- csum_cntr = eth_calc_ip4_pseudo_hdr_csum(iphdr, csl, &cso);
+ if (l3_proto == ETH_P_IP) {
+ csum_cntr = eth_calc_ip4_pseudo_hdr_csum(
+ pkt->vec[NET_TX_PKT_L3HDR_FRAG].iov_base,
+ csl, &cso);
+ } else if (l3_proto == ETH_P_IPV6) {
+ csum_cntr = eth_calc_ip6_pseudo_hdr_csum(
+ pkt->vec[NET_TX_PKT_L3HDR_FRAG].iov_base,
+ csl, pkt->l4proto, &cso);
+ }
/* data checksum */
csum_cntr +=
--
2.5.0
next prev parent reply other threads:[~2020-07-15 13:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 13:53 [PULL 0/7] Net patches Jason Wang
2020-07-15 13:53 ` [PULL 1/7] virtio-net: fix removal of failover device Jason Wang
2020-07-15 13:53 ` Jason Wang [this message]
2020-07-15 13:53 ` [PULL 3/7] net/colo-compare.c: Expose compare "max_queue_size" to users Jason Wang
2020-07-15 13:53 ` [PULL 4/7] qemu-options.hx: Clean up and fix typo for colo-compare Jason Wang
2020-07-15 13:53 ` [PULL 5/7] net: check if the file descriptor is valid before using it Jason Wang
2020-07-15 13:53 ` [PULL 6/7] net: detect errors from probing vnet hdr flag for TAP devices Jason Wang
2020-07-15 13:53 ` [PULL 7/7] ftgmac100: fix dblac write test Jason Wang
2020-07-15 18:06 ` [PULL 0/7] Net patches Peter Maydell
2020-07-16 3:00 ` Jason Wang
2020-07-16 13:46 ` Peter Maydell
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=1594821201-3708-3-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=andrew@daynix.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.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).