iommufd: Consistently manage hwpt_item

This should be added immediately after every iopt_table_add_domain(), and
deleted after every iopt_table_remove_domain() under the ioas->mutex.

Tidy things to be consistent.

Link: https://lore.kernel.org/r/3-v3-ae9c2975a131+2e1e8-iommufd_hwpt_jgg@nvidia.com
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/iommu/iommufd/device.c b/drivers/iommu/iommufd/device.c
index 0a80ff7b2e0d79b9aae0419954fbf68df7aea22b..adb73539b39c0c880608d529918041b73c925622 100644 (file)
--- a/drivers/iommu/iommufd/device.c
+++ b/drivers/iommu/iommufd/device.c
@@ -243,6 +243,7 @@ static int iommufd_device_do_attach(struct iommufd_device *idev,
                                                   hwpt->domain);
                        if (rc)
                                goto out_detach;
+                       list_add_tail(&hwpt->hwpt_item, &hwpt->ioas->hwpt_list);
                }
        }
 
@@ -307,7 +308,6 @@ static int iommufd_device_auto_get_domain(struct iommufd_device *idev,
        rc = iommufd_device_do_attach(idev, hwpt);
        if (rc)
                goto out_abort;
-       list_add_tail(&hwpt->hwpt_item, &ioas->hwpt_list);
 
        mutex_unlock(&ioas->mutex);
        iommufd_object_finalize(idev->ictx, &hwpt->obj);
@@ -753,6 +753,10 @@ iommufd_device_selftest_attach(struct iommufd_ctx *ictx,
        if (rc)
                goto out_hwpt;
 
+       mutex_lock(&ioas->mutex);
+       list_add_tail(&hwpt->hwpt_item, &hwpt->ioas->hwpt_list);
+       mutex_unlock(&ioas->mutex);
+
        refcount_inc(&hwpt->obj.users);
        iommufd_object_finalize(ictx, &hwpt->obj);
        return hwpt;
@@ -765,7 +769,10 @@ out_hwpt:
 void iommufd_device_selftest_detach(struct iommufd_ctx *ictx,
                                    struct iommufd_hw_pagetable *hwpt)
 {
+       mutex_lock(&hwpt->ioas->mutex);
        iopt_table_remove_domain(&hwpt->ioas->iopt, hwpt->domain);
+       list_del(&hwpt->hwpt_item);
+       mutex_unlock(&hwpt->ioas->mutex);
        refcount_dec(&hwpt->obj.users);
 }
 #endif