[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] Fixed calculation error of pkt->header_size in fill_pkt_tcp
From: |
Jason Wang |
Subject: |
[PULL 12/12] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() |
Date: |
Fri, 11 Jun 2021 14:00:24 +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>
Signed-off-by: Jason Wang <jasowang@redhat.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 5b538f4..b100e7b 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.7.4
- [PULL 01/12] vhost-vdpa: skip ram device from the IOTLB mapping, (continued)
- [PULL 01/12] vhost-vdpa: skip ram device from the IOTLB mapping, Jason Wang, 2021/06/11
- [PULL 03/12] vhost-vdpa: don't initialize backend_features, Jason Wang, 2021/06/11
- [PULL 02/12] vhost-vdpa: map virtqueue notification area if possible, Jason Wang, 2021/06/11
- [PULL 04/12] vhost-vdpa: remove the unused vhost_vdpa_get_acked_features(), Jason Wang, 2021/06/11
- [PULL 05/12] netdev: add more commands to preconfig mode, Jason Wang, 2021/06/11
- [PULL 07/12] Fix the qemu crash when guest shutdown during checkpoint, Jason Wang, 2021/06/11
- [PULL 08/12] Optimize the function of filter_send, Jason Wang, 2021/06/11
- [PULL 09/12] Remove migrate_set_block_enabled in checkpoint, Jason Wang, 2021/06/11
- [PULL 06/12] Remove some duplicate trace code., Jason Wang, 2021/06/11
- [PULL 10/12] Add a function named packet_new_nocopy for COLO., Jason Wang, 2021/06/11
- [PULL 12/12] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info(),
Jason Wang <=
- [PULL 11/12] Add the function of colo_compare_cleanup, Jason Wang, 2021/06/11
- Re: [PULL 00/12] Net patches, Peter Maydell, 2021/06/11
- Re: [PULL 00/12] Net patches, no-reply, 2021/06/14