Commit a8b5ad8e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



virtio,vhost: fixes, features, cleanups.

FLR support.
Misc fixes, cleanups.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 04 Sep 2019 12:53:35 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  libvhost-user: introduce and use vu_has_protocol_feature()
  libvhost-user: fix SLAVE_SEND_FD handling
  virtio-pci: Add Function Level Reset support
  virtio-rng: change default backend to rng-builtin
  virtio-rng: Keep the default backend out of VirtIORNGConf
  rng-builtin: add an RNG backend that uses qemu_guest_getrandom()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9de65783 eeb39263

backends/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
common-obj-y += rng.o rng-egd.o

common-obj-y += rng.o rng-egd.o rng-builtin.o

common-obj-$(CONFIG_POSIX) += rng-random.o



common-obj-$(CONFIG_TPM) += tpm.o

backends/rng-builtin.c

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

 * QEMU Builtin Random Number Generator Backend

 *

 * 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 "sysemu/rng.h"

#include "qemu/main-loop.h"

#include "qemu/guest-random.h"



#define RNG_BUILTIN(obj) OBJECT_CHECK(RngBuiltin, (obj), TYPE_RNG_BUILTIN)



typedef struct RngBuiltin {

    RngBackend parent;

    QEMUBH *bh;

} RngBuiltin;



static void rng_builtin_receive_entropy_bh(void *opaque)

{

    RngBuiltin *s = opaque;



    while (!QSIMPLEQ_EMPTY(&s->parent.requests)) {

        RngRequest *req = QSIMPLEQ_FIRST(&s->parent.requests);



        qemu_guest_getrandom_nofail(req->data, req->size);



        req->receive_entropy(req->opaque, req->data, req->size);



        rng_backend_finalize_request(&s->parent, req);

    }

}



static void rng_builtin_request_entropy(RngBackend *b, RngRequest *req)

{

    RngBuiltin *s = RNG_BUILTIN(b);



    qemu_bh_schedule(s->bh);

}



static void rng_builtin_init(Object *obj)

{

    RngBuiltin *s = RNG_BUILTIN(obj);



    s->bh = qemu_bh_new(rng_builtin_receive_entropy_bh, s);

}



static void rng_builtin_finalize(Object *obj)

{

    RngBuiltin *s = RNG_BUILTIN(obj);



    qemu_bh_delete(s->bh);

}



static void rng_builtin_class_init(ObjectClass *klass, void *data)

{

    RngBackendClass *rbc = RNG_BACKEND_CLASS(klass);



    rbc->request_entropy = rng_builtin_request_entropy;

}



static const TypeInfo rng_builtin_info = {

    .name = TYPE_RNG_BUILTIN,

    .parent = TYPE_RNG_BACKEND,

    .instance_size = sizeof(RngBuiltin),

    .instance_init = rng_builtin_init,

    .instance_finalize = rng_builtin_finalize,

    .class_init = rng_builtin_class_init,

};



static void register_types(void)

{

    type_register_static(&rng_builtin_info);

}



type_init(register_types);

contrib/libvhost-user/libvhost-user.c

+10 −9
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ bool vu_has_feature(VuDev *dev, 
    return has_feature(dev->features, fbit);

}



static inline bool vu_has_protocol_feature(VuDev *dev, unsigned int fbit)

{

    return has_feature(dev->protocol_features, fbit);

}



static const char *

vu_request_to_string(unsigned int req)

{
@@ -951,8 +956,7 @@ vu_check_queue_inflights(VuDev *dev, VuVirtq *vq) 
{

    int i = 0;



    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -1097,7 +1101,7 @@ bool vu_set_queue_host_notifier(VuDev *dev, VuVirtq *vq, int fd, 


    vmsg.fd_num = fd_num;



    if ((dev->protocol_features & VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) == 0) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) {

        return false;

    }
@@ -2190,8 +2194,7 @@ vu_queue_map_desc(VuDev *dev, VuVirtq *vq, unsigned int idx, size_t sz) 
static int

vu_queue_inflight_get(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -2208,8 +2211,7 @@ vu_queue_inflight_get(VuDev *dev, VuVirtq *vq, int desc_idx) 
static int

vu_queue_inflight_pre_put(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -2225,8 +2227,7 @@ vu_queue_inflight_pre_put(VuDev *dev, VuVirtq *vq, int desc_idx) 
static int

vu_queue_inflight_post_put(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }

hw/core/machine.c

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
#include "hw/pci/pci.h"

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_4_1[] = {};

GlobalProperty hw_compat_4_1[] = {

    { "virtio-pci", "x-pcie-flr-init", "off" },

};

const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1);



GlobalProperty hw_compat_4_0[] = {

hw/virtio/virtio-pci.c

+10 −0
Original line number Diff line number Diff line
@@ -604,6 +604,10 @@ static void virtio_write_config(PCIDevice *pci_dev, uint32_t address, 


    pci_default_write_config(pci_dev, address, val, len);



    if (proxy->flags & VIRTIO_PCI_FLAG_INIT_FLR) {

        pcie_cap_flr_write_config(pci_dev, address, val, len);

    }



    if (range_covers_byte(address, len, PCI_COMMAND) &&

        !(pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {

        virtio_pci_stop_ioeventfd(proxy);
@@ -1780,6 +1784,10 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) 
            pcie_ats_init(pci_dev, 256);

        }



        if (proxy->flags & VIRTIO_PCI_FLAG_INIT_FLR) {

            /* Set Function Level Reset capability bit */

            pcie_cap_flr_init(pci_dev);

        }

    } else {

        /*

         * make future invocations of pci_is_express() return false
@@ -1847,6 +1855,8 @@ static Property virtio_pci_properties[] = { 
                    VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT, true),

    DEFINE_PROP_BIT("x-pcie-pm-init", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_INIT_PM_BIT, true),

    DEFINE_PROP_BIT("x-pcie-flr-init", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_INIT_FLR_BIT, true),

    DEFINE_PROP_END_OF_LIST(),

};