From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>,
qemu-devel@nongnu.org,
Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 17/19] hub: add the support for hub own flow control
Date: Wed, 1 Aug 2012 13:54:49 +0100 [thread overview]
Message-ID: <1343825691-343-18-git-send-email-stefanha@linux.vnet.ibm.com> (raw)
In-Reply-To: <1343825691-343-1-git-send-email-stefanha@linux.vnet.ibm.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-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
---
net/hub.c | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/net/hub.c b/net/hub.c
index 522fe99..ac157e3 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(int id)
@@ -85,6 +86,25 @@ static NetHub *net_hub_new(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_OPTIONS_KIND_HUBPORT,
.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.10.4
next prev parent reply other threads:[~2012-08-01 12:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-01 12:54 [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2 Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 01/19] net: Add interface to bridge when SIOCBRADDIF isn't available Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 02/19] net: Add a hub net client Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 03/19] net: Use hubs for the vlan feature Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 04/19] net: Look up 'vlan' net clients using hubs Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 05/19] hub: Check that hubs are configured correctly Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 06/19] net: Drop vlan argument to qemu_new_net_client() Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 07/19] net: Convert qdev_prop_vlan to peer with hub Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 08/19] net: Remove vlan code from net.c Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 09/19] net: Remove VLANState Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 10/19] net: Rename non_vlan_clients to net_clients Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 11/19] net: Rename VLANClientState to NetClientState Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 12/19] net: Rename vc local variables to nc Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 13/19] net: Rename qemu_del_vlan_client() to qemu_del_net_client() Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 14/19] net: Make "info network" output more readable info Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 15/19] net: cleanup deliver/deliver_iov func pointers Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 16/19] net: determine if packets can be sent before net queue deliver packets Stefan Hajnoczi
2012-08-01 12:54 ` Stefan Hajnoczi [this message]
2012-08-01 12:54 ` [Qemu-devel] [PATCH 18/19] net: fix the coding style Stefan Hajnoczi
2012-08-01 12:54 ` [Qemu-devel] [PATCH 19/19] net: add the support for -netdev socket, listen Stefan Hajnoczi
2012-08-03 20:44 ` [Qemu-devel] [PULL 00/19] Net patches for QEMU 1.2 Anthony Liguori
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=1343825691-343-18-git-send-email-stefanha@linux.vnet.ibm.com \
--to=stefanha@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
--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).