Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
@duanzhenzhong @legoater
duanzhenzhong authored and legoater committed Dec 19, 2023
1 parent 6ad359e commit dbb9d0c
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 17 deletions.
36 changes: 20 additions & 16 deletions hw/vfio/spapr.c
View file
Expand Up @@ -27,6 +27,7 @@
typedef struct VFIOSpaprContainer {
VFIOContainer container;
MemoryListener prereg_listener;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
} VFIOSpaprContainer;

static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *section)
Expand Down Expand Up @@ -154,12 +155,12 @@ static const MemoryListener vfio_prereg_listener = {
.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)
{
VFIOHostDMAWindow *hostwin;

QLIST_FOREACH(hostwin, &container->hostwin_list, hostwin_next) {
QLIST_FOREACH(hostwin, &scontainer->hostwin_list, hostwin_next) {
if (ranges_overlap(hostwin->min_iova,
hostwin->max_iova - hostwin->min_iova + 1,
min_iova,
Expand All @@ -173,15 +174,15 @@ static void vfio_host_win_add(VFIOContainer *container, hwaddr min_iova,
hostwin->min_iova = min_iova;
hostwin->max_iova = max_iova;
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)
{
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) {
QLIST_REMOVE(hostwin, hostwin_next);
g_free(hostwin);
Expand All @@ -192,7 +193,7 @@ static int vfio_host_win_del(VFIOContainer *container,
return -1;
}

static VFIOHostDMAWindow *vfio_find_hostwin(VFIOContainer *container,
static VFIOHostDMAWindow *vfio_find_hostwin(VFIOSpaprContainer *container,
hwaddr iova, hwaddr end)
{
VFIOHostDMAWindow *hostwin;
Expand Down Expand Up @@ -329,6 +330,8 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
{
VFIOContainer *container = container_of(bcontainer, VFIOContainer,
bcontainer);
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);
VFIOHostDMAWindow *hostwin;
hwaddr pgsize = 0;
int ret;
Expand All @@ -344,7 +347,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
iova = section->offset_within_address_space;
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"
" 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container,
iova, end);
Expand All @@ -358,7 +361,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
}

/* 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,
hostwin->max_iova - hostwin->min_iova + 1,
section->offset_within_address_space,
Expand All @@ -380,7 +383,7 @@ vfio_spapr_container_add_section_window(VFIOContainerBase *bcontainer,
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 +
int128_get64(section->size) - 1, pgsize);
#ifdef CONFIG_KVM
Expand Down Expand Up @@ -419,14 +422,16 @@ vfio_spapr_container_del_section_window(VFIOContainerBase *bcontainer,
{
VFIOContainer *container = container_of(bcontainer, VFIOContainer,
bcontainer);
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);

if (container->iommu_type != VFIO_SPAPR_TCE_v2_IOMMU) {
return;
}

vfio_spapr_remove_window(container,
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 +
int128_get64(section->size) - 1) < 0) {
Expand Down Expand Up @@ -454,7 +459,7 @@ int vfio_spapr_container_init(VFIOContainer *container, Error **errp)
bool v2 = container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU;
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
Expand Down Expand Up @@ -506,7 +511,7 @@ int vfio_spapr_container_init(VFIOContainer *container, Error **errp)
} else {
/* The default table uses 4K pages */
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_size - 1,
0x1000);
Expand All @@ -525,15 +530,14 @@ int vfio_spapr_container_init(VFIOContainer *container, Error **errp)

void vfio_spapr_container_deinit(VFIOContainer *container)
{
VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
container);
VFIOHostDMAWindow *hostwin, *next;

if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
VFIOSpaprContainer *scontainer = container_of(container,
VFIOSpaprContainer,
container);
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) {
QLIST_REMOVE(hostwin, hostwin_next);
g_free(hostwin);
Expand Down
1 change: 0 additions & 1 deletion include/hw/vfio/vfio-common.h
View file
Expand Up @@ -79,7 +79,6 @@ typedef struct VFIOContainer {
VFIOContainerBase bcontainer;
int fd; /* /dev/vfio/vfio, empowered by the attached groups */
unsigned iommu_type;
QLIST_HEAD(, VFIOHostDMAWindow) hostwin_list;
QLIST_HEAD(, VFIOGroup) group_list;
} VFIOContainer;

Expand Down

0 comments on commit dbb9d0c

Please sign in to comment.