From patchwork Thu Mar 16 09:52:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9627785 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D8AA6048C for ; Thu, 16 Mar 2017 09:53:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24AA828673 for ; Thu, 16 Mar 2017 09:53:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 196F128676; Thu, 16 Mar 2017 09:53:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 84F9B28673 for ; Thu, 16 Mar 2017 09:53:18 +0000 (UTC) Received: from localhost ([::1]:42283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5t-0000g3-6S for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Mar 2017 05:53:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5V-0000ev-Ex for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coS5S-0005bU-VU for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:53 -0400 Received: from [59.151.112.132] (port=49856 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5S-0005b4-8e for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:50 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16648913" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Mar 2017 17:52:48 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 362EC48A2975; Thu, 16 Mar 2017 17:52:49 +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; Thu, 16 Mar 2017 17:52:48 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Thu, 16 Mar 2017 17:52:08 +0800 Message-ID: <1489657928-14919-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489657928-14919-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1489657928-14919-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 362EC48A2975.ADA91 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: Add virtio-net packet compare support 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 , bian naimeng , "eddie . dong" , zhanghailiang , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If packet is virtio-net packet we will skip the virtio-net header compare packet's payload. Signed-off-by: Zhang Chen --- net/colo-compare.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index ce0cd12..34af11a 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -237,7 +237,12 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt) } if (ptcp->th_sum == stcp->th_sum) { - res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN); + if (ppkt->is_virtio_net_pkt) { + res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN + + VIRTIO_NET_HEADER); + } else { + res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN); + } } else { res = -1; } @@ -285,8 +290,14 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) * other field like TOS,TTL,IP Checksum. we only need to compare * the ip payload here. */ - ret = colo_packet_compare_common(ppkt, spkt, - network_header_length + ETH_HLEN); + if (ppkt->is_virtio_net_pkt) { + ret = colo_packet_compare_common(ppkt, spkt, + network_header_length + + VIRTIO_NET_HEADER + ETH_HLEN); + } else { + ret = colo_packet_compare_common(ppkt, spkt, + network_header_length + ETH_HLEN); + } if (ret) { trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size); @@ -309,6 +320,7 @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt) static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) { int network_header_length = ppkt->ip->ip_hl * 4; + int ret; trace_colo_compare_main("compare icmp"); @@ -322,8 +334,17 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) * other field like TOS,TTL,IP Checksum. we only need to compare * the ip payload here. */ - if (colo_packet_compare_common(ppkt, spkt, - network_header_length + ETH_HLEN)) { + + if (ppkt->is_virtio_net_pkt) { + ret = colo_packet_compare_common(ppkt, spkt, + network_header_length + + VIRTIO_NET_HEADER + ETH_HLEN); + } else { + ret = colo_packet_compare_common(ppkt, spkt, + network_header_length + ETH_HLEN); + } + + if (ret) { trace_colo_compare_icmp_miscompare("primary pkt size", ppkt->size); trace_colo_compare_icmp_miscompare("Secondary pkt size",