motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-28 12:32:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtio-iommu: Introduce per IOMMUDevice reserved regions

Browse source 
For the time being the per device reserved regions are
just a duplicate of IOMMU wide reserved regions. Subsequent
patches will combine those with host reserved regions, if any.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Yanghang Liu <yanghliu@redhat.com>
Reviewed-by: "Michael S. Tsirkin" <mst@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Eric Auger 2023-10-19 15:45:13 +02:00 • committed by Cédric Le Goater
parent c310484736
commit 908cae0de4
2 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

37
hw/virtio/virtio-iommu.c
View file

@ -26,6 +26,7 @@
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "sysemu/reset.h" #include "sysemu/reset.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/reserved-region.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "trace.h" #include "trace.h"
@ -378,6 +379,19 @@ static void virtio_iommu_put_domain(gpointer data)
g_free(domain); g_free(domain);
} }
static void add_prop_resv_regions(IOMMUDevice *sdev)
{
VirtIOIOMMU *s = sdev->viommu;
int i;
for (i = 0; i < s->nr_prop_resv_regions; i++) {
ReservedRegion *reg = g_new0(ReservedRegion, 1);
*reg = s->prop_resv_regions[i];
sdev->resv_regions = resv_region_list_insert(sdev->resv_regions, reg);
}
}
static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque, static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque,
int devfn) int devfn)
{ {
@ -408,6 +422,7 @@ static AddressSpace *virtio_iommu_find_add_as(PCIBus *bus, void *opaque,
memory_region_init(&sdev->root, OBJECT(s), name, UINT64_MAX); memory_region_init(&sdev->root, OBJECT(s), name, UINT64_MAX);
address_space_init(&sdev->as, &sdev->root, TYPE_VIRTIO_IOMMU); address_space_init(&sdev->as, &sdev->root, TYPE_VIRTIO_IOMMU);
add_prop_resv_regions(sdev);
/* /*
* Build the IOMMU disabled container with aliases to the * Build the IOMMU disabled container with aliases to the
@ -629,17 +644,23 @@ static ssize_t virtio_iommu_fill_resv_mem_prop(VirtIOIOMMU *s, uint32_t ep,
{ {
struct virtio_iommu_probe_resv_mem prop = {}; struct virtio_iommu_probe_resv_mem prop = {};
size_t size = sizeof(prop), length = size - sizeof(prop.head), total; size_t size = sizeof(prop), length = size - sizeof(prop.head), total;
int i; IOMMUDevice *sdev;
GList *l;
total = size * s->nr_prop_resv_regions; sdev = container_of(virtio_iommu_mr(s, ep), IOMMUDevice, iommu_mr);
if (!sdev) {
return -EINVAL;
}
total = size * g_list_length(sdev->resv_regions);
if (total > free) { if (total > free) {
return -ENOSPC; return -ENOSPC;
} }
for (i = 0; i < s->nr_prop_resv_regions; i++) { for (l = sdev->resv_regions; l; l = l->next) {
unsigned subtype = s->prop_resv_regions[i].type; ReservedRegion *reg = l->data;
Range *range = &s->prop_resv_regions[i].range; unsigned subtype = reg->type;
Range *range = &reg->range;
assert(subtype == VIRTIO_IOMMU_RESV_MEM_T_RESERVED || assert(subtype == VIRTIO_IOMMU_RESV_MEM_T_RESERVED ||
subtype == VIRTIO_IOMMU_RESV_MEM_T_MSI); subtype == VIRTIO_IOMMU_RESV_MEM_T_MSI);
@ -857,7 +878,7 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
bool bypass_allowed; bool bypass_allowed;
int granule; int granule;
bool found; bool found;
int i; GList *l;
interval.low = addr; interval.low = addr;
interval.high = addr + 1; interval.high = addr + 1;
@ -895,8 +916,8 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
goto unlock; goto unlock;
} }
for (i = 0; i < s->nr_prop_resv_regions; i++) { for (l = sdev->resv_regions; l; l = l->next) {
ReservedRegion *reg = &s->prop_resv_regions[i]; ReservedRegion *reg = l->data;
if (range_contains(&reg->range, addr)) { if (range_contains(&reg->range, addr)) {
switch (reg->type) { switch (reg->type) {

1
include/hw/virtio/virtio-iommu.h
View file

@ -39,6 +39,7 @@ typedef struct IOMMUDevice {
AddressSpace as; AddressSpace as;
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;
} IOMMUDevice; } IOMMUDevice;
typedef struct IOMMUPciBus { typedef struct IOMMUPciBus {