From patchwork Thu May 24 17:59:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 161185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 94637B6EE7 for ; Fri, 25 May 2012 04:03:41 +1000 (EST) Received: from localhost ([::1]:42246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcNv-0001Sb-DG for incoming@patchwork.ozlabs.org; Thu, 24 May 2012 14:03:39 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcNQ-0000wv-1W for qemu-devel@nongnu.org; Thu, 24 May 2012 14:03:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SXcNL-0003wY-75 for qemu-devel@nongnu.org; Thu, 24 May 2012 14:03:07 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:59046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SXcNL-0003vD-19 for qemu-devel@nongnu.org; Thu, 24 May 2012 14:03:03 -0400 Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 24 May 2012 12:03:00 -0600 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 24 May 2012 12:01:59 -0600 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id 31FD9C90058 for ; Thu, 24 May 2012 14:01:55 -0400 (EDT) Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4OI1wpw152624 for ; Thu, 24 May 2012 14:01:58 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4OI1wqX001808 for ; Thu, 24 May 2012 15:01:58 -0300 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q4OI1ssX001266; Thu, 24 May 2012 15:01:55 -0300 Received: by us.ibm.com (sSMTP sendmail emulation); Fri, 25 May 2012 02:01:46 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Fri, 25 May 2012 01:59:22 +0800 Message-Id: <1337882362-20100-17-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> References: <1337882362-20100-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12052418-7282-0000-0000-0000094F0EB0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.149 Cc: pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v3 16/16] hub: add the support for hub own flow control X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Zhi Yong Wu Signed-off-by: Zhi Yong Wu --- net/hub.c | 35 ++++++++++++++++++++++++++++++++--- net/hub.h | 2 ++ net/queue.c | 5 +++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/net/hub.c b/net/hub.c index 8a583ab..d27c52a 100644 --- a/net/hub.c +++ b/net/hub.c @@ -28,6 +28,7 @@ typedef struct NetHubPort { QLIST_ENTRY(NetHubPort) next; NetHub *hub; unsigned int id; + uint64_t nr_packets; } NetHubPort; struct NetHub { @@ -39,19 +40,37 @@ struct NetHub { static QLIST_HEAD(, NetHub) hubs = QLIST_HEAD_INITIALIZER(&hubs); +static void net_hub_receive_completed(NetClientState *nc, ssize_t len) +{ + NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc); + port->nr_packets--; + if (!port->nr_packets) { + qemu_net_queue_flush(nc->peer->send_queue); + } +} + +void net_hub_port_packet_stats(NetClientState *nc) +{ + NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc); + + port->nr_packets++; +} + static ssize_t net_hub_receive(NetHub *hub, NetHubPort *source_port, const uint8_t *buf, size_t len) { NetHubPort *port; + ssize_t ret = 0; QLIST_FOREACH(port, &hub->ports, next) { if (port == source_port) { continue; } - qemu_send_packet(&port->nc, buf, len); + ret = qemu_send_packet_async(&port->nc, buf, len, + net_hub_receive_completed); } - return len; + return ret; } static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port, @@ -65,7 +84,8 @@ static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port, continue; } - ret = qemu_sendv_packet(&port->nc, iov, iovcnt); + ret = qemu_sendv_packet_async(&port->nc, iov, iovcnt, + net_hub_receive_completed); } return ret; } @@ -84,6 +104,13 @@ static NetHub *net_hub_new(unsigned int id) return hub; } +static int net_hub_port_can_receive(NetClientState *nc) +{ + NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc); + + return port->nr_packets ? 0 : 1; +} + static ssize_t net_hub_port_receive(NetClientState *nc, const uint8_t *buf, size_t len) { @@ -110,6 +137,7 @@ static void net_hub_port_cleanup(NetClientState *nc) static NetClientInfo net_hub_port_info = { .type = NET_CLIENT_TYPE_HUB, .size = sizeof(NetHubPort), + .can_receive = net_hub_port_can_receive, .receive = net_hub_port_receive, .receive_iov = net_hub_port_receive_iov, .cleanup = net_hub_port_cleanup, @@ -128,6 +156,7 @@ static NetHubPort *net_hub_port_new(NetHub *hub) port = DO_UPCAST(NetHubPort, nc, nc); port->id = id; port->hub = hub; + port->nr_packets = 0; QLIST_INSERT_HEAD(&hub->ports, port, next); diff --git a/net/hub.h b/net/hub.h index d04f1b1..542e657 100644 --- a/net/hub.h +++ b/net/hub.h @@ -23,4 +23,6 @@ void net_hub_info(Monitor *mon); int net_hub_id_for_client(NetClientState *nc, unsigned int *id); void net_hub_check_clients(void); +void net_hub_port_packet_stats(NetClientState *nc); + #endif /* NET_HUB_H */ diff --git a/net/queue.c b/net/queue.c index 7484d2a..ebf18aa 100644 --- a/net/queue.c +++ b/net/queue.c @@ -22,6 +22,7 @@ */ #include "net/queue.h" +#include "net/hub.h" #include "qemu-queue.h" #include "net.h" @@ -101,6 +102,8 @@ static ssize_t qemu_net_queue_append(NetQueue *queue, QTAILQ_INSERT_TAIL(&queue->packets, packet, entry); + net_hub_port_packet_stats(sender); + return size; } @@ -134,6 +137,8 @@ static ssize_t qemu_net_queue_append_iov(NetQueue *queue, QTAILQ_INSERT_TAIL(&queue->packets, packet, entry); + net_hub_port_packet_stats(sender); + return packet->size; }