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

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



vhost, pc: fixes

More fixes for 2.9. Region caching is still causing
issues around reset, but we seem to be getting there.

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

# gpg: Signature made Thu 30 Mar 2017 17:14:45 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
# 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:
  tests/acpi: don't pack a structure
  vhost: generalize iommu memory region

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e839001d 0d876080

hw/virtio/vhost.c

+64 −20
Original line number Diff line number Diff line
@@ -425,10 +425,8 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) 
static int vhost_dev_has_iommu(struct vhost_dev *dev)

{

    VirtIODevice *vdev = dev->vdev;

    AddressSpace *dma_as = vdev->dma_as;



    return memory_region_is_iommu(dma_as->root) &&

           virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);

    return virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);

}



static void *vhost_memory_map(struct vhost_dev *dev, hwaddr addr,
@@ -720,6 +718,63 @@ static void vhost_region_del(MemoryListener *listener, 
    }

}



static void vhost_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)

{

    struct vhost_iommu *iommu = container_of(n, struct vhost_iommu, n);

    struct vhost_dev *hdev = iommu->hdev;

    hwaddr iova = iotlb->iova + iommu->iommu_offset;



    if (hdev->vhost_ops->vhost_invalidate_device_iotlb(hdev, iova,

                                                       iotlb->addr_mask + 1)) {

        error_report("Fail to invalidate device iotlb");

    }

}



static void vhost_iommu_region_add(MemoryListener *listener,

                                   MemoryRegionSection *section)

{

    struct vhost_dev *dev = container_of(listener, struct vhost_dev,

                                         iommu_listener);

    struct vhost_iommu *iommu;



    if (!memory_region_is_iommu(section->mr)) {

        return;

    }



    iommu = g_malloc0(sizeof(*iommu));

    iommu->n.notify = vhost_iommu_unmap_notify;

    iommu->n.notifier_flags = IOMMU_NOTIFIER_UNMAP;

    iommu->mr = section->mr;

    iommu->iommu_offset = section->offset_within_address_space -

                          section->offset_within_region;

    iommu->hdev = dev;

    memory_region_register_iommu_notifier(section->mr, &iommu->n);

    QLIST_INSERT_HEAD(&dev->iommu_list, iommu, iommu_next);

    /* TODO: can replay help performance here? */

}



static void vhost_iommu_region_del(MemoryListener *listener,

                                   MemoryRegionSection *section)

{

    struct vhost_dev *dev = container_of(listener, struct vhost_dev,

                                         iommu_listener);

    struct vhost_iommu *iommu;



    if (!memory_region_is_iommu(section->mr)) {

        return;

    }



    QLIST_FOREACH(iommu, &dev->iommu_list, iommu_next) {

        if (iommu->mr == section->mr) {

            memory_region_unregister_iommu_notifier(iommu->mr,

                                                    &iommu->n);

            QLIST_REMOVE(iommu, iommu_next);

            g_free(iommu);

            break;

        }

    }

}



static void vhost_region_nop(MemoryListener *listener,

                             MemoryRegionSection *section)

{
@@ -1161,17 +1216,6 @@ static void vhost_virtqueue_cleanup(struct vhost_virtqueue *vq) 
    event_notifier_cleanup(&vq->masked_notifier);

}



static void vhost_iommu_unmap_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)

{

    struct vhost_dev *hdev = container_of(n, struct vhost_dev, n);



    if (hdev->vhost_ops->vhost_invalidate_device_iotlb(hdev,

                                                       iotlb->iova,

                                                       iotlb->addr_mask + 1)) {

        error_report("Fail to invalidate device iotlb");

    }

}



int vhost_dev_init(struct vhost_dev *hdev, void *opaque,

                   VhostBackendType backend_type, uint32_t busyloop_timeout)

{
@@ -1244,8 +1288,10 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque, 
        .priority = 10

    };



    hdev->n.notify = vhost_iommu_unmap_notify;

    hdev->n.notifier_flags = IOMMU_NOTIFIER_UNMAP;

    hdev->iommu_listener = (MemoryListener) {

        .region_add = vhost_iommu_region_add,

        .region_del = vhost_iommu_region_del,

    };



    if (hdev->migration_blocker == NULL) {

        if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
@@ -1455,8 +1501,7 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) 
    }



    if (vhost_dev_has_iommu(hdev)) {

        memory_region_register_iommu_notifier(vdev->dma_as->root,

                                              &hdev->n);

        memory_listener_register(&hdev->iommu_listener, vdev->dma_as);

    }



    r = hdev->vhost_ops->vhost_set_mem_table(hdev, hdev->mem);
@@ -1538,8 +1583,7 @@ void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev) 


    if (vhost_dev_has_iommu(hdev)) {

        hdev->vhost_ops->vhost_set_iotlb_callback(hdev, false);

        memory_region_unregister_iommu_notifier(vdev->dma_as->root,

                                                &hdev->n);

        memory_listener_unregister(&hdev->iommu_listener);

    }

    vhost_log_put(hdev, true);

    hdev->started = false;

include/hw/virtio/vhost.h

+11 −0
Original line number Diff line number Diff line
@@ -37,10 +37,20 @@ struct vhost_log { 
    vhost_log_chunk_t *log;

};



struct vhost_dev;

struct vhost_iommu {

    struct vhost_dev *hdev;

    MemoryRegion *mr;

    hwaddr iommu_offset;

    IOMMUNotifier n;

    QLIST_ENTRY(vhost_iommu) iommu_next;

};



struct vhost_memory;

struct vhost_dev {

    VirtIODevice *vdev;

    MemoryListener memory_listener;

    MemoryListener iommu_listener;

    struct vhost_memory *mem;

    int n_mem_sections;

    MemoryRegionSection *mem_sections;
@@ -64,6 +74,7 @@ struct vhost_dev { 
    void *opaque;

    struct vhost_log *log;

    QLIST_ENTRY(vhost_dev) entry;

    QLIST_HEAD(, vhost_iommu) iommu_list;

    IOMMUNotifier n;

};

tests/acpi-utils.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ typedef struct { 
    gsize asl_len;

    gchar *asl_file;

    bool tmp_files_retain;   /* do not delete the temp asl/aml */

} QEMU_PACKED AcpiSdtTable;

} AcpiSdtTable;



#define ACPI_READ_FIELD(field, addr)           \

    do {                                       \