From nobody Sun Feb 8 17:47:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1610507057; cv=none; d=zohomail.com; s=zohoarc; b=OyuetgJlguRvuMSQRwXCohbS58HUe612K2C6KRsdXqp2HI2WA76M+nYxKr244HnPJJXZod+aOADFdcay7sgTqlkmQB9lKkjeP5IstT+SIxIumtaBI6PXw9MoPfzKNdM9YE9xU6aaVZdHxO3r1LPu7LgZ7AefsH24Fe2ttJwT+ok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610507057; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=CclZ5ZSYI+KNA0QRUUa3dlDDAELEn96ScEulfWtx4dA=; b=j3onbqI8btPv7ip1h0PVvSO3a1F/gXLH1D1o9Gb4wU1SlTa5uLAHWb72GZNeSpZIdZvhIoKC+r8p2IqKNBb3uN6A3lcjpkBpv8FqzATPvVU4PjU8IkiIl75XupwrKvTdR+/08XDjBHTzJ+96f6NO02R0BLIaR4W3MQiU2GOiG1E= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161050705731589.79067781758397; Tue, 12 Jan 2021 19:04:17 -0800 (PST) Received: from localhost ([::1]:38486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzWSG-00080K-90 for importer@patchew.org; Tue, 12 Jan 2021 22:04:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzWIG-0005zl-0i for qemu-devel@nongnu.org; Tue, 12 Jan 2021 21:53:56 -0500 Received: from mga09.intel.com ([134.134.136.24]:58713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzWIC-00043O-1J for qemu-devel@nongnu.org; Tue, 12 Jan 2021 21:53:55 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2021 18:53:49 -0800 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga001.fm.intel.com with ESMTP; 12 Jan 2021 18:53:47 -0800 IronPort-SDR: 9ZFJ5NvUNCp4iXFq7TyVUXR6S2HJpyr1cQS9Aj4a7uN9Z26uVsLqwxrP2DcrQ/r9gxDy+CpP9J h0B0icNM7FEw== X-IronPort-AV: E=McAfee;i="6000,8403,9862"; a="178289701" X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="178289701" IronPort-SDR: dXTGDVXT8h2/SrcPwlVhSX7x6mSGDS39xXxHyTWob/yxtFvXg+m2VIDYmFOOoyVn+kJST4hbPr yzxSXtey9scQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,343,1602572400"; d="scan'208";a="464750370" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, zhang.zhanghailiang@huawei.com, quintela@redhat.com, dgilbert@redhat.com 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 Message-Id: <1610505995-144129-11-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1610505995-144129-1-git-send-email-lei.rao@intel.com> References: <1610505995-144129-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.24; envelope-from=lei.rao@intel.com; helo=mga09.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" 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 Signed-off-by: Zhang Chen --- 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 =3D ntohl(tcphd->th_ack); *max_ack =3D *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack; pkt->header_size =3D pkt->transport_header - (uint8_t *)pkt->data - + (tcphd->th_off << 2) - pkt->vnet_hdr_len; + + (tcphd->th_off << 2); pkt->payload_size =3D pkt->size - pkt->header_size; pkt->seq_end =3D pkt->tcp_seq + pkt->payload_size; pkt->flags =3D tcphd->th_flags; --=20 1.8.3.1