[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] Fixed calculation error of pkt->header_size in fill_pkt_tcp_
From: |
Zhang Chen |
Subject: |
[PATCH 7/7] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() |
Date: |
Tue, 8 Jun 2021 16:23:31 +0800 |
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>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Tested-by: Lukas Straub <lukasstraub2@web.de>
---
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 5b538f4e0b..b100e7b51f 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;
--
2.25.1
- [PATCH 0/7] COLO proxy patch, Zhang Chen, 2021/06/08
- [PATCH 4/7] Remove migrate_set_block_enabled in checkpoint, Zhang Chen, 2021/06/08
- [PATCH 3/7] Optimize the function of filter_send, Zhang Chen, 2021/06/08
- [PATCH 1/7] Remove some duplicate trace code., Zhang Chen, 2021/06/08
- [PATCH 2/7] Fix the qemu crash when guest shutdown during checkpoint, Zhang Chen, 2021/06/08
- [PATCH 5/7] Add a function named packet_new_nocopy for COLO., Zhang Chen, 2021/06/08
- [PATCH 6/7] Add the function of colo_compare_cleanup, Zhang Chen, 2021/06/08
- [PATCH 7/7] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info(),
Zhang Chen <=