OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vfio/container: Move per container device list in base container

Browse Source 
VFIO Device is also changed to point to base container instead of
legacy container.

No functional change intended.

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:
Zhenzhong Duan 2023-11-02 15:12:34 +08:00 committed by Cédric Le Goater
parent bb424490ed
commit 3e6015d111
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/vfio/common.c
View File

@ -145,7 +145,7 @@ void vfio_unblock_multiple_devices_migration(void)
bool vfio_viommu_preset(VFIODevice *vbasedev) bool vfio_viommu_preset(VFIODevice *vbasedev)
{ {
return vbasedev->container->bcontainer.space->as != &address_space_memory; return vbasedev->bcontainer->space->as != &address_space_memory;
} }
static void vfio_set_migration_error(int err) static void vfio_set_migration_error(int err)
@ -179,6 +179,7 @@ bool vfio_device_state_is_precopy(VFIODevice *vbasedev)
static bool vfio_devices_all_dirty_tracking(VFIOContainer *container) static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
MigrationState *ms = migrate_get_current(); MigrationState *ms = migrate_get_current();
@ -187,7 +188,7 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
return false; return false;
} }
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
VFIOMigration *migration = vbasedev->migration; VFIOMigration *migration = vbasedev->migration;
if (!migration) { if (!migration) {
@ -205,9 +206,10 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container) bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
if (!vbasedev->dirty_pages_supported) { if (!vbasedev->dirty_pages_supported) {
return false; return false;
} }
@ -222,13 +224,14 @@ bool vfio_devices_all_device_dirty_tracking(VFIOContainer *container)
*/ */
bool vfio_devices_all_running_and_mig_active(VFIOContainer *container) bool vfio_devices_all_running_and_mig_active(VFIOContainer *container)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
if (!migration_is_active(migrate_get_current())) { if (!migration_is_active(migrate_get_current())) {
return false; return false;
} }
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
VFIOMigration *migration = vbasedev->migration; VFIOMigration *migration = vbasedev->migration;
if (!migration) { if (!migration) {
@ -833,12 +836,13 @@ static bool vfio_section_is_vfio_pci(MemoryRegionSection *section,
VFIOContainer *container) VFIOContainer *container)
{ {
VFIOPCIDevice *pcidev; VFIOPCIDevice *pcidev;
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
Object *owner; Object *owner;
owner = memory_region_owner(section->mr); owner = memory_region_owner(section->mr);
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) { if (vbasedev->type != VFIO_DEVICE_TYPE_PCI) {
continue; continue;
} }
@ -939,13 +943,14 @@ static void vfio_devices_dma_logging_stop(VFIOContainer *container)
uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature), uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature),
sizeof(uint64_t))] = {}; sizeof(uint64_t))] = {};
struct vfio_device_feature *feature = (struct vfio_device_feature *)buf; struct vfio_device_feature *feature = (struct vfio_device_feature *)buf;
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
feature->argsz = sizeof(buf); feature->argsz = sizeof(buf);
feature->flags = VFIO_DEVICE_FEATURE_SET | feature->flags = VFIO_DEVICE_FEATURE_SET |
VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP; VFIO_DEVICE_FEATURE_DMA_LOGGING_STOP;
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
if (!vbasedev->dirty_tracking) { if (!vbasedev->dirty_tracking) {
continue; continue;
} }
@ -1036,6 +1041,7 @@ static int vfio_devices_dma_logging_start(VFIOContainer *container)
{ {
struct vfio_device_feature *feature; struct vfio_device_feature *feature;
VFIODirtyRanges ranges; VFIODirtyRanges ranges;
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
int ret = 0; int ret = 0;
@ -1046,7 +1052,7 @@ static int vfio_devices_dma_logging_start(VFIOContainer *container)
return -errno; return -errno;
} }
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
if (vbasedev->dirty_tracking) { if (vbasedev->dirty_tracking) {
continue; continue;
} }
@ -1139,10 +1145,11 @@ int vfio_devices_query_dirty_bitmap(VFIOContainer *container,
VFIOBitmap *vbmap, hwaddr iova, VFIOBitmap *vbmap, hwaddr iova,
hwaddr size) hwaddr size)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
VFIODevice *vbasedev; VFIODevice *vbasedev;
int ret; int ret;
QLIST_FOREACH(vbasedev, &container->device_list, container_next) { QLIST_FOREACH(vbasedev, &bcontainer->device_list, container_next) {
ret = vfio_device_dma_logging_report(vbasedev, iova, size, ret = vfio_device_dma_logging_report(vbasedev, iova, size,
vbmap->bitmap); vbmap->bitmap);
if (ret) { if (ret) {

12
hw/vfio/container.c
View File

@ -888,7 +888,7 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
int groupid = vfio_device_groupid(vbasedev, errp); int groupid = vfio_device_groupid(vbasedev, errp);
VFIODevice *vbasedev_iter; VFIODevice *vbasedev_iter;
VFIOGroup *group; VFIOGroup *group;
VFIOContainer *container; VFIOContainerBase *bcontainer;
int ret; int ret;
if (groupid < 0) { if (groupid < 0) {
@ -915,9 +915,9 @@ int vfio_attach_device(char *name, VFIODevice *vbasedev,
return ret; return ret;
} }
container = group->container; bcontainer = &group->container->bcontainer;
vbasedev->container = container; vbasedev->bcontainer = bcontainer;
QLIST_INSERT_HEAD(&container->device_list, vbasedev, container_next); QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next);
QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next); QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next);
return ret; return ret;
@ -927,13 +927,13 @@ void vfio_detach_device(VFIODevice *vbasedev)
{ {
VFIOGroup *group = vbasedev->group; VFIOGroup *group = vbasedev->group;
if (!vbasedev->container) { if (!vbasedev->bcontainer) {
return; return;
} }
QLIST_REMOVE(vbasedev, global_next); QLIST_REMOVE(vbasedev, global_next);
QLIST_REMOVE(vbasedev, container_next); QLIST_REMOVE(vbasedev, container_next);
vbasedev->container = NULL; vbasedev->bcontainer = NULL;
trace_vfio_detach_device(vbasedev->name, group->groupid); trace_vfio_detach_device(vbasedev->name, group->groupid);
vfio_put_base_device(vbasedev); vfio_put_base_device(vbasedev);
vfio_put_group(group); vfio_put_group(group);

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

@ -90,7 +90,6 @@ typedef struct VFIOContainer {
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;
QLIST_HEAD(, VFIODevice) device_list;
GList *iova_ranges; GList *iova_ranges;
} VFIOContainer; } VFIOContainer;
@ -118,7 +117,7 @@ typedef struct VFIODevice {
QLIST_ENTRY(VFIODevice) container_next; QLIST_ENTRY(VFIODevice) container_next;
QLIST_ENTRY(VFIODevice) global_next; QLIST_ENTRY(VFIODevice) global_next;
struct VFIOGroup *group; struct VFIOGroup *group;
VFIOContainer *container; VFIOContainerBase *bcontainer;
char *sysfsdev; char *sysfsdev;
char *name; char *name;
DeviceState *dev; DeviceState *dev;

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

@ -39,6 +39,7 @@ typedef struct VFIOContainerBase {
bool dirty_pages_supported; bool dirty_pages_supported;
QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
QLIST_ENTRY(VFIOContainerBase) next; QLIST_ENTRY(VFIOContainerBase) next;
QLIST_HEAD(, VFIODevice) device_list;
} VFIOContainerBase; } VFIOContainerBase;
typedef struct VFIOGuestIOMMU { typedef struct VFIOGuestIOMMU {