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

vfio/container: Move vrdl_list to base container

Browse Source 
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:37 +08:00 committed by Cédric Le Goater
parent 7ab1cb74ff
commit dc74a4b005
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/vfio/common.c
View File

@ -351,13 +351,13 @@ static void vfio_ram_discard_notify_discard(RamDiscardListener *rdl,
{ {
VFIORamDiscardListener *vrdl = container_of(rdl, VFIORamDiscardListener, VFIORamDiscardListener *vrdl = container_of(rdl, VFIORamDiscardListener,
listener); listener);
VFIOContainerBase *bcontainer = vrdl->bcontainer;
const hwaddr size = int128_get64(section->size); const hwaddr size = int128_get64(section->size);
const hwaddr iova = section->offset_within_address_space; const hwaddr iova = section->offset_within_address_space;
int ret; int ret;
/* Unmap with a single call. */ /* Unmap with a single call. */
ret = vfio_container_dma_unmap(&vrdl->container->bcontainer, ret = vfio_container_dma_unmap(bcontainer, iova, size , NULL);
iova, size , NULL);
if (ret) { if (ret) {
error_report("%s: vfio_container_dma_unmap() failed: %s", __func__, error_report("%s: vfio_container_dma_unmap() failed: %s", __func__,
strerror(-ret)); strerror(-ret));
@ -369,6 +369,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl,
{ {
VFIORamDiscardListener *vrdl = container_of(rdl, VFIORamDiscardListener, VFIORamDiscardListener *vrdl = container_of(rdl, VFIORamDiscardListener,
listener); listener);
VFIOContainerBase *bcontainer = vrdl->bcontainer;
const hwaddr end = section->offset_within_region + const hwaddr end = section->offset_within_region +
int128_get64(section->size); int128_get64(section->size);
hwaddr start, next, iova; hwaddr start, next, iova;
@ -387,8 +388,8 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl,
section->offset_within_address_space; section->offset_within_address_space;
vaddr = memory_region_get_ram_ptr(section->mr) + start; vaddr = memory_region_get_ram_ptr(section->mr) + start;
ret = vfio_container_dma_map(&vrdl->container->bcontainer, iova, ret = vfio_container_dma_map(bcontainer, iova, next - start,
next - start, vaddr, section->readonly); vaddr, section->readonly);
if (ret) { if (ret) {
/* Rollback */ /* Rollback */
vfio_ram_discard_notify_discard(rdl, section); vfio_ram_discard_notify_discard(rdl, section);
@ -398,10 +399,9 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl,
return 0; return 0;
} }
static void vfio_register_ram_discard_listener(VFIOContainer *container, static void vfio_register_ram_discard_listener(VFIOContainerBase *bcontainer,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
VFIOContainerBase *bcontainer = &container->bcontainer;
RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr); RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr);
VFIORamDiscardListener *vrdl; VFIORamDiscardListener *vrdl;
@ -412,7 +412,7 @@ static void vfio_register_ram_discard_listener(VFIOContainer *container,
g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), TARGET_PAGE_SIZE)); g_assert(QEMU_IS_ALIGNED(int128_get64(section->size), TARGET_PAGE_SIZE));
vrdl = g_new0(VFIORamDiscardListener, 1); vrdl = g_new0(VFIORamDiscardListener, 1);
vrdl->container = container; vrdl->bcontainer = bcontainer;
vrdl->mr = section->mr; vrdl->mr = section->mr;
vrdl->offset_within_address_space = section->offset_within_address_space; vrdl->offset_within_address_space = section->offset_within_address_space;
vrdl->size = int128_get64(section->size); vrdl->size = int128_get64(section->size);
@ -427,7 +427,7 @@ static void vfio_register_ram_discard_listener(VFIOContainer *container,
vfio_ram_discard_notify_populate, vfio_ram_discard_notify_populate,
vfio_ram_discard_notify_discard, true); vfio_ram_discard_notify_discard, true);
ram_discard_manager_register_listener(rdm, &vrdl->listener, section); ram_discard_manager_register_listener(rdm, &vrdl->listener, section);
QLIST_INSERT_HEAD(&container->vrdl_list, vrdl, next); QLIST_INSERT_HEAD(&bcontainer->vrdl_list, vrdl, next);
/* /*
* Sanity-check if we have a theoretically problematic setup where we could * Sanity-check if we have a theoretically problematic setup where we could
@ -451,7 +451,7 @@ static void vfio_register_ram_discard_listener(VFIOContainer *container,
} }
#endif #endif
QLIST_FOREACH(vrdl, &container->vrdl_list, next) { QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
hwaddr start, end; hwaddr start, end;
start = QEMU_ALIGN_DOWN(vrdl->offset_within_address_space, start = QEMU_ALIGN_DOWN(vrdl->offset_within_address_space,
@ -473,13 +473,13 @@ static void vfio_register_ram_discard_listener(VFIOContainer *container,
} }
} }
static void vfio_unregister_ram_discard_listener(VFIOContainer *container, static void vfio_unregister_ram_discard_listener(VFIOContainerBase *bcontainer,
MemoryRegionSection *section) MemoryRegionSection *section)
{ {
RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr); RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr);
VFIORamDiscardListener *vrdl = NULL; VFIORamDiscardListener *vrdl = NULL;
QLIST_FOREACH(vrdl, &container->vrdl_list, next) { QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
if (vrdl->mr == section->mr && if (vrdl->mr == section->mr &&
vrdl->offset_within_address_space == vrdl->offset_within_address_space ==
section->offset_within_address_space) { section->offset_within_address_space) {
@ -663,7 +663,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
* about changes. * about changes.
*/ */
if (memory_region_has_ram_discard_manager(section->mr)) { if (memory_region_has_ram_discard_manager(section->mr)) {
vfio_register_ram_discard_listener(container, section); vfio_register_ram_discard_listener(bcontainer, section);
return; return;
} }
@ -781,7 +781,7 @@ static void vfio_listener_region_del(MemoryListener *listener,
pgmask = (1ULL << ctz64(bcontainer->pgsizes)) - 1; pgmask = (1ULL << ctz64(bcontainer->pgsizes)) - 1;
try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask)); try_unmap = !((iova & pgmask) || (int128_get64(llsize) & pgmask));
} else if (memory_region_has_ram_discard_manager(section->mr)) { } else if (memory_region_has_ram_discard_manager(section->mr)) {
vfio_unregister_ram_discard_listener(container, section); vfio_unregister_ram_discard_listener(bcontainer, section);
/* Unregistering will trigger an unmap. */ /* Unregistering will trigger an unmap. */
try_unmap = false; try_unmap = false;
} }
@ -1260,17 +1260,17 @@ static int vfio_ram_discard_get_dirty_bitmap(MemoryRegionSection *section,
* Sync the whole mapped region (spanning multiple individual mappings) * Sync the whole mapped region (spanning multiple individual mappings)
* in one go. * in one go.
*/ */
return vfio_get_dirty_bitmap(&vrdl->container->bcontainer, iova, size, return vfio_get_dirty_bitmap(vrdl->bcontainer, iova, size, ram_addr);
ram_addr);
} }
static int vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainer *container, static int
MemoryRegionSection *section) vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer,
MemoryRegionSection *section)
{ {
RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr); RamDiscardManager *rdm = memory_region_get_ram_discard_manager(section->mr);
VFIORamDiscardListener *vrdl = NULL; VFIORamDiscardListener *vrdl = NULL;
QLIST_FOREACH(vrdl, &container->vrdl_list, next) { QLIST_FOREACH(vrdl, &bcontainer->vrdl_list, next) {
if (vrdl->mr == section->mr && if (vrdl->mr == section->mr &&
vrdl->offset_within_address_space == vrdl->offset_within_address_space ==
section->offset_within_address_space) { section->offset_within_address_space) {
@ -1324,7 +1324,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainer *container,
} }
return 0; return 0;
} else if (memory_region_has_ram_discard_manager(section->mr)) { } else if (memory_region_has_ram_discard_manager(section->mr)) {
return vfio_sync_ram_discard_listener_dirty_bitmap(container, section); return vfio_sync_ram_discard_listener_dirty_bitmap(bcontainer, section);
} }
ram_addr = memory_region_get_ram_addr(section->mr) + ram_addr = memory_region_get_ram_addr(section->mr) +

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

@ -54,6 +54,7 @@ void vfio_container_init(VFIOContainerBase *bcontainer, VFIOAddressSpace *space,
bcontainer->dirty_pages_supported = false; bcontainer->dirty_pages_supported = false;
bcontainer->dma_max_mappings = 0; bcontainer->dma_max_mappings = 0;
QLIST_INIT(&bcontainer->giommu_list); QLIST_INIT(&bcontainer->giommu_list);
QLIST_INIT(&bcontainer->vrdl_list);
} }
void vfio_container_destroy(VFIOContainerBase *bcontainer) void vfio_container_destroy(VFIOContainerBase *bcontainer)

1
hw/vfio/container.c
View File

@ -560,7 +560,6 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
container->fd = fd; container->fd = fd;
container->error = NULL; container->error = NULL;
container->iova_ranges = NULL; container->iova_ranges = NULL;
QLIST_INIT(&container->vrdl_list);
bcontainer = &container->bcontainer; bcontainer = &container->bcontainer;
vfio_container_init(bcontainer, space, &vfio_legacy_ops); vfio_container_init(bcontainer, space, &vfio_legacy_ops);

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

@ -87,20 +87,9 @@ typedef struct VFIOContainer {
uint64_t max_dirty_bitmap_size; uint64_t max_dirty_bitmap_size;
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;
GList *iova_ranges; GList *iova_ranges;
} VFIOContainer; } VFIOContainer;
typedef struct VFIORamDiscardListener {
VFIOContainer *container;
MemoryRegion *mr;
hwaddr offset_within_address_space;
hwaddr size;
uint64_t granularity;
RamDiscardListener listener;
QLIST_ENTRY(VFIORamDiscardListener) next;
} VFIORamDiscardListener;
typedef struct VFIOHostDMAWindow { typedef struct VFIOHostDMAWindow {
hwaddr min_iova; hwaddr min_iova;
hwaddr max_iova; hwaddr max_iova;

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

@ -40,6 +40,7 @@ typedef struct VFIOContainerBase {
unsigned int dma_max_mappings; unsigned int dma_max_mappings;
bool dirty_pages_supported; bool dirty_pages_supported;
QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; QLIST_HEAD(, VFIOGuestIOMMU) giommu_list;
QLIST_HEAD(, VFIORamDiscardListener) vrdl_list;
QLIST_ENTRY(VFIOContainerBase) next; QLIST_ENTRY(VFIOContainerBase) next;
QLIST_HEAD(, VFIODevice) device_list; QLIST_HEAD(, VFIODevice) device_list;
} VFIOContainerBase; } VFIOContainerBase;
@ -52,6 +53,16 @@ typedef struct VFIOGuestIOMMU {
QLIST_ENTRY(VFIOGuestIOMMU) giommu_next; QLIST_ENTRY(VFIOGuestIOMMU) giommu_next;
} VFIOGuestIOMMU; } VFIOGuestIOMMU;
typedef struct VFIORamDiscardListener {
VFIOContainerBase *bcontainer;
MemoryRegion *mr;
hwaddr offset_within_address_space;
hwaddr size;
uint64_t granularity;
RamDiscardListener listener;
QLIST_ENTRY(VFIORamDiscardListener) next;
} VFIORamDiscardListener;
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);