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: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index d0c5e768acb7694e383edb5a3cc998a7ba7797e8..a68405f24fbf365e6edae034f1799807d45aaf3b 100644 (file)
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1296,15 +1296,13 @@ static struct vfio_group *find_iommu_group(struct vfio_domain *domain,
        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, *next;
+       struct iommu_resv_region *region;
        bool ret = false;
 
-       INIT_LIST_HEAD(&group_resv_regions);
-       iommu_get_group_resv_regions(group, &group_resv_regions);
-       list_for_each_entry(region, &group_resv_regions, list) {
+       list_for_each_entry(region, group_resv_regions, list) {
                /*
                 * The presence of any 'real' MSI regions should take
                 * 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)
                        ret = true;
                }
        }
-       list_for_each_entry_safe(region, next, &group_resv_regions, list)
-               kfree(region);
+
        return ret;
 }
 
@@ -1768,7 +1765,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,
        if (ret)
                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);
        list_add(&group->next, &domain->group_list);