diff options
| author |   Zenghui Yu <yuzenghui@huawei.com> | 2020-10-22 20:24:17 +0800 |
|---|---|---|
| committer |   Alex Williamson <alex.williamson@redhat.com> | 2020-11-02 14:58:29 -0700 |
| commit | 572f64c71e0fe30089699b22ce0ca3d4bf452ce9 (patch) | |
| tree | 8e1f6e2012e338f8d5f20a997b789ae6a9a49ba4 /drivers/vfio/vfio_iommu_type1.c | |
| parent | Linux 5.10-rc2 (diff) | |
| download | linux-dev-572f64c71e0fe30089699b22ce0ca3d4bf452ce9.tar.xz linux-dev-572f64c71e0fe30089699b22ce0ca3d4bf452ce9.zip | |
vfio/type1: Use the new helper to find vfio_group
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>
Diffstat (limited to 'drivers/vfio/vfio_iommu_type1.c')
| -rw-r--r-- | drivers/vfio/vfio_iommu_type1.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index bb2684cc245e..67e827638995 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -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,18 +2010,10 @@ 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)) { - 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; - } + /* Check for duplicates */ + if (vfio_iommu_find_iommu_group(iommu, iommu_group)) { + mutex_unlock(&iommu->lock); + return -EINVAL; } group = kzalloc(sizeof(*group), GFP_KERNEL); |