From: leirao <lei.rao@intel.com>
To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com,
jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com,
pbonzini@redhat.com, lukasstraub2@web.de
Cc: "Rao, Lei" <lei.rao@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH v2 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info()
Date: Fri, 12 Mar 2021 13:03:03 +0800 [thread overview]
Message-ID: <1615525383-59071-11-git-send-email-lei.rao@intel.com> (raw)
In-Reply-To: <1615525383-59071-1-git-send-email-lei.rao@intel.com>
From: "Rao, Lei" <lei.rao@intel.com>
The data pointer has skipped vnet_hdr_len in the function of
parse_packet_early().So, we can not subtract vnet_hdr_len again
when calculating pkt->header_size in fill_pkt_tcp_info(). Otherwise,
it will cause network packet comparsion errors and greatly increase
the frequency of checkpoints.
Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 06f2c28..af30490 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -211,7 +211,7 @@ static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
pkt->tcp_ack = ntohl(tcphd->th_ack);
*max_ack = *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack;
pkt->header_size = pkt->transport_header - (uint8_t *)pkt->data
- + (tcphd->th_off << 2) - pkt->vnet_hdr_len;
+ + (tcphd->th_off << 2);
pkt->payload_size = pkt->size - pkt->header_size;
pkt->seq_end = pkt->tcp_seq + pkt->payload_size;
pkt->flags = tcphd->th_flags;
--
1.8.3.1
next prev parent reply other threads:[~2021-03-12 5:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 5:02 [PATCH v2 00/10] Fixed some bugs and optimized some codes for COLO leirao
2021-03-12 5:02 ` [PATCH v2 01/10] Remove some duplicate trace code leirao
2021-03-12 6:32 ` lizhijian
2021-03-12 5:02 ` [PATCH v2 02/10] Fix the qemu crash when guest shutdown during checkpoint leirao
2021-03-12 6:25 ` lizhijian
2021-03-12 5:02 ` [PATCH v2 03/10] Optimize the function of filter_send leirao
2021-03-12 6:36 ` lizhijian
2021-03-12 5:02 ` [PATCH v2 04/10] Remove migrate_set_block_enabled in checkpoint leirao
2021-03-12 10:11 ` lizhijian
2021-03-12 5:02 ` [PATCH v2 05/10] Optimize the function of packet_new leirao
2021-03-12 6:53 ` lizhijian
2021-03-12 9:56 ` Rao, Lei
2021-03-12 10:23 ` lizhijian
2021-03-12 11:50 ` Rao, Lei
2021-03-12 5:02 ` [PATCH v2 06/10] Add the function of colo_compare_cleanup leirao
2021-03-12 5:03 ` [PATCH v2 07/10] Reset the auto-converge counter at every checkpoint leirao
2021-03-12 5:03 ` [PATCH v2 08/10] Reduce the PVM stop time during Checkpoint leirao
2021-03-12 7:54 ` lizhijian
2021-03-12 10:12 ` Rao, Lei
2021-03-12 5:03 ` [PATCH v2 09/10] Add the function of colo_bitmap_clear_diry leirao
2021-03-12 10:28 ` lizhijian
2021-03-12 5:03 ` leirao [this message]
2021-03-12 8:00 ` [PATCH v2 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() lizhijian
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=1615525383-59071-11-git-send-email-lei.rao@intel.com \
--to=lei.rao@intel.com \
--cc=chen.zhang@intel.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=lukasstraub2@web.de \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/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).