From nobody Sun May 5 17:41:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1569338057; cv=none; d=zoho.com; s=zohoarc; b=PGQVUPFVAKFNAgvSuiXpyZ2qDxxbeW4/5k6ZiKYIfnbHtqOORbuizvD9xuVgS5gbPCkRvCuwwi7fuWla5n76hdj/OJdYBfdvLKC+Fjj68owSDILchF75yQoIxiSUakxUZUc1r7dCj9zTDtTrQgqq1ixjWWmRQS9992KQurjra6c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569338057; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=hUK+nuWpdb5uMEkWBcMyomJLgvYxMLgY9rSkTDTcUvU=; b=BeXRcLtj8jlm0G7706bBLHLp1rHfaQuLWk3IlVHVcDnSRgd1tp6zZAqipglV/TbOuHs+teR1T1TdY2iDKwWW2aVQp+2v4yk3UavCi+6oHbSziCXhJ7z0OLt5lublgEt1v/EVC7jyo+Ziy7wOPeTpu8doXgkfbDXy1eTnk94E+eA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569338057241727.9573619800854; Tue, 24 Sep 2019 08:14:17 -0700 (PDT) Received: from localhost ([::1]:46860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCmW7-0007ta-Bb for importer@patchew.org; Tue, 24 Sep 2019 11:14:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37349) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iClV2-00049c-Ke for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iClV0-0005W7-NE for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:09:04 -0400 Received: from smtp180.sjtu.edu.cn ([202.120.2.180]:57504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iClV0-0005Df-7Y for qemu-devel@nongnu.org; Tue, 24 Sep 2019 10:09:02 -0400 Received: from proxy01.sjtu.edu.cn (unknown [202.112.26.54]) by smtp180.sjtu.edu.cn (Postfix) with ESMTPS id 8B48B1008CA20 for ; Tue, 24 Sep 2019 22:08:29 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by proxy01.sjtu.edu.cn (Postfix) with ESMTP id 8401B2052028B for ; Tue, 24 Sep 2019 22:08:29 +0800 (CST) Received: from proxy01.sjtu.edu.cn ([127.0.0.1]) by localhost (proxy01.sjtu.edu.cn [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 69UsR19zBrOp for ; Tue, 24 Sep 2019 22:08:29 +0800 (CST) Received: from Fans-Air.ipads-lab.se.sjtu.edu.cn (unknown [202.120.40.82]) (Authenticated sender: Fan_Yang) by proxy01.sjtu.edu.cn (Postfix) with ESMTPSA id 5BE2E20520278 for ; Tue, 24 Sep 2019 22:08:29 +0800 (CST) X-Virus-Scanned: amavisd-new at proxy01.sjtu.edu.cn From: Fan Yang To: qemu-devel@nongnu.org Subject: [PATCH] COLO-compare: Fix incorrect `if` logic Date: Tue, 24 Sep 2019 22:08:29 +0800 Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 202.120.2.180 X-Mailman-Approved-At: Tue, 24 Sep 2019 11:06:27 -0400 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 'colo_mark_tcp_pkt' should return 'true' when packets are the same, and 'false' otherwise. However, it returns 'true' when 'colo_compare_packet_payload' returns non-zero while 'colo_compare_packet_payload' is just a 'memcmp'. The result is that COLO-compare reports inconsistent TCP packets when they are actually the same. Signed-off-by: Fan Yang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/colo-compare.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 7489840bde..7ee17f2cf8 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -319,7 +319,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spk= t, *mark =3D 0; =20 if (ppkt->tcp_seq =3D=3D spkt->tcp_seq && ppkt->seq_end =3D=3D spkt->s= eq_end) { - if (colo_compare_packet_payload(ppkt, spkt, + if (!colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_si= ze, ppkt->payload_size)) { *mark =3D COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIM= ARY; @@ -329,7 +329,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spk= t, =20 /* one part of secondary packet payload still need to be compared */ if (!after(ppkt->seq_end, spkt->seq_end)) { - if (colo_compare_packet_payload(ppkt, spkt, + if (!colo_compare_packet_payload(ppkt, spkt, ppkt->header_size + ppkt->offset, spkt->header_size + spkt->offset, ppkt->payload_size - ppkt->offset)= ) { @@ -348,7 +348,7 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spk= t, /* primary packet is longer than secondary packet, compare * the same part and mark the primary packet offset */ - if (colo_compare_packet_payload(ppkt, spkt, + if (!colo_compare_packet_payload(ppkt, spkt, ppkt->header_size + ppkt->offset, spkt->header_size + spkt->offset, spkt->payload_size - spkt->offset)= ) { --=20 2.17.1