Commit 082b4061 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/input-20190513-v2-pull-request' into staging 



input: add vhost-user-input, virtio-input fixes.

# gpg: Signature made Mon 13 May 2019 07:52:39 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/input-20190513-v2-pull-request:
  virtio-input: fix Kconfig dependency and Makefile
  virtio-input-host-pci: cleanup types
  util: simplify unix_listen()
  Add vhost-user-input-pci
  Add vhost-user-backend
  libvhost-user: add PROTOCOL_F_CONFIG if {set, get}_config
  libvhost-user: fix -Waddress-of-packed-member

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 04d6556c 503591cb

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1485,6 +1485,8 @@ F: hw/*/*vhost* 
F: docs/interop/vhost-user.json

F: docs/interop/vhost-user.txt

F: contrib/vhost-user-*/

F: backends/vhost-user.c

F: include/sysemu/vhost-user-backend.h



virtio

M: Michael S. Tsirkin <mst@redhat.com>
@@ -1526,6 +1528,7 @@ L: qemu-s390x@nongnu.org 
virtio-input

M: Gerd Hoffmann <kraxel@redhat.com>

S: Maintained

F: hw/input/vhost-user-input.c

F: hw/input/virtio-input*.c

F: include/hw/virtio/virtio-input.h

backends/Makefile.objs

+2 −0
Original line number Diff line number Diff line
@@ -14,4 +14,6 @@ common-obj-y += cryptodev-vhost.o 
common-obj-$(CONFIG_VHOST_CRYPTO) += cryptodev-vhost-user.o

endif



common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o



common-obj-$(CONFIG_LINUX) += hostmem-memfd.o

backends/vhost-user.c

0 → 100644
+209 −0
Original line number Diff line number Diff line 
/*

 * QEMU vhost-user backend

 *

 * Copyright (C) 2018 Red Hat Inc

 *

 * Authors:

 *  Marc-André Lureau <marcandre.lureau@redhat.com>

 *

 * 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 "qemu/osdep.h"

#include "hw/qdev.h"

#include "qapi/error.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"

#include "qom/object_interfaces.h"

#include "sysemu/vhost-user-backend.h"

#include "sysemu/kvm.h"

#include "io/channel-command.h"

#include "hw/virtio/virtio-bus.h"



static bool

ioeventfd_enabled(void)

{

    return kvm_enabled() && kvm_eventfds_enabled();

}



int

vhost_user_backend_dev_init(VhostUserBackend *b, VirtIODevice *vdev,

                            unsigned nvqs, Error **errp)

{

    int ret;



    assert(!b->vdev && vdev);



    if (!ioeventfd_enabled()) {

        error_setg(errp, "vhost initialization failed: requires kvm");

        return -1;

    }



    if (!vhost_user_init(&b->vhost_user, &b->chr, errp)) {

        return -1;

    }



    b->vdev = vdev;

    b->dev.nvqs = nvqs;

    b->dev.vqs = g_new(struct vhost_virtqueue, nvqs);



    ret = vhost_dev_init(&b->dev, &b->vhost_user, VHOST_BACKEND_TYPE_USER, 0);

    if (ret < 0) {

        error_setg_errno(errp, -ret, "vhost initialization failed");

        return -1;

    }



    return 0;

}



void

vhost_user_backend_start(VhostUserBackend *b)

{

    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(b->vdev)));

    VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);

    int ret, i ;



    if (b->started) {

        return;

    }



    if (!k->set_guest_notifiers) {

        error_report("binding does not support guest notifiers");

        return;

    }



    ret = vhost_dev_enable_notifiers(&b->dev, b->vdev);

    if (ret < 0) {

        return;

    }



    ret = k->set_guest_notifiers(qbus->parent, b->dev.nvqs, true);

    if (ret < 0) {

        error_report("Error binding guest notifier");

        goto err_host_notifiers;

    }



    b->dev.acked_features = b->vdev->guest_features;

    ret = vhost_dev_start(&b->dev, b->vdev);

    if (ret < 0) {

        error_report("Error start vhost dev");

        goto err_guest_notifiers;

    }



    /* guest_notifier_mask/pending not used yet, so just unmask

     * everything here.  virtio-pci will do the right thing by

     * enabling/disabling irqfd.

     */

    for (i = 0; i < b->dev.nvqs; i++) {

        vhost_virtqueue_mask(&b->dev, b->vdev,

                             b->dev.vq_index + i, false);

    }



    b->started = true;

    return;



err_guest_notifiers:

    k->set_guest_notifiers(qbus->parent, b->dev.nvqs, false);

err_host_notifiers:

    vhost_dev_disable_notifiers(&b->dev, b->vdev);

}



void

vhost_user_backend_stop(VhostUserBackend *b)

{

    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(b->vdev)));

    VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);

    int ret = 0;



    if (!b->started) {

        return;

    }



    vhost_dev_stop(&b->dev, b->vdev);



    if (k->set_guest_notifiers) {

        ret = k->set_guest_notifiers(qbus->parent,

                                     b->dev.nvqs, false);

        if (ret < 0) {

            error_report("vhost guest notifier cleanup failed: %d", ret);

        }

    }

    assert(ret >= 0);



    vhost_dev_disable_notifiers(&b->dev, b->vdev);

    b->started = false;

}



static void set_chardev(Object *obj, const char *value, Error **errp)

{

    VhostUserBackend *b = VHOST_USER_BACKEND(obj);

    Chardev *chr;



    if (b->completed) {

        error_setg(errp, QERR_PERMISSION_DENIED);

        return;

    }



    g_free(b->chr_name);

    b->chr_name = g_strdup(value);



    chr = qemu_chr_find(b->chr_name);

    if (chr == NULL) {

        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,

                  "Chardev '%s' not found", b->chr_name);

        return;

    }



    if (!qemu_chr_fe_init(&b->chr, chr, errp)) {

        return;

    }



    b->completed = true;

    /* could call vhost_dev_init() so early message can be exchanged */

}



static char *get_chardev(Object *obj, Error **errp)

{

    VhostUserBackend *b = VHOST_USER_BACKEND(obj);

    Chardev *chr = qemu_chr_fe_get_driver(&b->chr);



    if (chr && chr->label) {

        return g_strdup(chr->label);

    }



    return NULL;

}



static void vhost_user_backend_init(Object *obj)

{

    object_property_add_str(obj, "chardev", get_chardev, set_chardev, NULL);

}



static void vhost_user_backend_finalize(Object *obj)

{

    VhostUserBackend *b = VHOST_USER_BACKEND(obj);



    g_free(b->dev.vqs);

    g_free(b->chr_name);



    vhost_user_cleanup(&b->vhost_user);

    qemu_chr_fe_deinit(&b->chr, true);

}



static const TypeInfo vhost_user_backend_info = {

    .name = TYPE_VHOST_USER_BACKEND,

    .parent = TYPE_OBJECT,

    .instance_size = sizeof(VhostUserBackend),

    .instance_init = vhost_user_backend_init,

    .instance_finalize = vhost_user_backend_finalize,

    .class_size = sizeof(VhostUserBackendClass),

};



static void register_types(void)

{

    type_register_static(&vhost_user_backend_info);

}



type_init(register_types);

contrib/libvhost-user/libvhost-user.c

+7 −3
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static bool 
vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg)

{

    int i;

    VhostUserMemory *memory = &vmsg->payload.memory;

    VhostUserMemory m = vmsg->payload.memory, *memory = &m;

    dev->nregions = memory->nregions;



    DPRINT("Nregions: %d\n", memory->nregions);
@@ -684,7 +684,7 @@ static bool 
vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)

{

    int i;

    VhostUserMemory *memory = &vmsg->payload.memory;

    VhostUserMemory m = vmsg->payload.memory, *memory = &m;



    for (i = 0; i < dev->nregions; i++) {

        VuDevRegion *r = &dev->regions[i];
@@ -813,7 +813,7 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg) 
static bool

vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)

{

    struct vhost_vring_addr *vra = &vmsg->payload.addr;

    struct vhost_vring_addr addr = vmsg->payload.addr, *vra = &addr;

    unsigned int index = vra->index;

    VuVirtq *vq = &dev->vq[index];
@@ -1157,6 +1157,10 @@ vu_get_protocol_features_exec(VuDev *dev, VhostUserMsg *vmsg) 
        features |= 1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT;

    }



    if (dev->iface->get_config && dev->iface->set_config) {

        features |= 1ULL << VHOST_USER_PROTOCOL_F_CONFIG;

    }



    if (dev->iface->get_protocol_features) {

        features |= dev->iface->get_protocol_features(dev);

    }

hw/input/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ config VIRTIO_INPUT 
config VIRTIO_INPUT_HOST

    bool

    default y

    depends on VIRTIO && LINUX

    depends on VIRTIO_INPUT && LINUX



config VHOST_USER_INPUT

    bool

    default y

    depends on VIRTIO_INPUT && VHOST_USER



config TSC210X

    bool