[PATCH v4 4/5] vfio/iommu_type1: Clean up update_dirty_scope in detach_group()

[Nicolin Chen via iommu]

All devices in emulated_iommu_groups have pinned_page_dirty_scope
set, so the update_dirty_scope in the first list_for_each_entry
is always false. Clean it up, and move the "if update_dirty_scope"
part from the detach_group_done routine to the domain_list part.

Suggested-by: Jason Gunthorpe <j...@nvidia.com>
Reviewed-by: Kevin Tian <kevin.t...@intel.com>
Signed-off-by: Nicolin Chen <nicol...@nvidia.com>
---
 drivers/vfio/vfio_iommu_type1.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 11be5f95580b..b9ccb3cfac5d 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -2453,14 +2453,12 @@ static void vfio_iommu_type1_detach_group(void 
*iommu_data,
        struct vfio_iommu *iommu = iommu_data;
        struct vfio_domain *domain;
        struct vfio_iommu_group *group;
-       bool update_dirty_scope = false;
        LIST_HEAD(iova_copy);
 
        mutex_lock(&iommu->lock);
        list_for_each_entry(group, &iommu->emulated_iommu_groups, next) {
                if (group->iommu_group != iommu_group)
                        continue;
-               update_dirty_scope = !group->pinned_page_dirty_scope;
                list_del(&group->next);
                kfree(group);
 
@@ -2469,7 +2467,8 @@ static void vfio_iommu_type1_detach_group(void 
*iommu_data,
                        WARN_ON(iommu->notifier.head);
                        vfio_iommu_unmap_unpin_all(iommu);
                }
-               goto detach_group_done;
+               mutex_unlock(&iommu->lock);
+               return;
        }
 
        /*
@@ -2485,9 +2484,7 @@ static void vfio_iommu_type1_detach_group(void 
*iommu_data,
                        continue;
 
                iommu_detach_group(domain->domain, group->iommu_group);
-               update_dirty_scope = !group->pinned_page_dirty_scope;
                list_del(&group->next);
-               kfree(group);
                /*
                 * Group ownership provides privilege, if the group list is
                 * empty, the domain goes away. If it's the last domain with
@@ -2510,6 +2507,16 @@ static void vfio_iommu_type1_detach_group(void 
*iommu_data,
                        vfio_iommu_aper_expand(iommu, &iova_copy);
                        vfio_update_pgsize_bitmap(iommu);
                }
+               /*
+                * Removal of a group without dirty tracking may allow
+                * the iommu scope to be promoted.
+                */
+               if (!group->pinned_page_dirty_scope) {
+                       iommu->num_non_pinned_groups--;
+                       if (iommu->dirty_page_tracking)
+                               vfio_iommu_populate_bitmap_full(iommu);
+               }
+               kfree(group);
                break;
        }
 
@@ -2518,16 +2525,6 @@ static void vfio_iommu_type1_detach_group(void 
*iommu_data,
        else
                vfio_iommu_iova_free(&iova_copy);
 
-detach_group_done:
-       /*
-        * Removal of a group without dirty tracking may allow the iommu scope
-        * to be promoted.
-        */
-       if (update_dirty_scope) {
-               iommu->num_non_pinned_groups--;
-               if (iommu->dirty_page_tracking)
-                       vfio_iommu_populate_bitmap_full(iommu);
-       }
        mutex_unlock(&iommu->lock);
 }
 
-- 
2.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu