From nobody Fri May 3 00:51:09 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 14896580526911023.1493185866614; Thu, 16 Mar 2017 02:54:12 -0700 (PDT) Received: from localhost ([::1]:42286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS6l-0000na-BG for importer@patchew.org; Thu, 16 Mar 2017 05:54:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5a-0000jH-Ri for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:53:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coS5Z-0005d7-Pt for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:58 -0400 Received: from [59.151.112.132] (port=35717 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5W-0005aT-Fh for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:57 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Mar 2017 17:52:43 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id A395C49F9A77; Thu, 16 Mar 2017 17:52:45 +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:44 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16648909" From: Zhang Chen To: qemu devel , Jason Wang Date: Thu, 16 Mar 2017 17:52:06 +0800 Message-ID: <1489657928-14919-2-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: A395C49F9A77.A1C6E 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-proxy: Add virtio-net packet parse function 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+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" Change parse_packet_early(Packet *pkt) to parse_packet_early(Packet *pkt, i= nt offset) that we can skip virtio-net header. Signed-off-by: Zhang Chen --- net/colo-compare.c | 11 +++++++---- net/colo.c | 8 ++++---- net/colo.h | 5 ++++- net/filter-rewriter.c | 15 ++++++++++----- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 54e6d40..ce0cd12 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -126,10 +126,13 @@ static int packet_enqueue(CompareState *s, int mode) pkt =3D packet_new(s->sec_rs.buf, s->sec_rs.packet_len); } =20 - if (parse_packet_early(pkt)) { - packet_destroy(pkt, NULL); - pkt =3D NULL; - return -1; + /* Try to parse the virtio-net-pci packet */ + if (parse_packet_early(pkt, VIRTIO_NET_HEADER)) { + if (parse_packet_early(pkt, 0)) { + packet_destroy(pkt, NULL); + pkt =3D NULL; + return -1; + } } fill_connection_key(pkt, &key); =20 diff --git a/net/colo.c b/net/colo.c index 8cc166b..060e822 100644 --- a/net/colo.c +++ b/net/colo.c @@ -39,15 +39,15 @@ int connection_key_equal(const void *key1, const void *= key2) return memcmp(key1, key2, sizeof(ConnectionKey)) =3D=3D 0; } =20 -int parse_packet_early(Packet *pkt) +int parse_packet_early(Packet *pkt, int offset) { int network_length; static const uint8_t vlan[] =3D {0x81, 0x00}; - uint8_t *data =3D pkt->data; + uint8_t *data =3D pkt->data + offset; uint16_t l3_proto; ssize_t l2hdr_len =3D eth_get_l2_hdr_length(data); =20 - if (pkt->size < ETH_HLEN) { + if (pkt->size < ETH_HLEN + offset) { trace_colo_proxy_main("pkt->size < ETH_HLEN"); return 1; } @@ -73,7 +73,7 @@ int parse_packet_early(Packet *pkt) } =20 network_length =3D pkt->ip->ip_hl * 4; - if (pkt->size < l2hdr_len + network_length) { + if (pkt->size < l2hdr_len + network_length + offset) { trace_colo_proxy_main("pkt->size < network_header + network_length= "); return 1; } diff --git a/net/colo.h b/net/colo.h index 7c524f3..b713f87 100644 --- a/net/colo.h +++ b/net/colo.h @@ -33,6 +33,9 @@ #define IPPROTO_UDPLITE 136 #endif =20 +/* virtio-net header length */ +#define VIRTIO_NET_HEADER 12 + typedef struct Packet { void *data; union { @@ -73,7 +76,7 @@ typedef struct Connection { =20 uint32_t connection_key_hash(const void *opaque); int connection_key_equal(const void *opaque1, const void *opaque2); -int parse_packet_early(Packet *pkt); +int parse_packet_early(Packet *pkt, int offset); void fill_connection_key(Packet *pkt, ConnectionKey *key); void reverse_connection_key(ConnectionKey *key); Connection *connection_new(ConnectionKey *key); diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index afa06e8..c3f0261 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -51,12 +51,17 @@ static void filter_rewriter_flush(NetFilterState *nf) */ static int is_tcp_packet(Packet *pkt) { - if (!parse_packet_early(pkt) && - pkt->ip->ip_p =3D=3D IPPROTO_TCP) { - return 1; - } else { - return 0; + if (!parse_packet_early(pkt, VIRTIO_NET_HEADER) || + !parse_packet_early(pkt, 0)) { + if (pkt->ip->ip_p =3D=3D IPPROTO_TCP) { + return 1; + } else { + goto out; + } } + +out: + return 0; } =20 /* handle tcp packet from primary guest */ --=20 2.7.4 From nobody Fri May 3 00:51:09 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 1489658042739773.4647422435175; Thu, 16 Mar 2017 02:54:02 -0700 (PDT) Received: from localhost ([::1]:42285 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS6a-0000gl-9v for importer@patchew.org; Thu, 16 Mar 2017 05:54:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS5V-0000fD-Tr 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 1coS5V-0005bo-1M 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 1coS5T-0005b4-PP for qemu-devel@nongnu.org; Thu, 16 Mar 2017 05:52:52 -0400 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 0CDEA477AE90; Thu, 16 Mar 2017 17:52:48 +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:46 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16648914" From: Zhang Chen To: qemu devel , Jason Wang Date: Thu, 16 Mar 2017 17:52:07 +0800 Message-ID: <1489657928-14919-3-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: 0CDEA477AE90.A075F 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-proxy: Add a tag to mark virtio-net packet 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+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 this tag that compare can recognize virtio-net packet. Signed-off-by: Zhang Chen --- net/colo.c | 6 ++++++ net/colo.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/net/colo.c b/net/colo.c index 060e822..d2b3683 100644 --- a/net/colo.c +++ b/net/colo.c @@ -79,6 +79,12 @@ int parse_packet_early(Packet *pkt, int offset) } pkt->transport_header =3D pkt->network_header + network_length; =20 + if (offset =3D=3D VIRTIO_NET_HEADER) { + pkt->is_virtio_net_pkt =3D true; + } else { + pkt->is_virtio_net_pkt =3D false; + } + return 0; } =20 diff --git a/net/colo.h b/net/colo.h index b713f87..535793d 100644 --- a/net/colo.h +++ b/net/colo.h @@ -46,6 +46,8 @@ typedef struct Packet { int size; /* Time of packet creation, in wall clock ms */ int64_t creation_ms; + /* Mark this packet as a virtio net packet or not */ + bool is_virtio_net_pkt; } Packet; =20 typedef struct ConnectionKey { --=20 2.7.4 From nobody Fri May 3 00:51:09 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 1489658039480952.8809828942228; Thu, 16 Mar 2017 02:53:59 -0700 (PDT) Received: from localhost ([::1]:42283 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS6Y-0000g3-3w for importer@patchew.org; Thu, 16 Mar 2017 05:53:58 -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 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 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16648913" 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+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" 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, Packe= t *ppkt) } =20 if (ptcp->th_sum =3D=3D stcp->th_sum) { - res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN); + if (ppkt->is_virtio_net_pkt) { + res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN + + VIRTIO_NET_HEADER); + } else { + res =3D colo_packet_compare_common(ppkt, spkt, ETH_HLEN); + } } else { res =3D -1; } @@ -285,8 +290,14 @@ static int colo_packet_compare_udp(Packet *spkt, Packe= t *ppkt) * other field like TOS,TTL,IP Checksum. we only need to compare * the ip payload here. */ - ret =3D colo_packet_compare_common(ppkt, spkt, - network_header_length + ETH_HLEN); + if (ppkt->is_virtio_net_pkt) { + ret =3D colo_packet_compare_common(ppkt, spkt, + network_header_length + + VIRTIO_NET_HEADER + ETH_HLEN); + } else { + ret =3D colo_packet_compare_common(ppkt, spkt, + network_header_length + ETH_HLEN); + } =20 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 =3D ppkt->ip->ip_hl * 4; + int ret; =20 trace_colo_compare_main("compare icmp"); =20 @@ -322,8 +334,17 @@ static int colo_packet_compare_icmp(Packet *spkt, Pack= et *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 =3D colo_packet_compare_common(ppkt, spkt, + network_header_length + + VIRTIO_NET_HEADER + ETH_HLEN); + } else { + ret =3D 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", --=20 2.7.4