Commit 09125c5e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



vhost, virtio, pci, pxe

Fixes all over the place.
New tests for pxe.

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

# gpg: Signature made Thu 18 Feb 2016 15:46:39 GMT 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:
  tests/vhost-user-bridge: add scattering of incoming packets
  vhost-user interrupt management fixes
  rules: filter out irrelevant files
  change type of pci_bridge_initfn() to void
  dec: convert to realize()
  tests: add pxe e1000 and virtio-pci tests
  msix: fix msix_vector_masked
  virtio: optimize virtio_access_is_big_endian() for little-endian targets
  vhost: simplify vhost_needs_vring_endian()
  vhost: move virtio 1.0 check to cross-endian helper
  virtio: move cross-endian helper to vhost
  vhost-net: revert support of cross-endian vnet headers
  virtio-net: use the backend cross-endian capabilities

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dd5e38b1 a28c393c

hw/net/vhost_net.c

+16 −36
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "standard-headers/linux/virtio_ring.h"

#include "hw/virtio/vhost.h"

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

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



struct vhost_net {

    struct vhost_dev dev;
@@ -197,27 +196,6 @@ static void vhost_net_set_vq_index(struct vhost_net *net, int vq_index) 
    net->dev.vq_index = vq_index;

}



static int vhost_net_set_vnet_endian(VirtIODevice *dev, NetClientState *peer,

                                     bool set)

{

    int r = 0;



    if (virtio_vdev_has_feature(dev, VIRTIO_F_VERSION_1) ||

        (virtio_legacy_is_cross_endian(dev) && !virtio_is_big_endian(dev))) {

        r = qemu_set_vnet_le(peer, set);

        if (r) {

            error_report("backend does not support LE vnet headers");

        }

    } else if (virtio_legacy_is_cross_endian(dev)) {

        r = qemu_set_vnet_be(peer, set);

        if (r) {

            error_report("backend does not support BE vnet headers");

        }

    }



    return r;

}



static int vhost_net_start_one(struct vhost_net *net,

                               VirtIODevice *dev)

{
@@ -298,25 +276,32 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, 
    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev)));

    VirtioBusState *vbus = VIRTIO_BUS(qbus);

    VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(vbus);

    int r, e, i, j;

    int r, e, i;



    if (!k->set_guest_notifiers) {

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

        return -ENOSYS;

    }



    for (j = 0; j < total_queues; j++) {

        r = vhost_net_set_vnet_endian(dev, ncs[j].peer, true);

        if (r < 0) {

            goto err_endian;

    for (i = 0; i < total_queues; i++) {

        struct vhost_net *net;



        net = get_vhost_net(ncs[i].peer);

        vhost_net_set_vq_index(net, i * 2);



        /* Suppress the masking guest notifiers on vhost user

         * because vhost user doesn't interrupt masking/unmasking

         * properly.

         */

        if (net->nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER) {

                dev->use_guest_notifier_mask = false;

        }

        vhost_net_set_vq_index(get_vhost_net(ncs[j].peer), j * 2);

     }



    r = k->set_guest_notifiers(qbus->parent, total_queues * 2, true);

    if (r < 0) {

        error_report("Error binding guest notifier: %d", -r);

        goto err_endian;

        goto err;

    }



    for (i = 0; i < total_queues; i++) {
@@ -338,10 +323,7 @@ err_start: 
        fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e);

        fflush(stderr);

    }

err_endian:

    while (--j >= 0) {

        vhost_net_set_vnet_endian(dev, ncs[j].peer, false);

    }

err:

    return r;

}
@@ -363,8 +345,6 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs, 
        fflush(stderr);

    }

    assert(r >= 0);



    assert(vhost_net_set_vnet_endian(dev, ncs[0].peer, false) >= 0);

}



void vhost_net_cleanup(struct vhost_net *net)

hw/net/virtio-net.c

+66 −2
Original line number Diff line number Diff line
@@ -129,6 +129,13 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status) 
    if (!n->vhost_started) {

        int r, i;



        if (n->needs_vnet_hdr_swap) {

            error_report("backend does not support %s vnet headers; "

                         "falling back on userspace virtio",

                         virtio_is_big_endian(vdev) ? "BE" : "LE");

            return;

        }



        /* Any packets outstanding? Purge them to avoid touching rings

         * when vhost is running.

         */
@@ -153,6 +160,59 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t status) 
    }

}



static int virtio_net_set_vnet_endian_one(VirtIODevice *vdev,

                                          NetClientState *peer,

                                          bool enable)

{

    if (virtio_is_big_endian(vdev)) {

        return qemu_set_vnet_be(peer, enable);

    } else {

        return qemu_set_vnet_le(peer, enable);

    }

}



static bool virtio_net_set_vnet_endian(VirtIODevice *vdev, NetClientState *ncs,

                                       int queues, bool enable)

{

    int i;



    for (i = 0; i < queues; i++) {

        if (virtio_net_set_vnet_endian_one(vdev, ncs[i].peer, enable) < 0 &&

            enable) {

            while (--i >= 0) {

                virtio_net_set_vnet_endian_one(vdev, ncs[i].peer, false);

            }



            return true;

        }

    }



    return false;

}



static void virtio_net_vnet_endian_status(VirtIONet *n, uint8_t status)

{

    VirtIODevice *vdev = VIRTIO_DEVICE(n);

    int queues = n->multiqueue ? n->max_queues : 1;



    if (virtio_net_started(n, status)) {

        /* Before using the device, we tell the network backend about the

         * endianness to use when parsing vnet headers. If the backend

         * can't do it, we fallback onto fixing the headers in the core

         * virtio-net code.

         */

        n->needs_vnet_hdr_swap = virtio_net_set_vnet_endian(vdev, n->nic->ncs,

                                                            queues, true);

    } else if (virtio_net_started(n, vdev->status)) {

        /* After using the device, we need to reset the network backend to

         * the default (guest native endianness), otherwise the guest may

         * lose network connectivity if it is rebooted into a different

         * endianness.

         */

        virtio_net_set_vnet_endian(vdev, n->nic->ncs, queues, false);

    }

}



static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status)

{

    VirtIONet *n = VIRTIO_NET(vdev);
@@ -160,6 +220,7 @@ static void virtio_net_set_status(struct VirtIODevice *vdev, uint8_t status) 
    int i;

    uint8_t queue_status;



    virtio_net_vnet_endian_status(n, status);

    virtio_net_vhost_status(n, status);



    for (i = 0; i < n->max_queues; i++) {
@@ -963,7 +1024,10 @@ static void receive_header(VirtIONet *n, const struct iovec *iov, int iov_cnt, 
        void *wbuf = (void *)buf;

        work_around_broken_dhclient(wbuf, wbuf + n->host_hdr_len,

                                    size - n->host_hdr_len);



        if (n->needs_vnet_hdr_swap) {

            virtio_net_hdr_swap(VIRTIO_DEVICE(n), wbuf);

        }

        iov_from_buf(iov, iov_cnt, 0, buf, sizeof(struct virtio_net_hdr));

    } else {

        struct virtio_net_hdr hdr = {
@@ -1184,7 +1248,7 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q) 
                error_report("virtio-net header incorrect");

                exit(1);

            }

            if (virtio_needs_swap(vdev)) {

            if (n->needs_vnet_hdr_swap) {

                virtio_net_hdr_swap(vdev, (void *) &mhdr);

                sg2[0].iov_base = &mhdr;

                sg2[0].iov_len = n->guest_hdr_len;

hw/pci-bridge/dec.c

+3 −3
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ static int dec_map_irq(PCIDevice *pci_dev, int irq_num) 
    return irq_num;

}



static int dec_pci_bridge_initfn(PCIDevice *pci_dev)

static void dec_pci_bridge_realize(PCIDevice *pci_dev, Error **errp)

{

    return pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);

    pci_bridge_initfn(pci_dev, TYPE_PCI_BUS);

}



static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data)
@@ -62,7 +62,7 @@ static void dec_21154_pci_bridge_class_init(ObjectClass *klass, void *data) 
    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);



    k->init = dec_pci_bridge_initfn;

    k->realize = dec_pci_bridge_realize;

    k->exit = pci_bridge_exitfn;

    k->vendor_id = PCI_VENDOR_ID_DEC;

    k->device_id = PCI_DEVICE_ID_DEC_21154;

hw/pci-bridge/i82801b11.c

+1 −4
Original line number Diff line number Diff line
@@ -62,10 +62,7 @@ static int i82801b11_bridge_initfn(PCIDevice *d) 
{

    int rc;



    rc = pci_bridge_initfn(d, TYPE_PCI_BUS);

    if (rc < 0) {

        return rc;

    }

    pci_bridge_initfn(d, TYPE_PCI_BUS);



    rc = pci_bridge_ssvid_init(d, I82801ba_SSVID_OFFSET,

                               I82801ba_SSVID_SVID, I82801ba_SSVID_SSID);

hw/pci-bridge/ioh3420.c

+1 −5
Original line number Diff line number Diff line
@@ -98,11 +98,7 @@ static int ioh3420_initfn(PCIDevice *d) 
    PCIESlot *s = PCIE_SLOT(d);

    int rc;



    rc = pci_bridge_initfn(d, TYPE_PCIE_BUS);

    if (rc < 0) {

        return rc;

    }



    pci_bridge_initfn(d, TYPE_PCIE_BUS);

    pcie_port_init_reg(d);



    rc = pci_bridge_ssvid_init(d, IOH_EP_SSVID_OFFSET,