From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754115AbcKUL3r (ORCPT ); Mon, 21 Nov 2016 06:29:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56372 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753967AbcKUL3q (ORCPT ); Mon, 21 Nov 2016 06:29:46 -0500 Subject: Re: [PATCH v14 08/22] vfio iommu type1: Add find_iommu_group() function To: Kirti Wankhede , alex.williamson@redhat.com, pbonzini@redhat.com, kraxel@redhat.com, cjia@nvidia.com References: <1479329194-10247-1-git-send-email-kwankhede@nvidia.com> <1479329194-10247-9-git-send-email-kwankhede@nvidia.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, kevin.tian@intel.com, jike.song@intel.com, bjsdjshi@linux.vnet.ibm.com, linux-kernel@vger.kernel.org From: Auger Eric Message-ID: Date: Mon, 21 Nov 2016 12:29:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1479329194-10247-9-git-send-email-kwankhede@nvidia.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 21 Nov 2016 11:29:45 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 16/11/2016 21:46, Kirti Wankhede wrote: > Add find_iommu_group() > > Signed-off-by: Kirti Wankhede > Signed-off-by: Neo Jia > Reviewed-by: Jike Song > Reviewed-by: Dong Jia Shi > > Change-Id: I9d372f1ebe9eb01a5a21374b8a2b03f7df73601f > --- > drivers/vfio/vfio_iommu_type1.c | 57 ++++++++++++++++++++++++----------------- > 1 file changed, 33 insertions(+), 24 deletions(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 52af5fc01d91..ffe2026f1341 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -752,11 +752,24 @@ static void vfio_test_domain_fgsp(struct vfio_domain *domain) > __free_pages(pages, order); > } > > +static struct vfio_group *find_iommu_group(struct vfio_domain *domain, > + struct iommu_group *iommu_group) > +{ > + struct vfio_group *g; > + > + list_for_each_entry(g, &domain->group_list, next) { > + if (g->iommu_group == iommu_group) > + return g; > + } > + > + return NULL; > +} > + > static int vfio_iommu_type1_attach_group(void *iommu_data, > struct iommu_group *iommu_group) > { > struct vfio_iommu *iommu = iommu_data; > - struct vfio_group *group, *g; > + struct vfio_group *group; > struct vfio_domain *domain, *d; > struct bus_type *bus = NULL; > int ret; > @@ -764,10 +777,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, > mutex_lock(&iommu->lock); > > list_for_each_entry(d, &iommu->domain_list, next) { > - list_for_each_entry(g, &d->group_list, next) { > - if (g->iommu_group != iommu_group) > - continue; > - > + if (find_iommu_group(d, iommu_group)) { > mutex_unlock(&iommu->lock); > return -EINVAL; > } > @@ -887,27 +897,26 @@ static void vfio_iommu_type1_detach_group(void *iommu_data, > mutex_lock(&iommu->lock); > > list_for_each_entry(domain, &iommu->domain_list, next) { > - list_for_each_entry(group, &domain->group_list, next) { > - if (group->iommu_group != iommu_group) > - continue; > + group = find_iommu_group(domain, iommu_group); > + if (!group) > + continue; > > - iommu_detach_group(domain->domain, iommu_group); > - 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, then all the mappings go away too. > - */ > - if (list_empty(&domain->group_list)) { > - if (list_is_singular(&iommu->domain_list)) > - vfio_iommu_unmap_unpin_all(iommu); > - iommu_domain_free(domain->domain); > - list_del(&domain->next); > - kfree(domain); > - } > - goto done; > + iommu_detach_group(domain->domain, iommu_group); > + 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, then all the mappings go away too. > + */ > + if (list_empty(&domain->group_list)) { > + if (list_is_singular(&iommu->domain_list)) > + vfio_iommu_unmap_unpin_all(iommu); > + iommu_domain_free(domain->domain); > + list_del(&domain->next); > + kfree(domain); > } > + goto done; > } > > done: > Reviewed-by: Eric Auger Eric