qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: zwu.kernel@gmail.com
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, aliguori@us.ibm.com,
	Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>,
	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
Date: Wed, 20 Jun 2012 17:42:20 +0800	[thread overview]
Message-ID: <1340185341-30803-17-git-send-email-zwu.kernel@gmail.com> (raw)
In-Reply-To: <1340185341-30803-1-git-send-email-zwu.kernel@gmail.com>

From: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>

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 <pbonzini@redhat.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
---
 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,
-- 
1.7.6

  parent reply	other threads:[~2012-06-20  9:44 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-20  9:42 [Qemu-devel] [PATCH v6 00/17] hub-based networking patchset zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 01/17] net: Add a hub net client zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 02/17] net: Use hubs for the vlan feature zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 03/17] net: Look up 'vlan' net clients using hubs zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 04/17] hub: Check that hubs are configured correctly zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 05/17] net: Drop vlan argument to qemu_new_net_client() zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 06/17] net: Remove vlan qdev property zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 07/17] net: Remove vlan code from net.c zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 08/17] net: Remove VLANState zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 09/17] net: Rename non_vlan_clients to net_clients zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 10/17] net: Rename VLANClientState to NetClientState zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 11/17] net: Rename vc local variables to nc zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 12/17] net: Rename qemu_del_vlan_client() to qemu_del_net_client() zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 13/17] net: Make "info network" output more readable info zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 14/17] net: cleanup deliver/deliver_iov func pointers zwu.kernel
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 15/17] net: determine if packets can be sent before net queue deliver packets zwu.kernel
2012-06-20  9:42 ` zwu.kernel [this message]
2012-06-20  9:42 ` [Qemu-devel] [PATCH v6 17/17] net: roll back qdev_prop_vlan zwu.kernel
2012-06-21 13:14 ` [Qemu-devel] [PATCH v6 00/17] hub-based networking patchset Stefan Hajnoczi
2012-06-24 15:11   ` Zhi Yong Wu
2012-07-19 15:40     ` Stefan Hajnoczi
2012-07-19 15:41       ` Paolo Bonzini
2012-07-19 15:48         ` Zhi Yong Wu
2012-07-19 15:49           ` Paolo Bonzini
2012-07-19 15:57             ` Zhi Yong Wu
2012-07-19 16:08               ` Paolo Bonzini
2012-07-19 16:16                 ` Zhi Yong Wu
2012-07-19 15:48         ` Stefan Hajnoczi
2012-07-19 18:04           ` Laszlo Ersek
2012-07-20  5:16             ` Stefan Hajnoczi
2012-07-20  6:03               ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340185341-30803-17-git-send-email-zwu.kernel@gmail.com \
    --to=zwu.kernel@gmail.com \
    --cc=aliguori@us.ibm.com \
    --cc=jan.kiszka@siemens.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@linux.vnet.ibm.com \
    --cc=wuzhy@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).