mirror of https://github.com/proxmox/mirror_qemu
virtio-iommu: Implement set_iova_ranges() callback
The implementation populates the array of per IOMMUDevice host reserved ranges. It is forbidden to have conflicting sets of host IOVA ranges to be applied onto the same IOMMU MR (implied by different host devices). In case the callback is called after the probe request has been issues by the driver, a warning is issued. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: "Michael S. Tsirkin" <mst@redhat.com> Tested-by: Yanghang Liu <yanghliu@redhat.com> Signed-off-by: Cédric Le Goater <clg@redhat.com>master
parent
09b4c3d6a2
commit
30d40e39bd
|
@ -20,6 +20,7 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
#include "qemu/iov.h"
|
#include "qemu/iov.h"
|
||||||
|
#include "qemu/range.h"
|
||||||
#include "exec/target_page.h"
|
#include "exec/target_page.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "hw/virtio/virtio.h"
|
#include "hw/virtio/virtio.h"
|
||||||
|
@ -1155,6 +1156,71 @@ static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* virtio_iommu_set_iova_ranges: Conveys the usable IOVA ranges
|
||||||
|
*
|
||||||
|
* The function turns those into reserved ranges. Once some
|
||||||
|
* reserved ranges have been set, new reserved regions cannot be
|
||||||
|
* added outside of the original ones.
|
||||||
|
*
|
||||||
|
* @mr: IOMMU MR
|
||||||
|
* @iova_ranges: list of usable IOVA ranges
|
||||||
|
* @errp: error handle
|
||||||
|
*/
|
||||||
|
static int virtio_iommu_set_iova_ranges(IOMMUMemoryRegion *mr,
|
||||||
|
GList *iova_ranges,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
IOMMUDevice *sdev = container_of(mr, IOMMUDevice, iommu_mr);
|
||||||
|
GList *current_ranges = sdev->host_resv_ranges;
|
||||||
|
GList *l, *tmp, *new_ranges = NULL;
|
||||||
|
int ret = -EINVAL;
|
||||||
|
|
||||||
|
/* check that each new resv region is included in an existing one */
|
||||||
|
if (sdev->host_resv_ranges) {
|
||||||
|
range_inverse_array(iova_ranges,
|
||||||
|
&new_ranges,
|
||||||
|
0, UINT64_MAX);
|
||||||
|
|
||||||
|
for (tmp = new_ranges; tmp; tmp = tmp->next) {
|
||||||
|
Range *newr = (Range *)tmp->data;
|
||||||
|
bool included = false;
|
||||||
|
|
||||||
|
for (l = current_ranges; l; l = l->next) {
|
||||||
|
Range * r = (Range *)l->data;
|
||||||
|
|
||||||
|
if (range_contains_range(r, newr)) {
|
||||||
|
included = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!included) {
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* all new reserved ranges are included in existing ones */
|
||||||
|
ret = 0;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (sdev->probe_done) {
|
||||||
|
warn_report("%s: Notified about new host reserved regions after probe",
|
||||||
|
mr->parent_obj.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
range_inverse_array(iova_ranges,
|
||||||
|
&sdev->host_resv_ranges,
|
||||||
|
0, UINT64_MAX);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
error:
|
||||||
|
error_setg(errp, "IOMMU mr=%s Conflicting host reserved ranges set!",
|
||||||
|
mr->parent_obj.name);
|
||||||
|
out:
|
||||||
|
g_list_free_full(new_ranges, g_free);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static void virtio_iommu_system_reset(void *opaque)
|
static void virtio_iommu_system_reset(void *opaque)
|
||||||
{
|
{
|
||||||
VirtIOIOMMU *s = opaque;
|
VirtIOIOMMU *s = opaque;
|
||||||
|
@ -1450,6 +1516,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass,
|
||||||
imrc->replay = virtio_iommu_replay;
|
imrc->replay = virtio_iommu_replay;
|
||||||
imrc->notify_flag_changed = virtio_iommu_notify_flag_changed;
|
imrc->notify_flag_changed = virtio_iommu_notify_flag_changed;
|
||||||
imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask;
|
imrc->iommu_set_page_size_mask = virtio_iommu_set_page_size_mask;
|
||||||
|
imrc->iommu_set_iova_ranges = virtio_iommu_set_iova_ranges;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo virtio_iommu_info = {
|
static const TypeInfo virtio_iommu_info = {
|
||||||
|
|
|
@ -40,6 +40,7 @@ typedef struct IOMMUDevice {
|
||||||
MemoryRegion root; /* The root container of the device */
|
MemoryRegion root; /* The root container of the device */
|
||||||
MemoryRegion bypass_mr; /* The alias of shared memory MR */
|
MemoryRegion bypass_mr; /* The alias of shared memory MR */
|
||||||
GList *resv_regions;
|
GList *resv_regions;
|
||||||
|
GList *host_resv_ranges;
|
||||||
bool probe_done;
|
bool probe_done;
|
||||||
} IOMMUDevice;
|
} IOMMUDevice;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue