From patchwork Fri May 12 01:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9723401 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 2D36660364 for ; Fri, 12 May 2017 01:48:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22A3E287B3 for ; Fri, 12 May 2017 01:48:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1543E287B8; Fri, 12 May 2017 01:48:08 +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 84C85287B3 for ; Fri, 12 May 2017 01:48:07 +0000 (UTC) Received: from localhost ([::1]:50917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8zgc-0002N5-JD for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 May 2017 21:48:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8zdO-0000QF-Lc for qemu-devel@nongnu.org; Thu, 11 May 2017 21:44:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8zdN-0003xm-Ge for qemu-devel@nongnu.org; Thu, 11 May 2017 21:44:46 -0400 Received: from [59.151.112.132] (port=8274 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8zdM-0003ue-Gt for qemu-devel@nongnu.org; Thu, 11 May 2017 21:44:45 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18766957" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 12 May 2017 09:44:40 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A644947C610B; Fri, 12 May 2017 09:44:36 +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.319.2; Fri, 12 May 2017 09:44:34 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 12 May 2017 09:41:21 +0800 Message-ID: <1494553288-30764-6-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494553288-30764-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1494553288-30764-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: A644947C610B.AD321 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 V4 05/12] net/net.c: Add vnet_hdr support in SocketReadState 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: zhanghailiang , Li Zhijian , weifuqiang , "eddie . dong" , Zhang Chen , bian naimeng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Address Jason Wang's comments add vnet header length to SocketReadState. We add a flag to dicide whether net_fill_rstate() to read struct {int size; int vnet_hdr_len; const uint8_t buf[];} or not. Signed-off-by: Zhang Chen --- include/net/net.h | 9 +++++++-- net/colo-compare.c | 4 ++-- net/filter-mirror.c | 2 +- net/net.c | 36 ++++++++++++++++++++++++++++++++---- net/socket.c | 2 +- 5 files changed, 43 insertions(+), 10 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 70edfc0..0763636 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -113,14 +113,19 @@ typedef struct NICState { } NICState; struct SocketReadState { - int state; /* 0 = getting length, 1 = getting data */ + /* 0 = getting length, 1 = getting vnet header length, 2 = getting data */ + int state; uint32_t index; uint32_t packet_len; + uint32_t vnet_hdr_len; uint8_t buf[NET_BUFSIZE]; SocketReadStateFinalize *finalize; }; -int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size); +int net_fill_rstate(SocketReadState *rs, + const uint8_t *buf, + int size, + bool vnet_hdr); char *qemu_mac_strdup_printf(const uint8_t *macaddr); NetClientState *qemu_find_netdev(const char *id); int qemu_find_net_clients_except(const char *id, NetClientState **ncs, diff --git a/net/colo-compare.c b/net/colo-compare.c index 4ab80b1..332f57e 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -530,7 +530,7 @@ static void compare_pri_chr_in(void *opaque, const uint8_t *buf, int size) CompareState *s = COLO_COMPARE(opaque); int ret; - ret = net_fill_rstate(&s->pri_rs, buf, size); + ret = net_fill_rstate(&s->pri_rs, buf, size, false); if (ret == -1) { qemu_chr_fe_set_handlers(&s->chr_pri_in, NULL, NULL, NULL, NULL, NULL, true); @@ -547,7 +547,7 @@ static void compare_sec_chr_in(void *opaque, const uint8_t *buf, int size) CompareState *s = COLO_COMPARE(opaque); int ret; - ret = net_fill_rstate(&s->sec_rs, buf, size); + ret = net_fill_rstate(&s->sec_rs, buf, size, false); if (ret == -1) { qemu_chr_fe_set_handlers(&s->chr_sec_in, NULL, NULL, NULL, NULL, NULL, true); diff --git a/net/filter-mirror.c b/net/filter-mirror.c index a65853c..4649416 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -134,7 +134,7 @@ static void redirector_chr_read(void *opaque, const uint8_t *buf, int size) MirrorState *s = FILTER_REDIRECTOR(nf); int ret; - ret = net_fill_rstate(&s->rs, buf, size); + ret = net_fill_rstate(&s->rs, buf, size, s->vnet_hdr); if (ret == -1) { qemu_chr_fe_set_handlers(&s->chr_in, NULL, NULL, NULL, diff --git a/net/net.c b/net/net.c index a00a0c9..a9c97cf 100644 --- a/net/net.c +++ b/net/net.c @@ -1618,13 +1618,20 @@ void net_socket_rs_init(SocketReadState *rs, * 0: success * -1: error occurs */ -int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) +int net_fill_rstate(SocketReadState *rs, + const uint8_t *buf, + int size, + bool vnet_hdr) { unsigned int l; while (size > 0) { - /* reassemble a packet from the network */ - switch (rs->state) { /* 0 = getting length, 1 = getting data */ + /* Reassemble a packet from the network. + * 0 = getting length. + * 1 = getting vnet header length. + * 2 = getting data. + */ + switch (rs->state) { case 0: l = 4 - rs->index; if (l > size) { @@ -1638,10 +1645,31 @@ int net_fill_rstate(SocketReadState *rs, const uint8_t *buf, int size) /* got length */ rs->packet_len = ntohl(*(uint32_t *)rs->buf); rs->index = 0; - rs->state = 1; + if (vnet_hdr) { + rs->state = 1; + } else { + rs->state = 2; + rs->vnet_hdr_len = 0; + } } break; case 1: + l = 4 - rs->index; + if (l > size) { + l = size; + } + memcpy(rs->buf + rs->index, buf, l); + buf += l; + size -= l; + rs->index += l; + if (rs->index == 4) { + /* got vnet header length */ + rs->vnet_hdr_len = ntohl(*(uint32_t *)rs->buf); + rs->index = 0; + rs->state = 2; + } + break; + case 2: l = rs->packet_len - rs->index; if (l > size) { l = size; diff --git a/net/socket.c b/net/socket.c index b8c931e..4e58eff 100644 --- a/net/socket.c +++ b/net/socket.c @@ -182,7 +182,7 @@ static void net_socket_send(void *opaque) } buf = buf1; - ret = net_fill_rstate(&s->rs, buf, size); + ret = net_fill_rstate(&s->rs, buf, size, false); if (ret == -1) { goto eoc;