qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: leirao <lei.rao@intel.com>
To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com,
	jasowang@redhat.com, zhang.zhanghailiang@huawei.com,
	quintela@redhat.com, dgilbert@redhat.com
Cc: "Rao, Lei" <lei.rao@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info()
Date: Wed, 13 Jan 2021 10:46:35 +0800	[thread overview]
Message-ID: <1610505995-144129-11-git-send-email-lei.rao@intel.com> (raw)
In-Reply-To: <1610505995-144129-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



  parent reply	other threads:[~2021-01-13  3:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-13  2:46 [PATCH 00/10] Fixed some bugs and optimized some codes for COLO leirao
2021-01-13  2:46 ` [PATCH 01/10] Remove some duplicate trace code leirao
2021-01-20 18:43   ` Lukas Straub
2021-01-13  2:46 ` [PATCH 02/10] Fix the qemu crash when guest shutdown during checkpoint leirao
2021-01-20 19:12   ` Lukas Straub
2021-01-21  1:48     ` Rao, Lei
2021-01-27 18:24       ` Lukas Straub
2021-01-29  2:57         ` Rao, Lei
2021-02-14 11:45           ` Lukas Straub
2021-02-25  9:40             ` Rao, Lei
2021-01-13  2:46 ` [PATCH 03/10] Optimize the function of filter_send leirao
2021-01-20 19:21   ` Lukas Straub
2021-01-21  1:02     ` Rao, Lei
2021-01-13  2:46 ` [PATCH 04/10] Remove migrate_set_block_enabled in checkpoint leirao
2021-01-20 19:28   ` Lukas Straub
2021-01-13  2:46 ` [PATCH 05/10] Optimize the function of packet_new leirao
2021-01-20 19:45   ` Lukas Straub
2021-01-13  2:46 ` [PATCH 06/10] Add the function of colo_compare_cleanup leirao
2021-01-13  2:46 ` [PATCH 07/10] Disable auto-coverge before entering COLO mode leirao
2021-01-13 11:31   ` Dr. David Alan Gilbert
2021-01-14  3:21     ` Rao, Lei
2021-02-14 10:52   ` Lukas Straub
2021-02-25  9:22     ` Rao, Lei
2021-01-13  2:46 ` [PATCH 08/10] Reduce the PVM stop time during Checkpoint leirao
2021-01-13  2:46 ` [PATCH 09/10] Add the function of colo_bitmap_clear_diry leirao
2021-01-13  2:46 ` leirao [this message]
2021-02-14 11:50 ` [PATCH 00/10] Fixed some bugs and optimized some codes for COLO Lukas Straub

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=1610505995-144129-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=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=zhang.zhanghailiang@huawei.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).