{"id":811295,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811295/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-14-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504836324-4871-14-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:19","name":"[PULL,13/18] net/colo-compare.c: Optimize unpredictable tcp options comparison","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"e51dce31b859b0f13d2a1359d2d59c1c4fa28c26","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-14-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811295/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811295/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpLVv5xzlz9ryT\n\tfor ;\n\tFri, 8 Sep 2017 12:14:47 +1000 (AEST)","from localhost ([::1]:42978 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8of-0002EU-Pt\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:14:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:32840)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gj-0003em-Tc\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:38 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8ge-0002VI-UU\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:33 -0400","from mx1.redhat.com ([209.132.183.28]:37100)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8ge-0002UY-Mf\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:28 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C8937356D9;\n\tFri, 8 Sep 2017 02:06:27 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4D6BA600C2;\n\tFri, 8 Sep 2017 02:06:24 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C8937356D9","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:19 +0800","Message-Id":"<1504836324-4871-14-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tFri, 08 Sep 2017 02:06:27 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 13/18] net/colo-compare.c: Optimize\n\tunpredictable tcp options comparison","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Jason Wang ,\n\tZhang Chen ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Zhang Chen \n\nWhen network is busy, some tcp options(like sack) will unpredictable\noccur in primary side or secondary side. it will make packet size\nnot same, but the two packet's payload is identical. colo just\ncare about packet payload, so we skip the option field.\n\nSigned-off-by: Zhang Chen \nSigned-off-by: Jason Wang \n---\n net/colo-compare.c | 39 +++++++++++++++++++++++++++------------\n 1 file changed, 27 insertions(+), 12 deletions(-)","diff":"diff --git a/net/colo-compare.c b/net/colo-compare.c\nindex 5fe8e3f..612fbac 100644\n--- a/net/colo-compare.c\n+++ b/net/colo-compare.c\n@@ -186,7 +186,10 @@ static int packet_enqueue(CompareState *s, int mode)\n * return: 0 means packet same\n * > 0 || < 0 means packet different\n */\n-static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)\n+static int colo_packet_compare_common(Packet *ppkt,\n+ Packet *spkt,\n+ int poffset,\n+ int soffset)\n {\n if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {\n char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];\n@@ -201,12 +204,13 @@ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset)\n sec_ip_src, sec_ip_dst);\n }\n \n- offset = ppkt->vnet_hdr_len + offset;\n+ poffset = ppkt->vnet_hdr_len + poffset;\n+ soffset = ppkt->vnet_hdr_len + soffset;\n \n- if (ppkt->size == spkt->size) {\n- return memcmp(ppkt->data + offset,\n- spkt->data + offset,\n- spkt->size - offset);\n+ if (ppkt->size - poffset == spkt->size - soffset) {\n+ return memcmp(ppkt->data + poffset,\n+ spkt->data + soffset,\n+ spkt->size - soffset);\n } else {\n trace_colo_compare_main(\"Net packet size are not the same\");\n return -1;\n@@ -263,13 +267,22 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)\n * so we just need skip this field.\n */\n if (ptcp->th_off > 5) {\n- ptrdiff_t tcp_offset;\n+ ptrdiff_t ptcp_offset, stcp_offset;\n \n- tcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data\n- + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;\n- res = colo_packet_compare_common(ppkt, spkt, tcp_offset);\n+ ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data\n+ + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;\n+ stcp_offset = spkt->transport_header - (uint8_t *)spkt->data\n+ + (stcp->th_off * 4) - spkt->vnet_hdr_len;\n+\n+ /*\n+ * When network is busy, some tcp options(like sack) will unpredictable\n+ * occur in primary side or secondary side. it will make packet size\n+ * not same, but the two packet's payload is identical. colo just\n+ * care about packet payload, so we skip the option field.\n+ */\n+ res = colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_offset);\n } else if (ptcp->th_sum == stcp->th_sum) {\n- res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN);\n+ res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN);\n } else {\n res = -1;\n }\n@@ -330,6 +343,7 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)\n * the ip payload here.\n */\n ret = colo_packet_compare_common(ppkt, spkt,\n+ network_header_length + ETH_HLEN,\n network_header_length + ETH_HLEN);\n \n if (ret) {\n@@ -367,6 +381,7 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)\n * the ip payload here.\n */\n if (colo_packet_compare_common(ppkt, spkt,\n+ network_header_length + ETH_HLEN,\n network_header_length + ETH_HLEN)) {\n trace_colo_compare_icmp_miscompare(\"primary pkt size\",\n ppkt->size);\n@@ -404,7 +419,7 @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)\n sec_ip_src, sec_ip_dst);\n }\n \n- return colo_packet_compare_common(ppkt, spkt, 0);\n+ return colo_packet_compare_common(ppkt, spkt, 0, 0);\n }\n \n static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)\n","prefixes":["PULL","13/18"]}