From patchwork Thu Mar 16 09:52:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9627789 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 AAA7A6048C for ; Thu, 16 Mar 2017 09:53:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A235F28673 for ; Thu, 16 Mar 2017 09:53:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96E1128676; Thu, 16 Mar 2017 09:53:29 +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 3114328673 for ; Thu, 16 Mar 2017 09:53:29 +0000 (UTC) Received: from localhost ([::1]:42286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coS64-0000na-58 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Mar 2017 05:53:28 -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 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="16648909" 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 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Change parse_packet_early(Packet *pkt) to parse_packet_early(Packet *pkt, int 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 = packet_new(s->sec_rs.buf, s->sec_rs.packet_len); } - if (parse_packet_early(pkt)) { - packet_destroy(pkt, NULL); - pkt = 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 = NULL; + return -1; + } } fill_connection_key(pkt, &key); 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)) == 0; } -int parse_packet_early(Packet *pkt) +int parse_packet_early(Packet *pkt, int offset) { int network_length; static const uint8_t vlan[] = {0x81, 0x00}; - uint8_t *data = pkt->data; + uint8_t *data = pkt->data + offset; uint16_t l3_proto; ssize_t l2hdr_len = eth_get_l2_hdr_length(data); - 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) } network_length = 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 +/* virtio-net header length */ +#define VIRTIO_NET_HEADER 12 + typedef struct Packet { void *data; union { @@ -73,7 +76,7 @@ typedef struct Connection { 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 == 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 == IPPROTO_TCP) { + return 1; + } else { + goto out; + } } + +out: + return 0; } /* handle tcp packet from primary guest */