Most notably this includes virtio cross-endian patches. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVg+xdAAoJECgfDbjSjVRp6AAH/3ILznMtvJZjQ/WOjLEsL13M +0cYEM1LI6LbLhqeruQVVcY9/hx61yHxZMoLkVg/I2po7F4HDNI2vo5Y7eGx+xN0 5rlcAw9/ZQ6SkCVmjN/VZfISW5mSqCaKH8gNzu8AigjsryJSj5iDXv1YJimwsF+5 cgCerhLIVvEkXmNj1ChwR+fz1IgFzJ8TRaZ0N2glxLyVjgKS57diqZF3Rbg2DdQl BPbekbbtxesPgmKRvtarbhjx26TlnP1YShjhWA5r72gBNlqblLDycpaIGXr34b3a sLIZjxzQtTEGcaGtkifMgazyK3rY3JmzOshD0onFOWY1r6Abxuj7eTZOEE6JQXk= =tju/ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio, pci fixes, enhancements Most notably this includes virtio cross-endian patches. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Fri Jun 19 11:18:05 2015 BST using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: vhost: enable vhost without without MSI-X pci: Don't register a specialized 'config_write' if default behavior is intended hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf() vhost_net: re-enable when cross endian vhost-net: tell tap backend about the vnet endianness tap: fix non-linux build tap: add VNET_LE/VNET_BE operations vhost: set vring endianness for legacy virtio virtio: introduce virtio_legacy_is_cross_endian() linux-headers: sync vhost.h vhost-user: part of virtio Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
			
				
	
	
		
			260 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			260 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * vhost-user.c
 | 
						|
 *
 | 
						|
 * Copyright (c) 2013 Virtual Open Systems Sarl.
 | 
						|
 *
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include "clients.h"
 | 
						|
#include "net/vhost_net.h"
 | 
						|
#include "net/vhost-user.h"
 | 
						|
#include "sysemu/char.h"
 | 
						|
#include "qemu/config-file.h"
 | 
						|
#include "qemu/error-report.h"
 | 
						|
 | 
						|
typedef struct VhostUserState {
 | 
						|
    NetClientState nc;
 | 
						|
    CharDriverState *chr;
 | 
						|
    VHostNetState *vhost_net;
 | 
						|
} VhostUserState;
 | 
						|
 | 
						|
typedef struct VhostUserChardevProps {
 | 
						|
    bool is_socket;
 | 
						|
    bool is_unix;
 | 
						|
    bool is_server;
 | 
						|
} VhostUserChardevProps;
 | 
						|
 | 
						|
VHostNetState *vhost_user_get_vhost_net(NetClientState *nc)
 | 
						|
{
 | 
						|
    VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc);
 | 
						|
    assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
 | 
						|
    return s->vhost_net;
 | 
						|
}
 | 
						|
 | 
						|
static int vhost_user_running(VhostUserState *s)
 | 
						|
{
 | 
						|
    return (s->vhost_net) ? 1 : 0;
 | 
						|
}
 | 
						|
 | 
						|
static int vhost_user_start(VhostUserState *s)
 | 
						|
{
 | 
						|
    VhostNetOptions options;
 | 
						|
 | 
						|
    if (vhost_user_running(s)) {
 | 
						|
        return 0;
 | 
						|
    }
 | 
						|
 | 
						|
    options.backend_type = VHOST_BACKEND_TYPE_USER;
 | 
						|
    options.net_backend = &s->nc;
 | 
						|
    options.opaque = s->chr;
 | 
						|
 | 
						|
    s->vhost_net = vhost_net_init(&options);
 | 
						|
 | 
						|
    return vhost_user_running(s) ? 0 : -1;
 | 
						|
}
 | 
						|
 | 
						|
static void vhost_user_stop(VhostUserState *s)
 | 
						|
{
 | 
						|
    if (vhost_user_running(s)) {
 | 
						|
        vhost_net_cleanup(s->vhost_net);
 | 
						|
    }
 | 
						|
 | 
						|
    s->vhost_net = 0;
 | 
						|
}
 | 
						|
 | 
						|
static void vhost_user_cleanup(NetClientState *nc)
 | 
						|
{
 | 
						|
    VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc);
 | 
						|
 | 
						|
    vhost_user_stop(s);
 | 
						|
    qemu_purge_queued_packets(nc);
 | 
						|
}
 | 
						|
 | 
						|
static bool vhost_user_has_vnet_hdr(NetClientState *nc)
 | 
						|
{
 | 
						|
    assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
 | 
						|
 | 
						|
    return true;
 | 
						|
}
 | 
						|
 | 
						|
static bool vhost_user_has_ufo(NetClientState *nc)
 | 
						|
{
 | 
						|
    assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
 | 
						|
 | 
						|
    return true;
 | 
						|
}
 | 
						|
 | 
						|
static NetClientInfo net_vhost_user_info = {
 | 
						|
        .type = NET_CLIENT_OPTIONS_KIND_VHOST_USER,
 | 
						|
        .size = sizeof(VhostUserState),
 | 
						|
        .cleanup = vhost_user_cleanup,
 | 
						|
        .has_vnet_hdr = vhost_user_has_vnet_hdr,
 | 
						|
        .has_ufo = vhost_user_has_ufo,
 | 
						|
};
 | 
						|
 | 
						|
static void net_vhost_link_down(VhostUserState *s, bool link_down)
 | 
						|
{
 | 
						|
    s->nc.link_down = link_down;
 | 
						|
 | 
						|
    if (s->nc.peer) {
 | 
						|
        s->nc.peer->link_down = link_down;
 | 
						|
    }
 | 
						|
 | 
						|
    if (s->nc.info->link_status_changed) {
 | 
						|
        s->nc.info->link_status_changed(&s->nc);
 | 
						|
    }
 | 
						|
 | 
						|
    if (s->nc.peer && s->nc.peer->info->link_status_changed) {
 | 
						|
        s->nc.peer->info->link_status_changed(s->nc.peer);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void net_vhost_user_event(void *opaque, int event)
 | 
						|
{
 | 
						|
    VhostUserState *s = opaque;
 | 
						|
 | 
						|
    switch (event) {
 | 
						|
    case CHR_EVENT_OPENED:
 | 
						|
        vhost_user_start(s);
 | 
						|
        net_vhost_link_down(s, false);
 | 
						|
        error_report("chardev \"%s\" went up", s->nc.info_str);
 | 
						|
        break;
 | 
						|
    case CHR_EVENT_CLOSED:
 | 
						|
        net_vhost_link_down(s, true);
 | 
						|
        vhost_user_stop(s);
 | 
						|
        error_report("chardev \"%s\" went down", s->nc.info_str);
 | 
						|
        break;
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static int net_vhost_user_init(NetClientState *peer, const char *device,
 | 
						|
                               const char *name, CharDriverState *chr,
 | 
						|
                               uint32_t queues)
 | 
						|
{
 | 
						|
    NetClientState *nc;
 | 
						|
    VhostUserState *s;
 | 
						|
    int i;
 | 
						|
 | 
						|
    for (i = 0; i < queues; i++) {
 | 
						|
        nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
 | 
						|
 | 
						|
        snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
 | 
						|
                 i, chr->label);
 | 
						|
 | 
						|
        s = DO_UPCAST(VhostUserState, nc, nc);
 | 
						|
 | 
						|
        /* We don't provide a receive callback */
 | 
						|
        s->nc.receive_disabled = 1;
 | 
						|
        s->chr = chr;
 | 
						|
        s->nc.queue_index = i;
 | 
						|
 | 
						|
        qemu_chr_add_handlers(s->chr, NULL, NULL, net_vhost_user_event, s);
 | 
						|
    }
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static int net_vhost_chardev_opts(void *opaque,
 | 
						|
                                  const char *name, const char *value,
 | 
						|
                                  Error **errp)
 | 
						|
{
 | 
						|
    VhostUserChardevProps *props = opaque;
 | 
						|
 | 
						|
    if (strcmp(name, "backend") == 0 && strcmp(value, "socket") == 0) {
 | 
						|
        props->is_socket = true;
 | 
						|
    } else if (strcmp(name, "path") == 0) {
 | 
						|
        props->is_unix = true;
 | 
						|
    } else if (strcmp(name, "server") == 0) {
 | 
						|
        props->is_server = true;
 | 
						|
    } else {
 | 
						|
        error_setg(errp,
 | 
						|
                   "vhost-user does not support a chardev with option %s=%s",
 | 
						|
                   name, value);
 | 
						|
        return -1;
 | 
						|
    }
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
static CharDriverState *net_vhost_parse_chardev(
 | 
						|
    const NetdevVhostUserOptions *opts, Error **errp)
 | 
						|
{
 | 
						|
    CharDriverState *chr = qemu_chr_find(opts->chardev);
 | 
						|
    VhostUserChardevProps props;
 | 
						|
 | 
						|
    if (chr == NULL) {
 | 
						|
        error_setg(errp, "chardev \"%s\" not found", opts->chardev);
 | 
						|
        return NULL;
 | 
						|
    }
 | 
						|
 | 
						|
    /* inspect chardev opts */
 | 
						|
    memset(&props, 0, sizeof(props));
 | 
						|
    if (qemu_opt_foreach(chr->opts, net_vhost_chardev_opts, &props, errp)) {
 | 
						|
        return NULL;
 | 
						|
    }
 | 
						|
 | 
						|
    if (!props.is_socket || !props.is_unix) {
 | 
						|
        error_setg(errp, "chardev \"%s\" is not a unix socket",
 | 
						|
                   opts->chardev);
 | 
						|
        return NULL;
 | 
						|
    }
 | 
						|
 | 
						|
    qemu_chr_fe_claim_no_fail(chr);
 | 
						|
 | 
						|
    return chr;
 | 
						|
}
 | 
						|
 | 
						|
static int net_vhost_check_net(void *opaque, QemuOpts *opts, Error **errp)
 | 
						|
{
 | 
						|
    const char *name = opaque;
 | 
						|
    const char *driver, *netdev;
 | 
						|
    const char virtio_name[] = "virtio-net-";
 | 
						|
 | 
						|
    driver = qemu_opt_get(opts, "driver");
 | 
						|
    netdev = qemu_opt_get(opts, "netdev");
 | 
						|
 | 
						|
    if (!driver || !netdev) {
 | 
						|
        return 0;
 | 
						|
    }
 | 
						|
 | 
						|
    if (strcmp(netdev, name) == 0 &&
 | 
						|
        strncmp(driver, virtio_name, strlen(virtio_name)) != 0) {
 | 
						|
        error_setg(errp, "vhost-user requires frontend driver virtio-net-*");
 | 
						|
        return -1;
 | 
						|
    }
 | 
						|
 | 
						|
    return 0;
 | 
						|
}
 | 
						|
 | 
						|
int net_init_vhost_user(const NetClientOptions *opts, const char *name,
 | 
						|
                        NetClientState *peer, Error **errp)
 | 
						|
{
 | 
						|
    uint32_t queues;
 | 
						|
    const NetdevVhostUserOptions *vhost_user_opts;
 | 
						|
    CharDriverState *chr;
 | 
						|
 | 
						|
    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
 | 
						|
    vhost_user_opts = opts->vhost_user;
 | 
						|
 | 
						|
    chr = net_vhost_parse_chardev(vhost_user_opts, errp);
 | 
						|
    if (!chr) {
 | 
						|
        return -1;
 | 
						|
    }
 | 
						|
 | 
						|
    /* verify net frontend */
 | 
						|
    if (qemu_opts_foreach(qemu_find_opts("device"), net_vhost_check_net,
 | 
						|
                          (char *)name, errp)) {
 | 
						|
        return -1;
 | 
						|
    }
 | 
						|
 | 
						|
    /* number of queues for multiqueue */
 | 
						|
    if (vhost_user_opts->has_queues) {
 | 
						|
        queues = vhost_user_opts->queues;
 | 
						|
    } else {
 | 
						|
        queues = 1;
 | 
						|
    }
 | 
						|
 | 
						|
    return net_vhost_user_init(peer, "vhost_user", name, chr, queues);
 | 
						|
}
 |