OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Add a hub net client 

The vlan feature can be implemented in terms of hubs.  By introducing a
hub net client it becomes possible to remove the special case vlan code
from net.c and push the vlan feature out of generic networking code.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2012-07-24 16:35:04 +01:00
parent 34309d2b12
commit f6c874e300
5 changed files with 282 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net.c
View File

@ -30,6 +30,7 @@
#include "net/dump.h"
#include "net/slirp.h"
#include "net/vde.h"
#include "net/hub.h"
#include "net/util.h"
#include "monitor.h"
#include "qemu-common.h"
@ -816,19 +817,20 @@ static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND_MAX])(
const NetClientOptions *opts,
const char *name,
VLANState *vlan) = {
[NET_CLIENT_OPTIONS_KIND_NIC] = net_init_nic,
[NET_CLIENT_OPTIONS_KIND_NIC] = net_init_nic,
#ifdef CONFIG_SLIRP
[NET_CLIENT_OPTIONS_KIND_USER] = net_init_slirp,
[NET_CLIENT_OPTIONS_KIND_USER] = net_init_slirp,
#endif
[NET_CLIENT_OPTIONS_KIND_TAP] = net_init_tap,
[NET_CLIENT_OPTIONS_KIND_SOCKET] = net_init_socket,
[NET_CLIENT_OPTIONS_KIND_TAP] = net_init_tap,
[NET_CLIENT_OPTIONS_KIND_SOCKET] = net_init_socket,
#ifdef CONFIG_VDE
[NET_CLIENT_OPTIONS_KIND_VDE] = net_init_vde,
[NET_CLIENT_OPTIONS_KIND_VDE] = net_init_vde,
#endif
[NET_CLIENT_OPTIONS_KIND_DUMP] = net_init_dump,
[NET_CLIENT_OPTIONS_KIND_DUMP] = net_init_dump,
#ifdef CONFIG_NET_BRIDGE
[NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge,
[NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge,
#endif
[NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport,
};
@ -858,6 +860,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
#ifdef CONFIG_NET_BRIDGE
case NET_CLIENT_OPTIONS_KIND_BRIDGE:
#endif
case NET_CLIENT_OPTIONS_KIND_HUBPORT:
break;
default:

2
net/Makefile.objs
View File

@ -1,4 +1,4 @@
common-obj-y = queue.o checksum.o util.o
common-obj-y = queue.o checksum.o util.o hub.o
common-obj-y += socket.o
common-obj-y += dump.o
common-obj-$(CONFIG_POSIX) += tap.o

223
net/hub.c Normal file
View File

@ -0,0 +1,223 @@
/*
* Hub net client
*
* Copyright IBM, Corp. 2012
*
* Authors:
* Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
*
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
* See the COPYING.LIB file in the top-level directory.
*
*/
#include "monitor.h"
#include "net.h"
#include "hub.h"
/*
* A hub broadcasts incoming packets to all its ports except the source port.
* Hubs can be used to provide independent network segments, also confusingly
* named the QEMU 'vlan' feature.
*/
typedef struct NetHub NetHub;
typedef struct NetHubPort {
VLANClientState nc;
QLIST_ENTRY(NetHubPort) next;
NetHub *hub;
int id;
} NetHubPort;
struct NetHub {
int id;
QLIST_ENTRY(NetHub) next;
int num_ports;
QLIST_HEAD(, NetHubPort) ports;
};
static QLIST_HEAD(, NetHub) hubs = QLIST_HEAD_INITIALIZER(&hubs);
static ssize_t net_hub_receive(NetHub *hub, NetHubPort *source_port,
const uint8_t *buf, size_t len)
{
NetHubPort *port;
QLIST_FOREACH(port, &hub->ports, next) {
if (port == source_port) {
continue;
}
qemu_send_packet(&port->nc, buf, len);
}
return len;
}
static ssize_t net_hub_receive_iov(NetHub *hub, NetHubPort *source_port,
const struct iovec *iov, int iovcnt)
{
NetHubPort *port;
ssize_t ret = 0;
QLIST_FOREACH(port, &hub->ports, next) {
if (port == source_port) {
continue;
}
ret = qemu_sendv_packet(&port->nc, iov, iovcnt);
}
return ret;
}
static NetHub *net_hub_new(int id)
{
NetHub *hub;
hub = g_malloc(sizeof(*hub));
hub->id = id;
hub->num_ports = 0;
QLIST_INIT(&hub->ports);
QLIST_INSERT_HEAD(&hubs, hub, next);
return hub;
}
static ssize_t net_hub_port_receive(VLANClientState *nc,
const uint8_t *buf, size_t len)
{
NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc);
return net_hub_receive(port->hub, port, buf, len);
}
static ssize_t net_hub_port_receive_iov(VLANClientState *nc,
const struct iovec *iov, int iovcnt)
{
NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc);
return net_hub_receive_iov(port->hub, port, iov, iovcnt);
}
static void net_hub_port_cleanup(VLANClientState *nc)
{
NetHubPort *port = DO_UPCAST(NetHubPort, nc, nc);
QLIST_REMOVE(port, next);
}
static NetClientInfo net_hub_port_info = {
.type = NET_CLIENT_OPTIONS_KIND_HUBPORT,
.size = sizeof(NetHubPort),
.receive = net_hub_port_receive,
.receive_iov = net_hub_port_receive_iov,
.cleanup = net_hub_port_cleanup,
};
static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
{
VLANClientState *nc;
NetHubPort *port;
int id = hub->num_ports++;
char default_name[128];
if (!name) {
snprintf(default_name, sizeof(default_name),
"hub%dport%d", hub->id, id);
name = default_name;
}
nc = qemu_new_net_client(&net_hub_port_info, NULL, NULL, "hub", name);
port = DO_UPCAST(NetHubPort, nc, nc);
port->id = id;
port->hub = hub;
QLIST_INSERT_HEAD(&hub->ports, port, next);
return port;
}
/**
* Create a port on a given hub
* @name: Net client name or NULL for default name.
*
* If there is no existing hub with the given id then a new hub is created.
*/
VLANClientState *net_hub_add_port(int hub_id, const char *name)
{
NetHub *hub;
NetHubPort *port;
QLIST_FOREACH(hub, &hubs, next) {
if (hub->id == hub_id) {
break;
}
}
if (!hub) {
hub = net_hub_new(hub_id);
}
port = net_hub_port_new(hub, name);
return &port->nc;
}
/**
* Print hub configuration
*/
void net_hub_info(Monitor *mon)
{
NetHub *hub;
NetHubPort *port;
QLIST_FOREACH(hub, &hubs, next) {
monitor_printf(mon, "hub %d\n", hub->id);
QLIST_FOREACH(port, &hub->ports, next) {
monitor_printf(mon, " port %d peer %s\n", port->id,
port->nc.peer ? port->nc.peer->name : "<none>");
}
}
}
/**
* Get the hub id that a client is connected to
*
* @id Pointer for hub id output, may be NULL
*/
int net_hub_id_for_client(VLANClientState *nc, int *id)
{
NetHubPort *port;
if (nc->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
port = DO_UPCAST(NetHubPort, nc, nc);
} else if (nc->peer != NULL && nc->peer->info->type ==
NET_CLIENT_OPTIONS_KIND_HUBPORT) {
port = DO_UPCAST(NetHubPort, nc, nc->peer);
} else {
return -ENOENT;
}
if (id) {
*id = port->hub->id;
}
return 0;
}
int net_init_hubport(const NetClientOptions *opts, const char *name,
VLANState *vlan)
{
const NetdevHubPortOptions *hubport;
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT);
hubport = opts->hubport;
/* The hub is a "vlan" so this option makes no sense. */
if (vlan) {
return -EINVAL;
}
net_hub_add_port(hubport->hubid, name);
return 0;
}

26
net/hub.h Normal file
View File

@ -0,0 +1,26 @@
/*
* Hub net client
*
* Copyright IBM, Corp. 2012
*
* Authors:
* Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
* Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
*
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
* See the COPYING.LIB file in the top-level directory.
*
*/
#ifndef NET_HUB_H
#define NET_HUB_H
#include "qemu-common.h"
int net_init_hubport(const NetClientOptions *opts, const char *name,
VLANState *vlan);
VLANClientState *net_hub_add_port(int hub_id, const char *name);
void net_hub_info(Monitor *mon);
int net_hub_id_for_client(VLANClientState *nc, int *id);
#endif /* NET_HUB_H */

30
qapi-schema.json
View File

@ -2093,6 +2093,19 @@
'*br': 'str',
'*helper': 'str' } }
##
# @NetdevHubPortOptions
#
# Connect two or more net clients through a software hub.
#
# @hubid: hub identifier number
#
# Since 1.2
##
{ 'type': 'NetdevHubPortOptions',
'data': {
'hubid': 'int32' } }
##
# @NetClientOptions
#
@ -2102,14 +2115,15 @@
##
{ 'union': 'NetClientOptions',
'data': {
'none': 'NetdevNoneOptions',
'nic': 'NetLegacyNicOptions',
'user': 'NetdevUserOptions',
'tap': 'NetdevTapOptions',
'socket': 'NetdevSocketOptions',
'vde': 'NetdevVdeOptions',
'dump': 'NetdevDumpOptions',
'bridge': 'NetdevBridgeOptions' } }
'none': 'NetdevNoneOptions',
'nic': 'NetLegacyNicOptions',
'user': 'NetdevUserOptions',
'tap': 'NetdevTapOptions',
'socket': 'NetdevSocketOptions',
'vde': 'NetdevVdeOptions',
'dump': 'NetdevDumpOptions',
'bridge': 'NetdevBridgeOptions',
'hubport': 'NetdevHubPortOptions' } }
##
# @NetLegacy