From patchwork Wed Jun 20 09:42:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 165980 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 E473AB6FD9 for ; Wed, 20 Jun 2012 20:18:02 +1000 (EST) Received: from localhost ([::1]:40590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHSl-0003HB-8v for incoming@patchwork.ozlabs.org; Wed, 20 Jun 2012 05:44:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHSX-00037h-MS for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:44:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ShHSR-0002hO-3X for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:44:21 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:36614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ShHSQ-0002gX-Kp for qemu-devel@nongnu.org; Wed, 20 Jun 2012 05:44:14 -0400 Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 20 Jun 2012 03:44:11 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 20 Jun 2012 03:43:42 -0600 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 1A7871FF0022 for ; Wed, 20 Jun 2012 09:43:41 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5K9hfTN231696 for ; Wed, 20 Jun 2012 03:43:41 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5K9heAS027149 for ; Wed, 20 Jun 2012 03:43:40 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.27]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q5K9hbeh026963; Wed, 20 Jun 2012 03:43:38 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Wed, 20 Jun 2012 17:43:36 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Wed, 20 Jun 2012 17:42:20 +0800 Message-Id: <1340185341-30803-17-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> References: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12062009-2398-0000-0000-000007B0C4F5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.151 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, Zhi Yong Wu , stefanha@linux.vnet.ibm.com, jan.kiszka@siemens.com Subject: [Qemu-devel] [PATCH v6 16/17] 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 Only when all other hub port's *peer* .can_receive() all return 1, the source hub port .can_receive() return 1. Reviewed-off-by: Paolo Bonzini Signed-off-by: Zhi Yong Wu --- net/hub.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/net/hub.c b/net/hub.c index 230d86a..efd90b5 100644 --- a/net/hub.c +++ b/net/hub.c @@ -15,6 +15,7 @@ #include "monitor.h" #include "net.h" #include "hub.h" +#include "iov.h" /* * A hub broadcasts incoming packets to all its ports except the source port. @@ -59,16 +60,16 @@ static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port, const struct iovec *iov, int iovcnt) { NetHubPort *port; - ssize_t ret = 0; + ssize_t len = iov_size(iov, iovcnt); QLIST_FOREACH(port, &hub->ports, next) { if (port == source_port) { continue; } - ret = qemu_sendv_packet(&port->nc, iov, iovcnt); + qemu_sendv_packet(&port->nc, iov, iovcnt); } - return ret; + return len; } static NetHub *net_hub_new(unsigned int id) @@ -85,6 +86,25 @@ static NetHub *net_hub_new(unsigned int id) return hub; } +static int net_hub_port_can_receive(NetClientState *nc) +{ + NetHubPort *port; + NetHubPort *src_port = DO_UPCAST(NetHubPort, nc, nc); + NetHub *hub = src_port->hub; + + QLIST_FOREACH(port, &hub->ports, next) { + if (port == src_port) { + continue; + } + + if (!qemu_can_send_packet(&port->nc)) { + return 0; + } + } + + return 1; +} + static ssize_t net_hub_port_receive(NetClientState *nc, const uint8_t *buf, size_t len) { @@ -111,6 +131,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,