From nobody Wed Nov 5 10:59:04 2025 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.zohomail.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 1504505855322455.5195459469479; Sun, 3 Sep 2017 23:17:35 -0700 (PDT) Received: from localhost ([::1]:35136 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dokhS-00005j-Dn for importer@patchew.org; Mon, 04 Sep 2017 02:17:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dokdM-0005Vh-Rj for qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dokdI-0002j9-Rp for qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:20 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:18989 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dokdI-0002hR-23 for qemu-devel@nongnu.org; Mon, 04 Sep 2017 02:13:16 -0400 Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 04 Sep 2017 14:13:13 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 6FCA04725541; Mon, 4 Sep 2017 14:13:07 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Mon, 4 Sep 2017 14:13:12 +0800 X-IronPort-AV: E=Sophos;i="5.41,473,1498492800"; d="scan'208";a="25177674" From: Zhang Chen To: qemu devel , Jason Wang Date: Mon, 4 Sep 2017 14:14:46 +0800 Message-ID: <1504505688-32455-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504505688-32455-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1504505688-32455-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 6FCA04725541.ABFE2 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: 183.91.158.132 Subject: [Qemu-devel] [PATCH V5 1/3] net/colo-compare.c: Optimize unpredictable tcp options comparison 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: Li Zhijian , Zhang Chen , 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" When network is busy, some tcp options(like sack) will unpredictable occur in primary side or secondary side. it will make packet size not same, but the two packet's payload is identical. colo just care about packet payload, so we skip the option field. Signed-off-by: Zhang Chen --- net/colo-compare.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index ca67c68..18a9ebf 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -186,7 +186,10 @@ 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, int offs= et) +static int colo_packet_compare_common(Packet *ppkt, + Packet *spkt, + int poffset, + int soffset) { if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20= ]; @@ -201,12 +204,14 @@ static int colo_packet_compare_common(Packet *ppkt, P= acket *spkt, int offset) sec_ip_src, sec_ip_dst); } =20 - offset =3D ppkt->vnet_hdr_len + offset; + poffset =3D ppkt->vnet_hdr_len + poffset; + soffset =3D ppkt->vnet_hdr_len + soffset; =20 - if (ppkt->size =3D=3D spkt->size) { - return memcmp(ppkt->data + offset, - spkt->data + offset, - spkt->size - offset); + if (ppkt->size =3D=3D spkt->size || + ppkt->size - poffset =3D=3D spkt->size - soffset) { + return memcmp(ppkt->data + poffset, + spkt->data + soffset, + spkt->size - soffset); } else { trace_colo_compare_main("Net packet size are not the same"); return -1; @@ -263,13 +268,22 @@ static int colo_packet_compare_tcp(Packet *spkt, Pack= et *ppkt) * so we just need skip this field. */ if (ptcp->th_off > 5) { - ptrdiff_t tcp_offset; + ptrdiff_t ptcp_offset, stcp_offset; =20 - tcp_offset =3D ppkt->transport_header - (uint8_t *)ppkt->data - + (ptcp->th_off * 4) - ppkt->vnet_hdr_len; - res =3D colo_packet_compare_common(ppkt, spkt, tcp_offset); + ptcp_offset =3D ppkt->transport_header - (uint8_t *)ppkt->data + + (ptcp->th_off * 4) - ppkt->vnet_hdr_len; + stcp_offset =3D spkt->transport_header - (uint8_t *)spkt->data + + (stcp->th_off * 4) - spkt->vnet_hdr_len; + + /* + * When network is busy, some tcp options(like sack) will unpredic= table + * occur in primary side or secondary side. it will make packet si= ze + * not same, but the two packet's payload is identical. colo just + * care about packet payload, so we skip the option field. + */ + res =3D colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_o= ffset); } else if (ptcp->th_sum =3D=3D stcp->th_sum) { - res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN); + res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN); } else { res =3D -1; } @@ -329,6 +343,7 @@ static int colo_packet_compare_udp(Packet *spkt, Packet= *ppkt) * the ip payload here. */ ret =3D colo_packet_compare_common(ppkt, spkt, + network_header_length + ETH_HLEN, network_header_length + ETH_HLEN); =20 if (ret) { @@ -366,6 +381,7 @@ static int colo_packet_compare_icmp(Packet *spkt, Packe= t *ppkt) * the ip payload here. */ if (colo_packet_compare_common(ppkt, spkt, + network_header_length + ETH_HLEN, network_header_length + ETH_HLEN)) { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); @@ -403,7 +419,7 @@ static int colo_packet_compare_other(Packet *spkt, Pack= et *ppkt) sec_ip_src, sec_ip_dst); } =20 - return colo_packet_compare_common(ppkt, spkt, 0); + return colo_packet_compare_common(ppkt, spkt, 0, 0); } =20 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) --=20 2.7.4