Commit b09d6e47 authored by Shameer Kolothum's avatar Shameer Kolothum Committed by Alex Williamson

vfio/type1: remove duplicate retrieval of reserved regions

As we now already have the reserved regions list, just pass that into
vfio_iommu_has_sw_msi() fn.
Signed-off-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent a7170720
...@@ -1296,15 +1296,13 @@ static struct vfio_group *find_iommu_group(struct vfio_domain *domain, ...@@ -1296,15 +1296,13 @@ static struct vfio_group *find_iommu_group(struct vfio_domain *domain,
return NULL; return NULL;
} }
static bool vfio_iommu_has_sw_msi(struct iommu_group *group, phys_addr_t *base) static bool vfio_iommu_has_sw_msi(struct list_head *group_resv_regions,
phys_addr_t *base)
{ {
struct list_head group_resv_regions; struct iommu_resv_region *region;
struct iommu_resv_region *region, *next;
bool ret = false; bool ret = false;
INIT_LIST_HEAD(&group_resv_regions); list_for_each_entry(region, group_resv_regions, list) {
iommu_get_group_resv_regions(group, &group_resv_regions);
list_for_each_entry(region, &group_resv_regions, list) {
/* /*
* The presence of any 'real' MSI regions should take * The presence of any 'real' MSI regions should take
* precedence over the software-managed one if the * precedence over the software-managed one if the
...@@ -1320,8 +1318,7 @@ static bool vfio_iommu_has_sw_msi(struct iommu_group *group, phys_addr_t *base) ...@@ -1320,8 +1318,7 @@ static bool vfio_iommu_has_sw_msi(struct iommu_group *group, phys_addr_t *base)
ret = true; ret = true;
} }
} }
list_for_each_entry_safe(region, next, &group_resv_regions, list)
kfree(region);
return ret; return ret;
} }
...@@ -1768,7 +1765,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, ...@@ -1768,7 +1765,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,
if (ret) if (ret)
goto out_detach; goto out_detach;
resv_msi = vfio_iommu_has_sw_msi(iommu_group, &resv_msi_base); resv_msi = vfio_iommu_has_sw_msi(&group_resv_regions, &resv_msi_base);
INIT_LIST_HEAD(&domain->group_list); INIT_LIST_HEAD(&domain->group_list);
list_add(&group->next, &domain->group_list); list_add(&group->next, &domain->group_list);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment