From nobody Tue May 7 18:01:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487993922896900.4273656326833; Fri, 24 Feb 2017 19:38:42 -0800 (PST) Received: from localhost ([::1]:41143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chTBx-00006o-Hj for importer@patchew.org; Fri, 24 Feb 2017 22:38:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7D-0003a4-VX for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chT7C-0006on-Hf for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:48 -0500 Received: from [59.151.112.132] (port=5268 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7B-0006mR-1I for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:46 -0500 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Feb 2017 11:33:34 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 262D7477AE90; Sat, 25 Feb 2017 11:33:35 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 25 Feb 2017 11:33:34 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="15947360" From: Zhang Chen To: qemu devel Date: Sat, 25 Feb 2017 11:32:07 +0800 Message-ID: <1487993530-30875-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 262D7477AE90.AC32C X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 1/3] COLO-compare: Add minimum packet size check and some fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , bian naimeng , "eddie . dong" , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add packet minimum size check in colo_packet_compare_udp() and colo_packet_compare_udp() like colo_packet_compare_icmp(), rename function colo_packet_compare() to colo_packet_compare_common() that we will reuse it later. Signed-off-by: Zhang Chen --- net/colo-compare.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 300f017..e75f0ae 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -180,7 +180,7 @@ static int packet_enqueue(CompareState *s, int mode) * return: 0 means packet same * > 0 || < 0 means packet different */ -static int colo_packet_compare(Packet *ppkt, Packet *spkt) +static int colo_packet_compare_common(Packet *ppkt, Packet *spkt) { trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), inet_ntoa(ppkt->ip->ip_dst), spkt->size, @@ -190,6 +190,7 @@ static int colo_packet_compare(Packet *ppkt, Packet *sp= kt) if (ppkt->size =3D=3D spkt->size) { return memcmp(ppkt->data, spkt->data, spkt->size); } else { + trace_colo_compare_main("Net packet size are not the same"); return -1; } } @@ -202,9 +203,10 @@ static int colo_packet_compare(Packet *ppkt, Packet *s= pkt) static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) { struct tcphdr *ptcp, *stcp; - int res; + int res, network_length; =20 trace_colo_compare_main("compare tcp"); + if (ppkt->size !=3D spkt->size) { if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { trace_colo_compare_main("pkt size not same"); @@ -212,6 +214,12 @@ static int colo_packet_compare_tcp(Packet *spkt, Packe= t *ppkt) return -1; } =20 + network_length =3D ppkt->ip->ip_hl * 4; + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("tcp packet size error"); + return -1; + } + ptcp =3D (struct tcphdr *)ppkt->transport_header; stcp =3D (struct tcphdr *)spkt->transport_header; =20 @@ -260,10 +268,16 @@ static int colo_packet_compare_tcp(Packet *spkt, Pack= et *ppkt) */ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) { - int ret; + int ret, network_length; =20 trace_colo_compare_main("compare udp"); - ret =3D colo_packet_compare(ppkt, spkt); + network_length =3D ppkt->ip->ip_hl * 4; + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("udp packet size error"); + return -1; + } + + ret =3D colo_packet_compare_common(ppkt, spkt); =20 if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); @@ -285,12 +299,12 @@ static int colo_packet_compare_icmp(Packet *spkt, Pac= ket *ppkt) =20 trace_colo_compare_main("compare icmp"); network_length =3D ppkt->ip->ip_hl * 4; - if (ppkt->size !=3D spkt->size || - ppkt->size < network_length + ETH_HLEN) { + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("icmp packet size error"); return -1; } =20 - if (colo_packet_compare(ppkt, spkt)) { + if (colo_packet_compare_common(ppkt, spkt)) { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", @@ -316,7 +330,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) inet_ntoa(ppkt->ip->ip_dst), spkt->size, inet_ntoa(spkt->ip->ip_src), inet_ntoa(spkt->ip->ip_dst)); - return colo_packet_compare(ppkt, spkt); + return colo_packet_compare_common(ppkt, spkt); } =20 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) --=20 2.7.4 From nobody Tue May 7 18:01:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487993923470919.2926432262909; Fri, 24 Feb 2017 19:38:43 -0800 (PST) Received: from localhost ([::1]:41144 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chTBy-00007C-69 for importer@patchew.org; Fri, 24 Feb 2017 22:38:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43229) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7C-0003Zi-FH for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chT7A-0006n7-GT for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:46 -0500 Received: from [59.151.112.132] (port=47327 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7A-0006iV-3w for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:44 -0500 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Feb 2017 11:33:34 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id CD22B47C4E82; Sat, 25 Feb 2017 11:33:35 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 25 Feb 2017 11:33:35 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="15947358" From: Zhang Chen To: qemu devel Date: Sat, 25 Feb 2017 11:32:08 +0800 Message-ID: <1487993530-30875-3-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: CD22B47C4E82.AEC6D X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 1/3] COLO-compare: Add packet size check and some fix X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , bian naimeng , "eddie . dong" , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add packet size check in colo_packet_compare_udp() and colo_packet_compare_udp(), rename function colo_packet_compare() to colo_packet_compare_common() that we will reuse it later. Signed-off-by: Zhang Chen --- net/colo-compare.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 300f017..e75f0ae 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -180,7 +180,7 @@ static int packet_enqueue(CompareState *s, int mode) * return: 0 means packet same * > 0 || < 0 means packet different */ -static int colo_packet_compare(Packet *ppkt, Packet *spkt) +static int colo_packet_compare_common(Packet *ppkt, Packet *spkt) { trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), inet_ntoa(ppkt->ip->ip_dst), spkt->size, @@ -190,6 +190,7 @@ static int colo_packet_compare(Packet *ppkt, Packet *sp= kt) if (ppkt->size =3D=3D spkt->size) { return memcmp(ppkt->data, spkt->data, spkt->size); } else { + trace_colo_compare_main("Net packet size are not the same"); return -1; } } @@ -202,9 +203,10 @@ static int colo_packet_compare(Packet *ppkt, Packet *s= pkt) static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) { struct tcphdr *ptcp, *stcp; - int res; + int res, network_length; =20 trace_colo_compare_main("compare tcp"); + if (ppkt->size !=3D spkt->size) { if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { trace_colo_compare_main("pkt size not same"); @@ -212,6 +214,12 @@ static int colo_packet_compare_tcp(Packet *spkt, Packe= t *ppkt) return -1; } =20 + network_length =3D ppkt->ip->ip_hl * 4; + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("tcp packet size error"); + return -1; + } + ptcp =3D (struct tcphdr *)ppkt->transport_header; stcp =3D (struct tcphdr *)spkt->transport_header; =20 @@ -260,10 +268,16 @@ static int colo_packet_compare_tcp(Packet *spkt, Pack= et *ppkt) */ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) { - int ret; + int ret, network_length; =20 trace_colo_compare_main("compare udp"); - ret =3D colo_packet_compare(ppkt, spkt); + network_length =3D ppkt->ip->ip_hl * 4; + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("udp packet size error"); + return -1; + } + + ret =3D colo_packet_compare_common(ppkt, spkt); =20 if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); @@ -285,12 +299,12 @@ static int colo_packet_compare_icmp(Packet *spkt, Pac= ket *ppkt) =20 trace_colo_compare_main("compare icmp"); network_length =3D ppkt->ip->ip_hl * 4; - if (ppkt->size !=3D spkt->size || - ppkt->size < network_length + ETH_HLEN) { + if (ppkt->size < network_length + ETH_HLEN) { + trace_colo_compare_main("icmp packet size error"); return -1; } =20 - if (colo_packet_compare(ppkt, spkt)) { + if (colo_packet_compare_common(ppkt, spkt)) { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", @@ -316,7 +330,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) inet_ntoa(ppkt->ip->ip_dst), spkt->size, inet_ntoa(spkt->ip->ip_src), inet_ntoa(spkt->ip->ip_dst)); - return colo_packet_compare(ppkt, spkt); + return colo_packet_compare_common(ppkt, spkt); } =20 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) --=20 2.7.4 From nobody Tue May 7 18:01:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487993733458101.70756822758892; Fri, 24 Feb 2017 19:35:33 -0800 (PST) Received: from localhost ([::1]:41124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT8u-0004S9-89 for importer@patchew.org; Fri, 24 Feb 2017 22:35:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7C-0003Zh-Ed for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chT7A-0006nK-Jf for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:46 -0500 Received: from [59.151.112.132] (port=58669 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT79-0006if-0u for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:44 -0500 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Feb 2017 11:33:34 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 80AA947C4E9B; Sat, 25 Feb 2017 11:33:36 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 25 Feb 2017 11:33:36 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="15947359" From: Zhang Chen To: qemu devel Date: Sat, 25 Feb 2017 11:32:09 +0800 Message-ID: <1487993530-30875-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 80AA947C4E9B.A0886 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 2/3] COLO-compare: Optimize colo_packet_compare_common X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , bian naimeng , "eddie . dong" , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add offset args for colo_packet_compare_common, optimize colo_packet_compare_icmp() and colo_packet_compare_udp() just compare the IP payload. Signed-off-by: Zhang Chen --- net/colo-compare.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index e75f0ae..9853232 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -180,7 +180,7 @@ static int packet_enqueue(CompareState *s, int mode) * return: 0 means packet same * > 0 || < 0 means packet different */ -static int colo_packet_compare_common(Packet *ppkt, Packet *spkt) +static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offs= et) { trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), inet_ntoa(ppkt->ip->ip_dst), spkt->size, @@ -188,7 +188,8 @@ static int colo_packet_compare_common(Packet *ppkt, Pac= ket *spkt) inet_ntoa(spkt->ip->ip_dst)); =20 if (ppkt->size =3D=3D spkt->size) { - return memcmp(ppkt->data, spkt->data, spkt->size); + return memcmp(ppkt->data + offset, spkt->data + offset, + spkt->size - offset); } else { trace_colo_compare_main("Net packet size are not the same"); return -1; @@ -237,8 +238,7 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet= *ppkt) spkt->ip->ip_sum =3D ppkt->ip->ip_sum; } =20 - res =3D memcmp(ppkt->data + ETH_HLEN, spkt->data + ETH_HLEN, - (spkt->size - ETH_HLEN)); + res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN); =20 if (res !=3D 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)= ) { trace_colo_compare_pkt_info_src(inet_ntoa(ppkt->ip->ip_src), @@ -277,7 +277,14 @@ static int colo_packet_compare_udp(Packet *spkt, Packe= t *ppkt) return -1; } =20 - ret =3D colo_packet_compare_common(ppkt, spkt); + /* + * Because of ppkt and spkt are both in the same connection, + * The ppkt's src ip, dst ip, src port, dst port, ip_proto all are + * same with spkt. In addition, IP header's Identification is a random + * field, we can handle it in IP fragmentation function later. + * So we just compare the ip payload here. + */ + ret =3D colo_packet_compare_common(ppkt, spkt, network_length + ETH_HL= EN); =20 if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); @@ -304,7 +311,14 @@ static int colo_packet_compare_icmp(Packet *spkt, Pack= et *ppkt) return -1; } =20 - if (colo_packet_compare_common(ppkt, spkt)) { + /* + * Because of ppkt and spkt are both in the same connection, + * The ppkt's src ip, dst ip, src port, dst port, ip_proto all are + * same with spkt. In addition, IP header's Identification is a random + * field, we can handle it in IP fragmentation function later. + * So we just compare the ip payload here. + */ + if (colo_packet_compare_common(ppkt, spkt, network_length + ETH_HLEN))= { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", @@ -330,7 +344,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) inet_ntoa(ppkt->ip->ip_dst), spkt->size, inet_ntoa(spkt->ip->ip_src), inet_ntoa(spkt->ip->ip_dst)); - return colo_packet_compare_common(ppkt, spkt); + return colo_packet_compare_common(ppkt, spkt, 0); } =20 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) --=20 2.7.4 From nobody Tue May 7 18:01:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487993727335134.24637219134968; Fri, 24 Feb 2017 19:35:27 -0800 (PST) Received: from localhost ([::1]:41119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT8n-0004OV-GJ for importer@patchew.org; Fri, 24 Feb 2017 22:35:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7C-0003Zk-Iu for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chT7B-0006oF-KC for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:46 -0500 Received: from [59.151.112.132] (port=47327 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chT7B-0006iV-8M for qemu-devel@nongnu.org; Fri, 24 Feb 2017 22:33:45 -0500 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Feb 2017 11:33:40 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 359B8477AE6E; Sat, 25 Feb 2017 11:33:37 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 25 Feb 2017 11:33:36 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="15947363" From: Zhang Chen To: qemu devel Date: Sat, 25 Feb 2017 11:32:10 +0800 Message-ID: <1487993530-30875-5-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1487993530-30875-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 359B8477AE6E.AE024 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 3/3] COLO-compare: Make qemu_hexdump() print data when trace-event ON X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , bian naimeng , "eddie . dong" , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Zhang Chen --- net/colo-compare.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 9853232..5ffc4a3 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -288,9 +288,13 @@ static int colo_packet_compare_udp(Packet *spkt, Packe= t *ppkt) =20 if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", ppkt->siz= e); trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size= ); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare", spkt->siz= e); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare", + spkt->size); + } } =20 return ret; @@ -321,12 +325,14 @@ static int colo_packet_compare_icmp(Packet *spkt, Pac= ket *ppkt) if (colo_packet_compare_common(ppkt, spkt, network_length + ETH_HLEN))= { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); - qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", - ppkt->size); trace_colo_compare_icmp_miscompare("Secondary pkt size", spkt->size); - qemu_hexdump((char *)spkt->data, stderr, "colo-compare", - spkt->size); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", + ppkt->size); + qemu_hexdump((char *)spkt->data, stderr, "colo-compare", + spkt->size); + } return -1; } else { return 0; --=20 2.7.4