Commit 68df0c30 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



pci, pc, virtio: fixes, cleanups, features

vhost user blk discard/write zeroes features
misc cleanups and fixes all over the place

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

# gpg: Signature made Tue 05 Feb 2019 16:00:20 GMT
# 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:
  contrib/libvhost-user: cleanup casts
  r2d: fix build on mingw
  mmap-alloc: fix hugetlbfs misaligned length in ppc64
  mmap-alloc: unfold qemu_ram_mmap()
  i386, acpi: cleanup build_facs by removing second unused argument
  fw_cfg: fix the life cycle and the name of "qemu_extra_params_fw"
  acpi: Make TPM 2.0 with TIS available as MSFT0101
  hw/virtio: Use CONFIG_VIRTIO_PCI switch instead of CONFIG_PCI
  vhost-user-blk: add discard/write zeroes features support
  contrib/vhost-user-blk: fix the compilation issue
  pci/msi: export msi_is_masked()
  intel_iommu: reset intr_enabled when system reset
  intel_iommu: fix operator in vtd_switch_address_space
  hw: virtio-pci: drop DO_UPCAST
  include: update Linux headers to 4.21-rc1/5.0-rc1
  scripts/update-linux-headers.sh: adjust for Linux 4.21-rc1 (or 5.0-rc1)
  contrib/libvhost-user: switch to uint64_t
  virtio: add checks for the size of the indirect table

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 01a9a51f 8bafafcc

contrib/libvhost-user/libvhost-user.c

+4 −4
Original line number Diff line number Diff line
@@ -790,10 +790,10 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg) 
    DPRINT("vhost_vring_addr:\n");

    DPRINT("    index:  %d\n", vra->index);

    DPRINT("    flags:  %d\n", vra->flags);

    DPRINT("    desc_user_addr:   0x%016llx\n", vra->desc_user_addr);

    DPRINT("    used_user_addr:   0x%016llx\n", vra->used_user_addr);

    DPRINT("    avail_user_addr:  0x%016llx\n", vra->avail_user_addr);

    DPRINT("    log_guest_addr:   0x%016llx\n", vra->log_guest_addr);

    DPRINT("    desc_user_addr:   0x%016" PRIx64 "\n", vra->desc_user_addr);

    DPRINT("    used_user_addr:   0x%016" PRIx64 "\n", vra->used_user_addr);

    DPRINT("    avail_user_addr:  0x%016" PRIx64 "\n", vra->avail_user_addr);

    DPRINT("    log_guest_addr:   0x%016" PRIx64 "\n", vra->log_guest_addr);



    vq->vring.flags = vra->flags;

    vq->vring.desc = qva_to_va(dev, vra->desc_user_addr);

contrib/vhost-user-blk/vhost-user-blk.c

+112 −34
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
#include "contrib/libvhost-user/libvhost-user-glib.h"

#include "contrib/libvhost-user/libvhost-user.h"



#if defined(__linux__)

#include <linux/fs.h>

#include <sys/ioctl.h>

#endif



struct virtio_blk_inhdr {

    unsigned char status;
@@ -59,6 +63,20 @@ static size_t vub_iov_size(const struct iovec *iov, 
    return len;

}



static size_t vub_iov_to_buf(const struct iovec *iov,

                             const unsigned int iov_cnt, void *buf)

{

    size_t len;

    unsigned int i;



    len = 0;

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

        memcpy(buf + len,  iov[i].iov_base, iov[i].iov_len);

        len += iov[i].iov_len;

    }

    return len;

}



static void vub_panic_cb(VuDev *vu_dev, const char *buf)

{

    VugDev *gdev;
@@ -157,6 +175,44 @@ vub_writev(VubReq *req, struct iovec *iov, uint32_t iovcnt) 
    return rc;

}



static int

vub_discard_write_zeroes(VubReq *req, struct iovec *iov, uint32_t iovcnt,

                         uint32_t type)

{

    struct virtio_blk_discard_write_zeroes *desc;

    ssize_t size;

    void *buf;



    size = vub_iov_size(iov, iovcnt);

    if (size != sizeof(*desc)) {

        fprintf(stderr, "Invalid size %ld, expect %ld\n", size, sizeof(*desc));

        return -1;

    }

    buf = g_new0(char, size);

    vub_iov_to_buf(iov, iovcnt, buf);



    #if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT)

    VubDev *vdev_blk = req->vdev_blk;

    desc = (struct virtio_blk_discard_write_zeroes *)buf;

    uint64_t range[2] = { le64toh(desc->sector) << 9,

                          le32toh(desc->num_sectors) << 9 };

    if (type == VIRTIO_BLK_T_DISCARD) {

        if (ioctl(vdev_blk->blk_fd, BLKDISCARD, range) == 0) {

            g_free(buf);

            return 0;

        }

    } else if (type == VIRTIO_BLK_T_WRITE_ZEROES) {

        if (ioctl(vdev_blk->blk_fd, BLKZEROOUT, range) == 0) {

            g_free(buf);

            return 0;

        }

    }

    #endif



    g_free(buf);

    return -1;

}



static void

vub_flush(VubReq *req)

{
@@ -212,8 +268,9 @@ static int vub_virtio_process_req(VubDev *vdev_blk, 
    in_num--;



    type = le32toh(req->out->type);

    switch (type & ~(VIRTIO_BLK_T_OUT | VIRTIO_BLK_T_BARRIER)) {

        case VIRTIO_BLK_T_IN: {

    switch (type & ~VIRTIO_BLK_T_BARRIER) {

    case VIRTIO_BLK_T_IN:

    case VIRTIO_BLK_T_OUT: {

        ssize_t ret = 0;

        bool is_write = type & VIRTIO_BLK_T_OUT;

        req->sector_num = le64toh(req->out->sector);
@@ -230,12 +287,11 @@ static int vub_virtio_process_req(VubDev *vdev_blk, 
        vub_req_complete(req);

        break;

    }

        case VIRTIO_BLK_T_FLUSH: {

    case VIRTIO_BLK_T_FLUSH:

        vub_flush(req);

        req->in->status = VIRTIO_BLK_S_OK;

        vub_req_complete(req);

        break;

        }

    case VIRTIO_BLK_T_GET_ID: {

        size_t size = MIN(vub_iov_size(&elem->in_sg[0], in_num),

                          VIRTIO_BLK_ID_BYTES);
@@ -245,11 +301,22 @@ static int vub_virtio_process_req(VubDev *vdev_blk, 
        vub_req_complete(req);

        break;

    }

        default: {

            req->in->status = VIRTIO_BLK_S_UNSUPP;

    case VIRTIO_BLK_T_DISCARD:

    case VIRTIO_BLK_T_WRITE_ZEROES: {

        int rc;

        rc = vub_discard_write_zeroes(req, &elem->out_sg[1], out_num, type);

        if (rc == 0) {

            req->in->status = VIRTIO_BLK_S_OK;

        } else {

            req->in->status = VIRTIO_BLK_S_IOERR;

        }

        vub_req_complete(req);

        break;

    }

    default:

        req->in->status = VIRTIO_BLK_S_UNSUPP;

        vub_req_complete(req);

        break;

    }



    return 0;
@@ -313,6 +380,10 @@ vub_get_features(VuDev *dev) 
               1ull << VIRTIO_BLK_F_TOPOLOGY |

               1ull << VIRTIO_BLK_F_BLK_SIZE |

               1ull << VIRTIO_BLK_F_FLUSH |

               #if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT)

               1ull << VIRTIO_BLK_F_DISCARD |

               1ull << VIRTIO_BLK_F_WRITE_ZEROES |

               #endif

               1ull << VIRTIO_BLK_F_CONFIG_WCE |

               1ull << VIRTIO_F_VERSION_1 |

               1ull << VHOST_USER_F_PROTOCOL_FEATURES;
@@ -454,7 +525,7 @@ vub_get_blocksize(int fd) 


#if defined(__linux__) && defined(BLKSSZGET)

    if (ioctl(fd, BLKSSZGET, &blocksize) == 0) {

        return blocklen;

        return blocksize;

    }

#endif
@@ -474,6 +545,13 @@ vub_initialize_config(int fd, struct virtio_blk_config *config) 
    config->min_io_size = 1;

    config->opt_io_size = 1;

    config->num_queues = 1;

    #if defined(__linux__) && defined(BLKDISCARD) && defined(BLKZEROOUT)

    config->max_discard_sectors = 32768;

    config->max_discard_seg = 1;

    config->discard_sector_alignment = config->blk_size >> 9;

    config->max_write_zeroes_sectors = 32768;

    config->max_write_zeroes_seg = 1;

    #endif

}



static VubDev *

hw/block/vhost-user-blk.c

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ static const int user_feature_bits[] = { 
    VIRTIO_BLK_F_RO,

    VIRTIO_BLK_F_FLUSH,

    VIRTIO_BLK_F_CONFIG_WCE,

    VIRTIO_BLK_F_DISCARD,

    VIRTIO_BLK_F_WRITE_ZEROES,

    VIRTIO_F_VERSION_1,

    VIRTIO_RING_F_INDIRECT_DESC,

    VIRTIO_RING_F_EVENT_IDX,
@@ -204,6 +206,8 @@ static uint64_t vhost_user_blk_get_features(VirtIODevice *vdev, 
    virtio_add_feature(&features, VIRTIO_BLK_F_BLK_SIZE);

    virtio_add_feature(&features, VIRTIO_BLK_F_FLUSH);

    virtio_add_feature(&features, VIRTIO_BLK_F_RO);

    virtio_add_feature(&features, VIRTIO_BLK_F_DISCARD);

    virtio_add_feature(&features, VIRTIO_BLK_F_WRITE_ZEROES);



    if (s->config_wce) {

        virtio_add_feature(&features, VIRTIO_BLK_F_CONFIG_WCE);

hw/i386/acpi-build.c

+12 −4
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void acpi_align_size(GArray *blob, unsigned align) 


/* FACS */

static void

build_facs(GArray *table_data, BIOSLinker *linker)

build_facs(GArray *table_data)

{

    AcpiFacsDescriptorRev1 *facs = acpi_data_push(table_data, sizeof *facs);

    memcpy(&facs->signature, "FACS", 4);
@@ -2141,8 +2141,16 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, 
            build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);



            if (TPM_IS_TIS(tpm)) {

                if (misc->tpm_version == TPM_VERSION_2_0) {

                    dev = aml_device("TPM");

                    aml_append(dev, aml_name_decl("_HID",

                                                  aml_string("MSFT0101")));

                } else {

                    dev = aml_device("ISA.TPM");

                aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0C31")));

                    aml_append(dev, aml_name_decl("_HID",

                                                  aml_eisaid("PNP0C31")));

                }



                aml_append(dev, aml_name_decl("_STA", aml_int(0xF)));

                crs = aml_resource_template();

                aml_append(crs, aml_memory32_fixed(TPM_TIS_ADDR_BASE,
@@ -2629,7 +2637,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) 
     * requirements.

     */

    facs = tables_blob->len;

    build_facs(tables_blob, tables->linker);

    build_facs(tables_blob);



    /* DSDT is pointed to by FADT */

    dsdt = tables_blob->len;

hw/i386/intel_iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ static bool vtd_switch_address_space(VTDAddressSpace *as) 


    assert(as);



    use_iommu = as->iommu_state->dmar_enabled & !vtd_dev_pt_enabled(as);

    use_iommu = as->iommu_state->dmar_enabled && !vtd_dev_pt_enabled(as);



    trace_vtd_switch_address_space(pci_bus_num(as->bus),

                                   VTD_PCI_SLOT(as->devfn),
@@ -3138,6 +3138,7 @@ static void vtd_init(IntelIOMMUState *s) 
    s->root = 0;

    s->root_extended = false;

    s->dmar_enabled = false;

    s->intr_enabled = false;

    s->iq_head = 0;

    s->iq_tail = 0;

    s->iq = 0;