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

vfio/spapr: Move hostwin_list into spapr container 

No functional changes 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:45 +08:00 committed by Cédric Le Goater
parent 6ad359ec29
commit dbb9d0c969
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/vfio/spapr.c
View File

@ -27,6 +27,7 @@
typedef struct VFIOSpaprContainer { typedef struct VFIOSpaprContainer {
VFIOContainer container; VFIOContainer container;
MemoryListener prereg_listener; MemoryListener prereg_listener;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
} VFIOSpaprContainer; } VFIOSpaprContainer;
static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *section) static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *section)
@ -154,12 +155,12 @@ static const MemoryListener vfio_prereg_listener = {
.region_del = vfio_prereg_listener_region_del, .region_del = vfio_prereg_listener_region_del,
}; };
static void vfio_host_win_add(VFIOContainer *container, hwaddr min_iova, static void vfio_host_win_add(VFIOSpaprContainer *scontainer, hwaddr min_iova,
hwaddr max_iova, uint64_t iova_pgsizes) hwaddr max_iova, uint64_t iova_pgsizes)
{ {
VFIOHostDMAWindow *hostwin; VFIOHostDMAWindow *hostwin;
QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) { QLIST_FOREACH(hostwin, &scontainer->hostwin_list, hostwin_next) {
if (ranges_overlap(hostwin->min_iova, if (ranges_overlap(hostwin->min_iova,
hostwin->max_iova - hostwin->min_iova + 1, hostwin->max_iova - hostwin->min_iova + 1,
min_iova, min_iova,
@ -173,15 +174,15 @@ static void vfio_host_win_add(VFIOContainer *container, hwaddr min_iova,
hostwin->min_iova = min_iova; hostwin->min_iova = min_iova;
hostwin->max_iova = max_iova; hostwin->max_iova = max_iova;
hostwin->iova_pgsizes = iova_pgsizes; hostwin->iova_pgsizes = iova_pgsizes;
QLIST_INSERT_HEAD(&container->hostwin_list, hostwin, hostwin_next); QLIST_INSERT_HEAD(&scontainer->hostwin_list, hostwin, hostwin_next);
} }
static int vfio_host_win_del(VFIOContainer *container, static int vfio_host_win_del(VFIOSpaprContainer *scontainer,
hwaddr min_iova, hwaddr max_iova) hwaddr min_iova, hwaddr max_iova)
{ {
VFIOHostDMAWindow *hostwin; VFIOHostDMAWindow *hostwin;
QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) { QLIST_FOREACH(hostwin, &scontainer->hostwin_list, hostwin_next) {
if (hostwin->min_iova == min_iova && hostwin->max_iova == max_iova) { if (hostwin->min_iova == min_iova && hostwin->max_iova == max_iova) {
QLIST_REMOVE(hostwin, hostwin_next); QLIST_REMOVE(hostwin, hostwin_next);
g_free(hostwin); g_free(hostwin);
@ -192,7 +193,7 @@ static int vfio_host_win_del(VFIOContainer *container,
return -1; return -1;
} }
static VFIOHostDMAWindow *vfio_find_hostwin(VFIOContainer *container, static VFIOHostDMAWindow *vfio_find_hostwin(VFIOSpaprContainer *container,
hwaddr iova, hwaddr end) hwaddr iova, hwaddr end)
{ {
VFIOHostDMAWindow *hostwin; VFIOHostDMAWindow *hostwin;
@ -329,6 +330,8 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
{ {
VFIOContainer *container = container_of(bcontainer, VFIOContainer, VFIOContainer *container = container_of(bcontainer, VFIOContainer,
bcontainer); bcontainer);
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);
VFIOHostDMAWindow *hostwin; VFIOHostDMAWindow *hostwin;
hwaddr pgsize = 0; hwaddr pgsize = 0;
int ret; int ret;
@ -344,7 +347,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
iova = section->offset_within_address_space; iova = section->offset_within_address_space;
end = iova + int128_get64(section->size) - 1; end = iova + int128_get64(section->size) - 1;
if (!vfio_find_hostwin(container, iova, end)) { if (!vfio_find_hostwin(scontainer, iova, end)) {
error_setg(errp, "Container %p can't map guest IOVA region" error_setg(errp, "Container %p can't map guest IOVA region"
" 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container,
iova, end); iova, end);
@ -358,7 +361,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
} }
/* For now intersections are not allowed, we may relax this later */ /* For now intersections are not allowed, we may relax this later */
QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) { QLIST_FOREACH(hostwin, &scontainer->hostwin_list, hostwin_next) {
if (ranges_overlap(hostwin->min_iova, if (ranges_overlap(hostwin->min_iova,
hostwin->max_iova - hostwin->min_iova + 1, hostwin->max_iova - hostwin->min_iova + 1,
section->offset_within_address_space, section->offset_within_address_space,
@ -380,7 +383,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
return ret; return ret;
} }
vfio_host_win_add(container, section->offset_within_address_space, vfio_host_win_add(scontainer, section->offset_within_address_space,
section->offset_within_address_space + section->offset_within_address_space +
int128_get64(section->size) - 1, pgsize); int128_get64(section->size) - 1, pgsize);
#ifdef CONFIG_KVM #ifdef CONFIG_KVM
@ -419,6 +422,8 @@ vfio_spapr_container_del_section_window(VFIOContainerBase *bcontainer,
{ {
VFIOContainer *container = container_of(bcontainer, VFIOContainer, VFIOContainer *container = container_of(bcontainer, VFIOContainer,
bcontainer); bcontainer);
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);
if (container->iommu_type != VFIO_SPAPR_TCE_v2_IOMMU) { if (container->iommu_type != VFIO_SPAPR_TCE_v2_IOMMU) {
return; return;
@ -426,7 +431,7 @@ vfio_spapr_container_del_section_window(VFIOContainerBase *bcontainer,
vfio_spapr_remove_window(container, vfio_spapr_remove_window(container,
section->offset_within_address_space); section->offset_within_address_space);
if (vfio_host_win_del(container, if (vfio_host_win_del(scontainer,
section->offset_within_address_space, section->offset_within_address_space,
section->offset_within_address_space + section->offset_within_address_space +
int128_get64(section->size) - 1) < 0) { int128_get64(section->size) - 1) < 0) {
@ -454,7 +459,7 @@ int vfio_spapr_container_init(VFIOContainer *container, Error **errp)
bool v2 = container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU; bool v2 = container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU;
int ret, fd = container->fd; int ret, fd = container->fd;
QLIST_INIT(&container->hostwin_list); QLIST_INIT(&scontainer->hostwin_list);
/* /*
* The host kernel code implementing VFIO_IOMMU_DISABLE is called * The host kernel code implementing VFIO_IOMMU_DISABLE is called
@ -506,7 +511,7 @@ int vfio_spapr_container_init(VFIOContainer *container, Error **errp)
} else { } else {
/* The default table uses 4K pages */ /* The default table uses 4K pages */
bcontainer->pgsizes = 0x1000; bcontainer->pgsizes = 0x1000;
vfio_host_win_add(container, info.dma32_window_start, vfio_host_win_add(scontainer, info.dma32_window_start,
info.dma32_window_start + info.dma32_window_start +
info.dma32_window_size - 1, info.dma32_window_size - 1,
0x1000); 0x1000);
@ -525,15 +530,14 @@ listener_unregister_exit:
void vfio_spapr_container_deinit(VFIOContainer *container) void vfio_spapr_container_deinit(VFIOContainer *container)
{ {
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);
VFIOHostDMAWindow *hostwin, *next; VFIOHostDMAWindow *hostwin, *next;
if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) { if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
VFIOSpaprContainer *scontainer = container_of(container,
VFIOSpaprContainer,
container);
memory_listener_unregister(&scontainer->prereg_listener); memory_listener_unregister(&scontainer->prereg_listener);
} }
QLIST_FOREACH_SAFE(hostwin, &container->hostwin_list, hostwin_next, QLIST_FOREACH_SAFE(hostwin, &scontainer->hostwin_list, hostwin_next,
next) { next) {
QLIST_REMOVE(hostwin, hostwin_next); QLIST_REMOVE(hostwin, hostwin_next);
g_free(hostwin); g_free(hostwin);

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

@ -79,7 +79,6 @@ typedef struct VFIOContainer {
VFIOContainerBase bcontainer; VFIOContainerBase bcontainer;
int fd; /* /dev/vfio/vfio, empowered by the attached groups */ int fd; /* /dev/vfio/vfio, empowered by the attached groups */
unsigned iommu_type; unsigned iommu_type;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
QLIST_HEAD(, VFIOGroup) group_list; QLIST_HEAD(, VFIOGroup) group_list;
} VFIOContainer; } VFIOContainer;