vfio/type1: Use the new helper to find vfio_group (572f64c7) · Commits · 戴 / test

When attaching a new group to the container, let's use the new helper vfio_iommu_find_iommu_group() to check if it's already attached. There is no functional change. Also take this chance to add a missing blank line. Signed-off-by:

Zenghui Yu <yuzenghui@huawei.com> Signed-off-by:

Alex Williamson <alex.williamson@redhat.com>

drivers/vfio/vfio_iommu_type1.c

+5 −12

Original line number	Diff line number	Diff line
		@@ -1993,6 +1993,7 @@ static void vfio_iommu_iova_insert_copy(struct vfio_iommu *iommu,

		list_splice_tail(iova_copy, iova);
		}

		static int vfio_iommu_type1_attach_group(void *iommu_data,
		struct iommu_group *iommu_group)
		{
		@@ -2009,19 +2010,11 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,

		mutex_lock(&iommu->lock);

		list_for_each_entry(d, &iommu->domain_list, next) {
		if (find_iommu_group(d, iommu_group)) {
		/* Check for duplicates */
		if (vfio_iommu_find_iommu_group(iommu, iommu_group)) {
		mutex_unlock(&iommu->lock);
		return -EINVAL;
		}
		}

		if (iommu->external_domain) {
		if (find_iommu_group(iommu->external_domain, iommu_group)) {
		mutex_unlock(&iommu->lock);
		return -EINVAL;
		}
		}

		group = kzalloc(sizeof(*group), GFP_KERNEL);
		domain = kzalloc(sizeof(*domain), GFP_KERNEL);

Admin message