On Thu, 22 Oct 2020 20:24:17 +0800 Zenghui Yu <[email protected]> wrote:
> 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 <[email protected]> > --- > drivers/vfio/vfio_iommu_type1.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) Applied to vfio for-linus branch for v5.10. Thanks, Alex > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index a05d856ae806..aa586bd684da 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -1997,6 +1997,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) > { > @@ -2013,18 +2014,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);
