ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vfio/common: Move giommu_list in base container 

Move the giommu_list field in the base container and store
the base container in the VFIOGuestIOMMU.

No functional change intended.

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Eric Auger 2023-11-02 15:12:31 +08:00 committed by Cédric Le Goater
parent ed2f7f8017
commit dddf83ab99
5 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/vfio/common.c
View File

@ -292,7 +292,7 @@ static bool vfio_get_xlat_addr(IOMMUTLBEntry *iotlb, void **vaddr,
static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
{ {
VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n); VFIOGuestIOMMU *giommu = container_of(n, VFIOGuestIOMMU, n);
VFIOContainerBase *bcontainer = &giommu->container->bcontainer; VFIOContainerBase *bcontainer = giommu->bcontainer;
hwaddr iova = iotlb->iova + giommu->iommu_offset; hwaddr iova = iotlb->iova + giommu->iommu_offset;
void *vaddr; void *vaddr;
int ret; int ret;
@ -569,6 +569,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
VFIOContainer *container = container_of(listener, VFIOContainer, listener); VFIOContainer *container = container_of(listener, VFIOContainer, listener);
VFIOContainerBase *bcontainer = &container->bcontainer;
hwaddr iova, end; hwaddr iova, end;
Int128 llend, llsize; Int128 llend, llsize;
void *vaddr; void *vaddr;
@ -612,7 +613,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
giommu->iommu_mr = iommu_mr; giommu->iommu_mr = iommu_mr;
giommu->iommu_offset = section->offset_within_address_space - giommu->iommu_offset = section->offset_within_address_space -
section->offset_within_region; section->offset_within_region;
giommu->container = container; giommu->bcontainer = bcontainer;
llend = int128_add(int128_make64(section->offset_within_region), llend = int128_add(int128_make64(section->offset_within_region),
section->size); section->size);
llend = int128_sub(llend, int128_one()); llend = int128_sub(llend, int128_one());
@ -647,7 +648,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
g_free(giommu); g_free(giommu);
goto fail; goto fail;
} }
QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); QLIST_INSERT_HEAD(&bcontainer->giommu_list, giommu, giommu_next);
memory_region_iommu_replay(giommu->iommu_mr, &giommu->n); memory_region_iommu_replay(giommu->iommu_mr, &giommu->n);
return; return;
@ -732,6 +733,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
VFIOContainer *container = container_of(listener, VFIOContainer, listener); VFIOContainer *container = container_of(listener, VFIOContainer, listener);
VFIOContainerBase *bcontainer = &container->bcontainer;
hwaddr iova, end; hwaddr iova, end;
Int128 llend, llsize; Int128 llend, llsize;
int ret; int ret;
@ -744,7 +746,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
if (memory_region_is_iommu(section->mr)) { if (memory_region_is_iommu(section->mr)) {
VFIOGuestIOMMU *giommu; VFIOGuestIOMMU *giommu;
QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { QLIST_FOREACH(giommu, &bcontainer->giommu_list, giommu_next) {
if (MEMORY_REGION(giommu->iommu_mr) == section->mr && if (MEMORY_REGION(giommu->iommu_mr) == section->mr &&
giommu->n.start == section->offset_within_region) { giommu->n.start == section->offset_within_region) {
memory_region_unregister_iommu_notifier(section->mr, memory_region_unregister_iommu_notifier(section->mr,
@ -1206,7 +1208,9 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
vfio_giommu_dirty_notifier *gdn = container_of(n, vfio_giommu_dirty_notifier *gdn = container_of(n,
vfio_giommu_dirty_notifier, n); vfio_giommu_dirty_notifier, n);
VFIOGuestIOMMU *giommu = gdn->giommu; VFIOGuestIOMMU *giommu = gdn->giommu;
VFIOContainer *container = giommu->container; VFIOContainerBase *bcontainer = giommu->bcontainer;
VFIOContainer *container = container_of(bcontainer, VFIOContainer,
bcontainer);
hwaddr iova = iotlb->iova + giommu->iommu_offset; hwaddr iova = iotlb->iova + giommu->iommu_offset;
ram_addr_t translated_addr; ram_addr_t translated_addr;
int ret = -EINVAL; int ret = -EINVAL;
@ -1284,12 +1288,13 @@ static int vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainer *container,
static int vfio_sync_dirty_bitmap(VFIOContainer *container, static int vfio_sync_dirty_bitmap(VFIOContainer *container,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
ram_addr_t ram_addr; ram_addr_t ram_addr;
if (memory_region_is_iommu(section->mr)) { if (memory_region_is_iommu(section->mr)) {
VFIOGuestIOMMU *giommu; VFIOGuestIOMMU *giommu;
QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { QLIST_FOREACH(giommu, &bcontainer->giommu_list, giommu_next) {
if (MEMORY_REGION(giommu->iommu_mr) == section->mr && if (MEMORY_REGION(giommu->iommu_mr) == section->mr &&
giommu->n.start == section->offset_within_region) { giommu->n.start == section->offset_within_region) {
Int128 llend; Int128 llend;

9
hw/vfio/container-base.c
View File

@ -34,8 +34,17 @@ int vfio_container_dma_unmap(VFIOContainerBase *bcontainer,
void vfio_container_init(VFIOContainerBase *bcontainer, const VFIOIOMMUOps *ops) void vfio_container_init(VFIOContainerBase *bcontainer, const VFIOIOMMUOps *ops)
{ {
bcontainer->ops = ops; bcontainer->ops = ops;
QLIST_INIT(&bcontainer->giommu_list);
} }
void vfio_container_destroy(VFIOContainerBase *bcontainer) void vfio_container_destroy(VFIOContainerBase *bcontainer)
{ {
VFIOGuestIOMMU *giommu, *tmp;
QLIST_FOREACH_SAFE(giommu, &bcontainer->giommu_list, giommu_next, tmp) {
memory_region_unregister_iommu_notifier(
MEMORY_REGION(giommu->iommu_mr), &giommu->n);
QLIST_REMOVE(giommu, giommu_next);
g_free(giommu);
}
} }

8
hw/vfio/container.c
View File

@ -556,7 +556,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
container->dirty_pages_supported = false; container->dirty_pages_supported = false;
container->dma_max_mappings = 0; container->dma_max_mappings = 0;
container->iova_ranges = NULL; container->iova_ranges = NULL;
QLIST_INIT(&container->giommu_list);
QLIST_INIT(&container->vrdl_list); QLIST_INIT(&container->vrdl_list);
bcontainer = &container->bcontainer; bcontainer = &container->bcontainer;
vfio_container_init(bcontainer, &vfio_legacy_ops); vfio_container_init(bcontainer, &vfio_legacy_ops);
@ -686,16 +685,9 @@ static void vfio_disconnect_container(VFIOGroup *group)
if (QLIST_EMPTY(&container->group_list)) { if (QLIST_EMPTY(&container->group_list)) {
VFIOAddressSpace *space = container->space; VFIOAddressSpace *space = container->space;
VFIOGuestIOMMU *giommu, *tmp;
QLIST_REMOVE(container, next); QLIST_REMOVE(container, next);
QLIST_FOREACH_SAFE(giommu, &container->giommu_list, giommu_next, tmp) {
memory_region_unregister_iommu_notifier(
MEMORY_REGION(giommu->iommu_mr), &giommu->n);
QLIST_REMOVE(giommu, giommu_next);
g_free(giommu);
}
vfio_container_destroy(bcontainer); vfio_container_destroy(bcontainer);
trace_vfio_disconnect_container(container->fd); trace_vfio_disconnect_container(container->fd);

9
include/hw/vfio/vfio-common.h
View File

@ -95,7 +95,6 @@ typedef struct VFIOContainer {
uint64_t max_dirty_bitmap_size; uint64_t max_dirty_bitmap_size;
unsigned long pgsizes; unsigned long pgsizes;
unsigned int dma_max_mappings; unsigned int dma_max_mappings;
QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list; QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
QLIST_HEAD(, VFIOGroup) group_list; QLIST_HEAD(, VFIOGroup) group_list;
QLIST_HEAD(, VFIORamDiscardListener) vrdl_list; QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
@ -104,14 +103,6 @@ typedef struct VFIOContainer {
GList *iova_ranges; GList *iova_ranges;
} VFIOContainer; } VFIOContainer;
typedef struct VFIOGuestIOMMU {
VFIOContainer *container;
IOMMUMemoryRegion *iommu_mr;
hwaddr iommu_offset;
IOMMUNotifier n;
QLIST_ENTRY(VFIOGuestIOMMU) giommu_next;
} VFIOGuestIOMMU;
typedef struct VFIORamDiscardListener { typedef struct VFIORamDiscardListener {
VFIOContainer *container; VFIOContainer *container;
MemoryRegion *mr; MemoryRegion *mr;

9
include/hw/vfio/vfio-container-base.h
View File

@ -29,8 +29,17 @@ typedef struct {
*/ */
typedef struct VFIOContainerBase { typedef struct VFIOContainerBase {
const VFIOIOMMUOps *ops; const VFIOIOMMUOps *ops;
QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
} VFIOContainerBase; } VFIOContainerBase;
typedef struct VFIOGuestIOMMU {
VFIOContainerBase *bcontainer;
IOMMUMemoryRegion *iommu_mr;
hwaddr iommu_offset;
IOMMUNotifier n;
QLIST_ENTRY(VFIOGuestIOMMU) giommu_next;
} VFIOGuestIOMMU;
int vfio_container_dma_map(VFIOContainerBase *bcontainer, int vfio_container_dma_map(VFIOContainerBase *bcontainer,
hwaddr iova, ram_addr_t size, hwaddr iova, ram_addr_t size,
void *vaddr, bool readonly); void *vaddr, bool readonly);