2009-10-22 16:49:07 +00:00
|
|
|
/*
|
|
|
|
* QEMU System Emulator
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
|
|
* Copyright (c) 2009 Red Hat, Inc.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2012-10-24 06:43:34 +00:00
|
|
|
#include "tap_int.h"
|
2009-10-22 16:49:07 +00:00
|
|
|
|
|
|
|
#include "config-host.h"
|
|
|
|
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <sys/wait.h>
|
2009-10-30 21:27:00 +00:00
|
|
|
#include <sys/socket.h>
|
2009-10-22 16:49:07 +00:00
|
|
|
#include <net/if.h>
|
|
|
|
|
2012-10-24 06:43:34 +00:00
|
|
|
#include "net/net.h"
|
2012-09-17 16:43:51 +00:00
|
|
|
#include "clients.h"
|
2012-12-17 17:19:49 +00:00
|
|
|
#include "monitor/monitor.h"
|
2012-12-17 17:20:04 +00:00
|
|
|
#include "sysemu/sysemu.h"
|
2009-10-22 16:49:07 +00:00
|
|
|
#include "qemu-common.h"
|
2012-12-17 17:20:00 +00:00
|
|
|
#include "qemu/error-report.h"
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2012-10-24 06:43:34 +00:00
|
|
|
#include "net/tap.h"
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2013-02-05 16:06:20 +00:00
|
|
|
#include "net/vhost_net.h"
|
2010-03-17 11:08:24 +00:00
|
|
|
|
2009-10-22 16:49:07 +00:00
|
|
|
typedef struct TAPState {
|
2012-07-24 15:35:13 +00:00
|
|
|
NetClientState nc;
|
2009-10-22 16:49:07 +00:00
|
|
|
int fd;
|
|
|
|
char down_script[1024];
|
|
|
|
char down_script_arg[128];
|
2013-03-18 18:43:44 +00:00
|
|
|
uint8_t buf[NET_BUFSIZE];
|
2013-01-30 11:12:20 +00:00
|
|
|
bool read_poll;
|
|
|
|
bool write_poll;
|
|
|
|
bool using_vnet_hdr;
|
|
|
|
bool has_ufo;
|
2013-01-30 11:12:32 +00:00
|
|
|
bool enabled;
|
2010-03-17 11:08:24 +00:00
|
|
|
VHostNetState *vhost_net;
|
2010-07-13 14:55:31 +00:00
|
|
|
unsigned host_vnet_hdr_len;
|
2009-10-22 16:49:07 +00:00
|
|
|
} TAPState;
|
|
|
|
|
|
|
|
static int launch_script(const char *setup_script, const char *ifname, int fd);
|
|
|
|
|
|
|
|
static int tap_can_send(void *opaque);
|
|
|
|
static void tap_send(void *opaque);
|
|
|
|
static void tap_writable(void *opaque);
|
|
|
|
|
|
|
|
static void tap_update_fd_handler(TAPState *s)
|
|
|
|
{
|
|
|
|
qemu_set_fd_handler2(s->fd,
|
2013-01-30 11:12:32 +00:00
|
|
|
s->read_poll && s->enabled ? tap_can_send : NULL,
|
|
|
|
s->read_poll && s->enabled ? tap_send : NULL,
|
|
|
|
s->write_poll && s->enabled ? tap_writable : NULL,
|
2009-10-22 16:49:07 +00:00
|
|
|
s);
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
static void tap_read_poll(TAPState *s, bool enable)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2013-01-30 11:12:20 +00:00
|
|
|
s->read_poll = enable;
|
2009-10-22 16:49:07 +00:00
|
|
|
tap_update_fd_handler(s);
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
static void tap_write_poll(TAPState *s, bool enable)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2013-01-30 11:12:20 +00:00
|
|
|
s->write_poll = enable;
|
2009-10-22 16:49:07 +00:00
|
|
|
tap_update_fd_handler(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tap_writable(void *opaque)
|
|
|
|
{
|
|
|
|
TAPState *s = opaque;
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_write_poll(s, false);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2009-11-25 18:49:04 +00:00
|
|
|
qemu_flush_queued_packets(&s->nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static ssize_t tap_write_packet(TAPState *s, const struct iovec *iov, int iovcnt)
|
|
|
|
{
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
do {
|
|
|
|
len = writev(s->fd, iov, iovcnt);
|
|
|
|
} while (len == -1 && errno == EINTR);
|
|
|
|
|
|
|
|
if (len == -1 && errno == EAGAIN) {
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_write_poll(s, true);
|
2009-10-22 16:49:07 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static ssize_t tap_receive_iov(NetClientState *nc, const struct iovec *iov,
|
2009-10-22 16:49:07 +00:00
|
|
|
int iovcnt)
|
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
const struct iovec *iovp = iov;
|
|
|
|
struct iovec iov_copy[iovcnt + 1];
|
2010-07-13 14:55:31 +00:00
|
|
|
struct virtio_net_hdr_mrg_rxbuf hdr = { };
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2010-07-13 14:55:31 +00:00
|
|
|
if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
|
2009-10-22 16:49:07 +00:00
|
|
|
iov_copy[0].iov_base = &hdr;
|
2010-07-13 14:55:31 +00:00
|
|
|
iov_copy[0].iov_len = s->host_vnet_hdr_len;
|
2009-10-22 16:49:07 +00:00
|
|
|
memcpy(&iov_copy[1], iov, iovcnt * sizeof(*iov));
|
|
|
|
iovp = iov_copy;
|
|
|
|
iovcnt++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return tap_write_packet(s, iovp, iovcnt);
|
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static ssize_t tap_receive_raw(NetClientState *nc, const uint8_t *buf, size_t size)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
struct iovec iov[2];
|
|
|
|
int iovcnt = 0;
|
2010-07-13 14:55:31 +00:00
|
|
|
struct virtio_net_hdr_mrg_rxbuf hdr = { };
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2010-07-13 14:55:31 +00:00
|
|
|
if (s->host_vnet_hdr_len) {
|
2009-10-22 16:49:07 +00:00
|
|
|
iov[iovcnt].iov_base = &hdr;
|
2010-07-13 14:55:31 +00:00
|
|
|
iov[iovcnt].iov_len = s->host_vnet_hdr_len;
|
2009-10-22 16:49:07 +00:00
|
|
|
iovcnt++;
|
|
|
|
}
|
|
|
|
|
|
|
|
iov[iovcnt].iov_base = (char *)buf;
|
|
|
|
iov[iovcnt].iov_len = size;
|
|
|
|
iovcnt++;
|
|
|
|
|
|
|
|
return tap_write_packet(s, iov, iovcnt);
|
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
struct iovec iov[1];
|
|
|
|
|
2010-07-13 14:55:31 +00:00
|
|
|
if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
|
2009-11-25 18:49:04 +00:00
|
|
|
return tap_receive_raw(nc, buf, size);
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
iov[0].iov_base = (char *)buf;
|
|
|
|
iov[0].iov_len = size;
|
|
|
|
|
|
|
|
return tap_write_packet(s, iov, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tap_can_send(void *opaque)
|
|
|
|
{
|
|
|
|
TAPState *s = opaque;
|
|
|
|
|
2009-11-25 18:49:04 +00:00
|
|
|
return qemu_can_send_packet(&s->nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2009-10-22 16:49:09 +00:00
|
|
|
#ifndef __sun__
|
|
|
|
ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
|
|
|
return read(tapfd, buf, maxlen);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static void tap_send_completed(NetClientState *nc, ssize_t len)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_read_poll(s, true);
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void tap_send(void *opaque)
|
|
|
|
{
|
|
|
|
TAPState *s = opaque;
|
|
|
|
int size;
|
|
|
|
|
2009-10-27 18:16:39 +00:00
|
|
|
do {
|
|
|
|
uint8_t *buf = s->buf;
|
|
|
|
|
|
|
|
size = tap_read_packet(s->fd, s->buf, sizeof(s->buf));
|
|
|
|
if (size <= 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2010-07-13 14:55:31 +00:00
|
|
|
if (s->host_vnet_hdr_len && !s->using_vnet_hdr) {
|
|
|
|
buf += s->host_vnet_hdr_len;
|
|
|
|
size -= s->host_vnet_hdr_len;
|
2009-10-27 18:16:39 +00:00
|
|
|
}
|
|
|
|
|
2009-11-25 18:49:04 +00:00
|
|
|
size = qemu_send_packet_async(&s->nc, buf, size, tap_send_completed);
|
2009-10-27 18:16:39 +00:00
|
|
|
if (size == 0) {
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_read_poll(s, false);
|
2009-10-27 18:16:39 +00:00
|
|
|
}
|
2009-11-25 18:49:04 +00:00
|
|
|
} while (size > 0 && qemu_can_send_packet(&s->nc));
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
bool tap_has_ufo(NetClientState *nc)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
|
|
|
return s->has_ufo;
|
|
|
|
}
|
|
|
|
|
2014-02-06 16:02:15 +00:00
|
|
|
bool tap_has_vnet_hdr(NetClientState *nc)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2010-07-13 14:55:31 +00:00
|
|
|
return !!s->host_vnet_hdr_len;
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2014-02-06 16:02:15 +00:00
|
|
|
bool tap_has_vnet_hdr_len(NetClientState *nc, int len)
|
2010-07-16 08:16:06 +00:00
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2010-07-16 08:16:06 +00:00
|
|
|
|
2014-02-06 16:02:15 +00:00
|
|
|
return !!tap_probe_vnet_hdr_len(s->fd, len);
|
2010-07-16 08:16:06 +00:00
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
void tap_set_vnet_hdr_len(NetClientState *nc, int len)
|
2010-07-16 08:16:06 +00:00
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2010-07-16 08:16:06 +00:00
|
|
|
assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
|
|
|
|
len == sizeof(struct virtio_net_hdr));
|
|
|
|
|
|
|
|
tap_fd_set_vnet_hdr_len(s->fd, len);
|
|
|
|
s->host_vnet_hdr_len = len;
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
void tap_using_vnet_hdr(NetClientState *nc, bool using_vnet_hdr)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2010-07-13 14:55:31 +00:00
|
|
|
assert(!!s->host_vnet_hdr_len == using_vnet_hdr);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
|
|
|
s->using_vnet_hdr = using_vnet_hdr;
|
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
void tap_set_offload(NetClientState *nc, int csum, int tso4,
|
2009-10-22 16:49:07 +00:00
|
|
|
int tso6, int ecn, int ufo)
|
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2010-10-31 17:06:47 +00:00
|
|
|
if (s->fd < 0) {
|
|
|
|
return;
|
|
|
|
}
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2010-10-31 17:06:47 +00:00
|
|
|
tap_fd_set_offload(s->fd, csum, tso4, tso6, ecn, ufo);
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static void tap_cleanup(NetClientState *nc)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2009-11-25 18:49:04 +00:00
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2010-03-17 11:08:24 +00:00
|
|
|
if (s->vhost_net) {
|
|
|
|
vhost_net_cleanup(s->vhost_net);
|
2010-10-27 18:03:43 +00:00
|
|
|
s->vhost_net = NULL;
|
2010-03-17 11:08:24 +00:00
|
|
|
}
|
|
|
|
|
2009-11-25 18:49:04 +00:00
|
|
|
qemu_purge_queued_packets(nc);
|
2009-10-22 16:49:07 +00:00
|
|
|
|
|
|
|
if (s->down_script[0])
|
|
|
|
launch_script(s->down_script, s->down_script_arg, s->fd);
|
|
|
|
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_read_poll(s, false);
|
|
|
|
tap_write_poll(s, false);
|
2009-10-22 16:49:07 +00:00
|
|
|
close(s->fd);
|
2010-10-31 17:06:47 +00:00
|
|
|
s->fd = -1;
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static void tap_poll(NetClientState *nc, bool enable)
|
2009-12-24 12:46:29 +00:00
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
tap_read_poll(s, enable);
|
|
|
|
tap_write_poll(s, enable);
|
|
|
|
}
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
int tap_get_fd(NetClientState *nc)
|
2010-03-17 11:07:50 +00:00
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2010-03-17 11:07:50 +00:00
|
|
|
return s->fd;
|
|
|
|
}
|
|
|
|
|
2009-10-22 16:49:07 +00:00
|
|
|
/* fd support */
|
|
|
|
|
2009-11-25 18:49:04 +00:00
|
|
|
static NetClientInfo net_tap_info = {
|
2012-07-17 14:17:12 +00:00
|
|
|
.type = NET_CLIENT_OPTIONS_KIND_TAP,
|
2009-11-25 18:49:04 +00:00
|
|
|
.size = sizeof(TAPState),
|
|
|
|
.receive = tap_receive,
|
|
|
|
.receive_raw = tap_receive_raw,
|
|
|
|
.receive_iov = tap_receive_iov,
|
2009-12-24 12:46:29 +00:00
|
|
|
.poll = tap_poll,
|
2009-11-25 18:49:04 +00:00
|
|
|
.cleanup = tap_cleanup,
|
2014-02-06 16:02:17 +00:00
|
|
|
.has_ufo = tap_has_ufo,
|
|
|
|
.has_vnet_hdr = tap_has_vnet_hdr,
|
|
|
|
.has_vnet_hdr_len = tap_has_vnet_hdr_len,
|
|
|
|
.using_vnet_hdr = tap_using_vnet_hdr,
|
|
|
|
.set_offload = tap_set_offload,
|
|
|
|
.set_vnet_hdr_len = tap_set_vnet_hdr_len,
|
2009-11-25 18:49:04 +00:00
|
|
|
};
|
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
static TAPState *net_tap_fd_init(NetClientState *peer,
|
2009-10-22 16:49:07 +00:00
|
|
|
const char *model,
|
|
|
|
const char *name,
|
|
|
|
int fd,
|
|
|
|
int vnet_hdr)
|
|
|
|
{
|
2012-07-24 15:35:13 +00:00
|
|
|
NetClientState *nc;
|
2009-10-22 16:49:07 +00:00
|
|
|
TAPState *s;
|
|
|
|
|
2012-07-24 15:35:08 +00:00
|
|
|
nc = qemu_new_net_client(&net_tap_info, peer, model, name);
|
2009-11-25 18:49:04 +00:00
|
|
|
|
|
|
|
s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
|
2009-10-22 16:49:07 +00:00
|
|
|
s->fd = fd;
|
2010-07-13 14:55:31 +00:00
|
|
|
s->host_vnet_hdr_len = vnet_hdr ? sizeof(struct virtio_net_hdr) : 0;
|
2013-01-30 11:12:20 +00:00
|
|
|
s->using_vnet_hdr = false;
|
2009-10-22 16:49:16 +00:00
|
|
|
s->has_ufo = tap_probe_has_ufo(s->fd);
|
2013-01-30 11:12:32 +00:00
|
|
|
s->enabled = true;
|
2009-11-25 18:49:04 +00:00
|
|
|
tap_set_offload(&s->nc, 0, 0, 0, 0, 0);
|
2012-11-13 10:23:23 +00:00
|
|
|
/*
|
|
|
|
* Make sure host header length is set correctly in tap:
|
|
|
|
* it might have been modified by another instance of qemu.
|
|
|
|
*/
|
|
|
|
if (tap_probe_vnet_hdr_len(s->fd, s->host_vnet_hdr_len)) {
|
|
|
|
tap_fd_set_vnet_hdr_len(s->fd, s->host_vnet_hdr_len);
|
|
|
|
}
|
2013-01-30 11:12:20 +00:00
|
|
|
tap_read_poll(s, true);
|
2010-03-17 11:08:24 +00:00
|
|
|
s->vhost_net = NULL;
|
2009-10-22 16:49:07 +00:00
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int launch_script(const char *setup_script, const char *ifname, int fd)
|
|
|
|
{
|
|
|
|
int pid, status;
|
|
|
|
char *args[3];
|
|
|
|
char **parg;
|
|
|
|
|
|
|
|
/* try to launch network script */
|
|
|
|
pid = fork();
|
|
|
|
if (pid == 0) {
|
|
|
|
int open_max = sysconf(_SC_OPEN_MAX), i;
|
|
|
|
|
|
|
|
for (i = 0; i < open_max; i++) {
|
|
|
|
if (i != STDIN_FILENO &&
|
|
|
|
i != STDOUT_FILENO &&
|
|
|
|
i != STDERR_FILENO &&
|
|
|
|
i != fd) {
|
|
|
|
close(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
parg = args;
|
|
|
|
*parg++ = (char *)setup_script;
|
|
|
|
*parg++ = (char *)ifname;
|
2010-04-25 18:35:52 +00:00
|
|
|
*parg = NULL;
|
2009-10-22 16:49:07 +00:00
|
|
|
execv(setup_script, args);
|
|
|
|
_exit(1);
|
|
|
|
} else if (pid > 0) {
|
|
|
|
while (waitpid(pid, &status, 0) != pid) {
|
|
|
|
/* loop */
|
|
|
|
}
|
|
|
|
|
|
|
|
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fprintf(stderr, "%s: could not launch network script\n", setup_script);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
static int recv_fd(int c)
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
uint8_t msgbuf[CMSG_SPACE(sizeof(fd))];
|
|
|
|
struct msghdr msg = {
|
|
|
|
.msg_control = msgbuf,
|
|
|
|
.msg_controllen = sizeof(msgbuf),
|
|
|
|
};
|
|
|
|
struct cmsghdr *cmsg;
|
|
|
|
struct iovec iov;
|
|
|
|
uint8_t req[1];
|
|
|
|
ssize_t len;
|
|
|
|
|
|
|
|
cmsg = CMSG_FIRSTHDR(&msg);
|
|
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg->cmsg_type = SCM_RIGHTS;
|
|
|
|
cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
|
|
|
|
msg.msg_controllen = cmsg->cmsg_len;
|
|
|
|
|
|
|
|
iov.iov_base = req;
|
|
|
|
iov.iov_len = sizeof(req);
|
|
|
|
|
|
|
|
msg.msg_iov = &iov;
|
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
|
|
|
|
len = recvmsg(c, &msg, 0);
|
|
|
|
if (len > 0) {
|
|
|
|
memcpy(&fd, CMSG_DATA(cmsg), sizeof(fd));
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int net_bridge_run_helper(const char *helper, const char *bridge)
|
|
|
|
{
|
|
|
|
sigset_t oldmask, mask;
|
|
|
|
int pid, status;
|
|
|
|
char *args[5];
|
|
|
|
char **parg;
|
|
|
|
int sv[2];
|
|
|
|
|
|
|
|
sigemptyset(&mask);
|
|
|
|
sigaddset(&mask, SIGCHLD);
|
|
|
|
sigprocmask(SIG_BLOCK, &mask, &oldmask);
|
|
|
|
|
|
|
|
if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* try to launch bridge helper */
|
|
|
|
pid = fork();
|
|
|
|
if (pid == 0) {
|
|
|
|
int open_max = sysconf(_SC_OPEN_MAX), i;
|
|
|
|
char fd_buf[6+10];
|
|
|
|
char br_buf[6+IFNAMSIZ] = {0};
|
|
|
|
char helper_cmd[PATH_MAX + sizeof(fd_buf) + sizeof(br_buf) + 15];
|
|
|
|
|
|
|
|
for (i = 0; i < open_max; i++) {
|
|
|
|
if (i != STDIN_FILENO &&
|
|
|
|
i != STDOUT_FILENO &&
|
|
|
|
i != STDERR_FILENO &&
|
|
|
|
i != sv[1]) {
|
|
|
|
close(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
snprintf(fd_buf, sizeof(fd_buf), "%s%d", "--fd=", sv[1]);
|
|
|
|
|
|
|
|
if (strrchr(helper, ' ') || strrchr(helper, '\t')) {
|
|
|
|
/* assume helper is a command */
|
|
|
|
|
|
|
|
if (strstr(helper, "--br=") == NULL) {
|
|
|
|
snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=", bridge);
|
|
|
|
}
|
|
|
|
|
|
|
|
snprintf(helper_cmd, sizeof(helper_cmd), "%s %s %s %s",
|
|
|
|
helper, "--use-vnet", fd_buf, br_buf);
|
|
|
|
|
|
|
|
parg = args;
|
|
|
|
*parg++ = (char *)"sh";
|
|
|
|
*parg++ = (char *)"-c";
|
|
|
|
*parg++ = helper_cmd;
|
|
|
|
*parg++ = NULL;
|
|
|
|
|
|
|
|
execv("/bin/sh", args);
|
|
|
|
} else {
|
|
|
|
/* assume helper is just the executable path name */
|
|
|
|
|
|
|
|
snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=", bridge);
|
|
|
|
|
|
|
|
parg = args;
|
|
|
|
*parg++ = (char *)helper;
|
|
|
|
*parg++ = (char *)"--use-vnet";
|
|
|
|
*parg++ = fd_buf;
|
|
|
|
*parg++ = br_buf;
|
|
|
|
*parg++ = NULL;
|
|
|
|
|
|
|
|
execv(helper, args);
|
|
|
|
}
|
|
|
|
_exit(1);
|
|
|
|
|
|
|
|
} else if (pid > 0) {
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
close(sv[1]);
|
|
|
|
|
|
|
|
do {
|
|
|
|
fd = recv_fd(sv[0]);
|
|
|
|
} while (fd == -1 && errno == EINTR);
|
|
|
|
|
|
|
|
close(sv[0]);
|
|
|
|
|
|
|
|
while (waitpid(pid, &status, 0) != pid) {
|
|
|
|
/* loop */
|
|
|
|
}
|
|
|
|
sigprocmask(SIG_SETMASK, &oldmask, NULL);
|
|
|
|
if (fd < 0) {
|
|
|
|
fprintf(stderr, "failed to recv file descriptor\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (WIFEXITED(status) && WEXITSTATUS(status) == 0) {
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fprintf(stderr, "failed to launch bridge helper\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:21 +00:00
|
|
|
int net_init_bridge(const NetClientOptions *opts, const char *name,
|
2012-07-24 15:35:13 +00:00
|
|
|
NetClientState *peer)
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
{
|
2012-07-17 14:17:20 +00:00
|
|
|
const NetdevBridgeOptions *bridge;
|
|
|
|
const char *helper, *br;
|
|
|
|
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
TAPState *s;
|
|
|
|
int fd, vnet_hdr;
|
|
|
|
|
2012-07-17 14:17:20 +00:00
|
|
|
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_BRIDGE);
|
|
|
|
bridge = opts->bridge;
|
|
|
|
|
|
|
|
helper = bridge->has_helper ? bridge->helper : DEFAULT_BRIDGE_HELPER;
|
|
|
|
br = bridge->has_br ? bridge->br : DEFAULT_BRIDGE_INTERFACE;
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
|
2012-07-17 14:17:20 +00:00
|
|
|
fd = net_bridge_run_helper(helper, br);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
if (fd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFL, O_NONBLOCK);
|
|
|
|
|
|
|
|
vnet_hdr = tap_probe_vnet_hdr(fd);
|
|
|
|
|
2012-07-24 15:35:05 +00:00
|
|
|
s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
if (!s) {
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:20 +00:00
|
|
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
|
|
|
|
br);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:19 +00:00
|
|
|
static int net_tap_init(const NetdevTapOptions *tap, int *vnet_hdr,
|
|
|
|
const char *setup_script, char *ifname,
|
2013-01-30 11:12:34 +00:00
|
|
|
size_t ifname_sz, int mq_required)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
|
|
|
int fd, vnet_hdr_required;
|
|
|
|
|
2012-07-17 14:17:19 +00:00
|
|
|
if (tap->has_vnet_hdr) {
|
|
|
|
*vnet_hdr = tap->vnet_hdr;
|
2009-10-22 16:49:07 +00:00
|
|
|
vnet_hdr_required = *vnet_hdr;
|
|
|
|
} else {
|
2012-07-17 14:17:19 +00:00
|
|
|
*vnet_hdr = 1;
|
2009-10-22 16:49:07 +00:00
|
|
|
vnet_hdr_required = 0;
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
TFR(fd = tap_open(ifname, ifname_sz, vnet_hdr, vnet_hdr_required,
|
|
|
|
mq_required));
|
2009-10-22 16:49:07 +00:00
|
|
|
if (fd < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (setup_script &&
|
|
|
|
setup_script[0] != '\0' &&
|
|
|
|
strcmp(setup_script, "no") != 0 &&
|
|
|
|
launch_script(setup_script, ifname, fd)) {
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return fd;
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
#define MAX_TAP_QUEUES 1024
|
|
|
|
|
2013-01-30 11:12:30 +00:00
|
|
|
static int net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
|
|
|
|
const char *model, const char *name,
|
|
|
|
const char *ifname, const char *script,
|
|
|
|
const char *downscript, const char *vhostfdname,
|
|
|
|
int vnet_hdr, int fd)
|
|
|
|
{
|
|
|
|
TAPState *s;
|
|
|
|
|
|
|
|
s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
|
|
|
|
if (!s) {
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tap_set_sndbuf(s->fd, tap) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
if (tap->has_fd || tap->has_fds) {
|
2013-01-30 11:12:30 +00:00
|
|
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
|
|
|
|
} else if (tap->has_helper) {
|
|
|
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
|
|
|
|
tap->helper);
|
|
|
|
} else {
|
|
|
|
snprintf(s->nc.info_str, sizeof(s->nc.info_str),
|
|
|
|
"ifname=%s,script=%s,downscript=%s", ifname, script,
|
|
|
|
downscript);
|
|
|
|
|
|
|
|
if (strcmp(downscript, "no") != 0) {
|
|
|
|
snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
|
|
|
|
snprintf(s->down_script_arg, sizeof(s->down_script_arg),
|
|
|
|
"%s", ifname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tap->has_vhost ? tap->vhost :
|
|
|
|
vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
|
|
|
|
int vhostfd;
|
|
|
|
|
2013-04-19 07:11:15 +00:00
|
|
|
if (tap->has_vhostfd || tap->has_vhostfds) {
|
2013-01-30 11:12:30 +00:00
|
|
|
vhostfd = monitor_handle_fd_param(cur_mon, vhostfdname);
|
|
|
|
if (vhostfd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
vhostfd = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
s->vhost_net = vhost_net_init(&s->nc, vhostfd,
|
|
|
|
tap->has_vhostforce && tap->vhostforce);
|
|
|
|
if (!s->vhost_net) {
|
|
|
|
error_report("vhost-net requested but could not be initialized");
|
|
|
|
return -1;
|
|
|
|
}
|
2013-01-30 11:12:34 +00:00
|
|
|
} else if (tap->has_vhostfd || tap->has_vhostfds) {
|
2013-01-30 11:12:30 +00:00
|
|
|
error_report("vhostfd= is not valid without vhost");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
static int get_fds(char *str, char *fds[], int max)
|
|
|
|
{
|
|
|
|
char *ptr = str, *this;
|
|
|
|
size_t len = strlen(str);
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
while (i < max && ptr < str + len) {
|
|
|
|
this = strchr(ptr, ':');
|
|
|
|
|
|
|
|
if (this == NULL) {
|
|
|
|
fds[i] = g_strdup(ptr);
|
|
|
|
} else {
|
|
|
|
fds[i] = g_strndup(ptr, this - ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
|
|
|
if (this == NULL) {
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
ptr = this + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:21 +00:00
|
|
|
int net_init_tap(const NetClientOptions *opts, const char *name,
|
2012-07-24 15:35:13 +00:00
|
|
|
NetClientState *peer)
|
2009-10-22 16:49:07 +00:00
|
|
|
{
|
2012-07-17 14:17:19 +00:00
|
|
|
const NetdevTapOptions *tap;
|
2013-01-30 11:12:34 +00:00
|
|
|
int fd, vnet_hdr = 0, i = 0, queues;
|
2012-07-17 14:17:19 +00:00
|
|
|
/* for the no-fd, no-helper case */
|
|
|
|
const char *script = NULL; /* suppress wrong "uninit'd use" gcc warning */
|
2013-01-30 11:12:30 +00:00
|
|
|
const char *downscript = NULL;
|
2013-01-30 11:12:34 +00:00
|
|
|
const char *vhostfdname;
|
2012-07-17 14:17:19 +00:00
|
|
|
char ifname[128];
|
|
|
|
|
|
|
|
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_TAP);
|
|
|
|
tap = opts->tap;
|
2013-01-30 11:12:34 +00:00
|
|
|
queues = tap->has_queues ? tap->queues : 1;
|
|
|
|
vhostfdname = tap->has_vhostfd ? tap->vhostfd : NULL;
|
2009-10-22 16:49:07 +00:00
|
|
|
|
2013-02-21 03:05:56 +00:00
|
|
|
/* QEMU vlans does not support multiqueue tap, in this case peer is set.
|
|
|
|
* For -netdev, peer is always NULL. */
|
|
|
|
if (peer && (tap->has_queues || tap->has_fds || tap->has_vhostfds)) {
|
2013-03-18 17:20:07 +00:00
|
|
|
error_report("Multiqueue tap cannot be used with QEMU vlans");
|
2013-02-21 03:05:56 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:19 +00:00
|
|
|
if (tap->has_fd) {
|
|
|
|
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
|
2013-01-30 11:12:34 +00:00
|
|
|
tap->has_vnet_hdr || tap->has_helper || tap->has_queues ||
|
2013-06-04 05:18:17 +00:00
|
|
|
tap->has_fds || tap->has_vhostfds) {
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
error_report("ifname=, script=, downscript=, vnet_hdr=, "
|
2013-06-04 05:18:17 +00:00
|
|
|
"helper=, queues=, fds=, and vhostfds= "
|
|
|
|
"are invalid with fd=");
|
2009-10-22 16:49:07 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-08-21 20:52:07 +00:00
|
|
|
fd = monitor_handle_fd_param(cur_mon, tap->fd);
|
2009-10-22 16:49:07 +00:00
|
|
|
if (fd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFL, O_NONBLOCK);
|
|
|
|
|
|
|
|
vnet_hdr = tap_probe_vnet_hdr(fd);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
|
2013-02-02 00:02:50 +00:00
|
|
|
if (net_init_tap_one(tap, peer, "tap", name, NULL,
|
2013-01-30 11:12:34 +00:00
|
|
|
script, downscript,
|
|
|
|
vhostfdname, vnet_hdr, fd)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else if (tap->has_fds) {
|
|
|
|
char *fds[MAX_TAP_QUEUES];
|
|
|
|
char *vhost_fds[MAX_TAP_QUEUES];
|
|
|
|
int nfds, nvhosts;
|
|
|
|
|
|
|
|
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
|
|
|
|
tap->has_vnet_hdr || tap->has_helper || tap->has_queues ||
|
2013-06-04 05:18:17 +00:00
|
|
|
tap->has_vhostfd) {
|
2013-01-30 11:12:34 +00:00
|
|
|
error_report("ifname=, script=, downscript=, vnet_hdr=, "
|
2013-06-04 05:18:17 +00:00
|
|
|
"helper=, queues=, and vhostfd= "
|
|
|
|
"are invalid with fds=");
|
2013-01-30 11:12:34 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
nfds = get_fds(tap->fds, fds, MAX_TAP_QUEUES);
|
|
|
|
if (tap->has_vhostfds) {
|
|
|
|
nvhosts = get_fds(tap->vhostfds, vhost_fds, MAX_TAP_QUEUES);
|
|
|
|
if (nfds != nvhosts) {
|
|
|
|
error_report("The number of fds passed does not match the "
|
|
|
|
"number of vhostfds passed");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < nfds; i++) {
|
|
|
|
fd = monitor_handle_fd_param(cur_mon, fds[i]);
|
|
|
|
if (fd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFL, O_NONBLOCK);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
if (i == 0) {
|
|
|
|
vnet_hdr = tap_probe_vnet_hdr(fd);
|
|
|
|
} else if (vnet_hdr != tap_probe_vnet_hdr(fd)) {
|
|
|
|
error_report("vnet_hdr not consistent across given tap fds");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (net_init_tap_one(tap, peer, "tap", name, ifname,
|
|
|
|
script, downscript,
|
|
|
|
tap->has_vhostfds ? vhost_fds[i] : NULL,
|
|
|
|
vnet_hdr, fd)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2012-07-17 14:17:19 +00:00
|
|
|
} else if (tap->has_helper) {
|
|
|
|
if (tap->has_ifname || tap->has_script || tap->has_downscript ||
|
2013-06-04 05:18:17 +00:00
|
|
|
tap->has_vnet_hdr || tap->has_queues || tap->has_vhostfds) {
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
error_report("ifname=, script=, downscript=, and vnet_hdr= "
|
2013-06-04 05:18:17 +00:00
|
|
|
"queues=, and vhostfds= are invalid with helper=");
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-07-17 14:17:19 +00:00
|
|
|
fd = net_bridge_run_helper(tap->helper, DEFAULT_BRIDGE_INTERFACE);
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
if (fd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
fcntl(fd, F_SETFL, O_NONBLOCK);
|
|
|
|
vnet_hdr = tap_probe_vnet_hdr(fd);
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
if (net_init_tap_one(tap, peer, "bridge", name, ifname,
|
|
|
|
script, downscript, vhostfdname,
|
|
|
|
vnet_hdr, fd)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2009-10-22 16:49:07 +00:00
|
|
|
} else {
|
2013-06-04 05:18:17 +00:00
|
|
|
if (tap->has_vhostfds) {
|
|
|
|
error_report("vhostfds= is invalid if fds= wasn't specified");
|
|
|
|
return -1;
|
|
|
|
}
|
2012-07-17 14:17:19 +00:00
|
|
|
script = tap->has_script ? tap->script : DEFAULT_NETWORK_SCRIPT;
|
2013-01-30 11:12:30 +00:00
|
|
|
downscript = tap->has_downscript ? tap->downscript :
|
|
|
|
DEFAULT_NETWORK_DOWN_SCRIPT;
|
2013-01-30 11:12:34 +00:00
|
|
|
|
|
|
|
if (tap->has_ifname) {
|
|
|
|
pstrcpy(ifname, sizeof ifname, tap->ifname);
|
|
|
|
} else {
|
|
|
|
ifname[0] = '\0';
|
2009-11-20 22:23:03 +00:00
|
|
|
}
|
Add support for net bridge
The most common use of -net tap is to connect a tap device to a bridge. This
requires the use of a script and running qemu as root in order to allocate a
tap device to pass to the script.
This model is great for portability and flexibility but it's incredibly
difficult to eliminate the need to run qemu as root. The only really viable
mechanism is to use tunctl to create a tap device, attach it to a bridge as
root, and then hand that tap device to qemu. The problem with this mechanism
is that it requires administrator intervention whenever a user wants to create
a guest.
By essentially writing a helper that implements the most common qemu-ifup
script that can be safely given cap_net_admin, we can dramatically simplify
things for non-privileged users. We still support existing -net tap options
as a mechanism for advanced users and backwards compatibility.
Currently, this is very Linux centric but there's really no reason why it
couldn't be extended for other Unixes.
A typical invocation would be similar to one of the following:
qemu linux.img -net bridge -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper"
-net nic,model=virtio
qemu linux.img -netdev bridge,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
The default bridge that we attach to is br0. The thinking is that a distro
could preconfigure such an interface to allow out-of-the-box bridged networking.
Alternatively, if a user wants to use a different bridge, a typical invocation
would be simliar to one of the following:
qemu linux.img -net bridge,br=qemubr0 -net nic,model=virtio
qemu linux.img -net tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0"
-net nic,model=virtio
qemu linux.img -netdev bridge,br=qemubr0,id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
qemu linux.img -netdev tap,helper="/usr/local/libexec/qemu-bridge-helper --br=qemubr0",id=hn0
-device virtio-net-pci,netdev=hn0,id=nic1
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Richa Marwaha <rmarwah@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2012-01-26 14:42:27 +00:00
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
for (i = 0; i < queues; i++) {
|
|
|
|
fd = net_tap_init(tap, &vnet_hdr, i >= 1 ? "no" : script,
|
|
|
|
ifname, sizeof ifname, queues > 1);
|
|
|
|
if (fd == -1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (queues > 1 && i == 0 && !tap->has_ifname) {
|
|
|
|
if (tap_fd_get_ifname(fd, ifname)) {
|
|
|
|
error_report("Fail to get ifname");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (net_init_tap_one(tap, peer, "tap", name, ifname,
|
|
|
|
i >= 1 ? "no" : script,
|
|
|
|
i >= 1 ? "no" : downscript,
|
|
|
|
vhostfdname, vnet_hdr, fd)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
|
|
|
|
2013-01-30 11:12:34 +00:00
|
|
|
return 0;
|
2009-10-22 16:49:07 +00:00
|
|
|
}
|
2010-03-17 11:08:38 +00:00
|
|
|
|
2012-07-24 15:35:13 +00:00
|
|
|
VHostNetState *tap_get_vhost_net(NetClientState *nc)
|
2010-03-17 11:08:38 +00:00
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
2012-07-17 14:17:12 +00:00
|
|
|
assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
|
2010-03-17 11:08:38 +00:00
|
|
|
return s->vhost_net;
|
|
|
|
}
|
2013-01-30 11:12:32 +00:00
|
|
|
|
|
|
|
int tap_enable(NetClientState *nc)
|
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (s->enabled) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
ret = tap_fd_enable(s->fd);
|
|
|
|
if (ret == 0) {
|
|
|
|
s->enabled = true;
|
|
|
|
tap_update_fd_handler(s);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int tap_disable(NetClientState *nc)
|
|
|
|
{
|
|
|
|
TAPState *s = DO_UPCAST(TAPState, nc, nc);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (s->enabled == 0) {
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
ret = tap_fd_disable(s->fd);
|
|
|
|
if (ret == 0) {
|
|
|
|
qemu_purge_queued_packets(nc);
|
|
|
|
s->enabled = false;
|
|
|
|
tap_update_fd_handler(s);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|