Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754658AbbEMXgo (ORCPT ); Wed, 13 May 2015 19:36:44 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:38480 "EHLO e23smtp06.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754387AbbEMXgn (ORCPT ); Wed, 13 May 2015 19:36:43 -0400 Date: Thu, 14 May 2015 09:35:39 +1000 From: Gavin Shan To: Alexey Kardashevskiy Cc: linuxppc-dev@lists.ozlabs.org, David Gibson , Benjamin Herrenschmidt , Paul Mackerras , Alex Williamson , Gavin Shan , Wei Yang , linux-kernel@vger.kernel.org Subject: Re: [PATCH kernel v10 12/34] vfio: powerpc/spapr: Rework groups attaching Message-ID: <20150513233539.GA9937@gwshan> Reply-To: Gavin Shan References: <1431358763-24371-1-git-send-email-aik@ozlabs.ru> <1431358763-24371-13-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1431358763-24371-13-git-send-email-aik@ozlabs.ru> User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15051323-0021-0000-0000-0000013B9078 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2956 Lines: 94 On Tue, May 12, 2015 at 01:39:01AM +1000, Alexey Kardashevskiy wrote: >This is to make extended ownership and multiple groups support patches >simpler for review. > >This should cause no behavioural change. > >Signed-off-by: Alexey Kardashevskiy >[aw: for the vfio related changes] >Acked-by: Alex Williamson >Reviewed-by: David Gibson Reviewed-by: Gavin Shan Thanks, Gavin >--- > drivers/vfio/vfio_iommu_spapr_tce.c | 40 ++++++++++++++++++++++--------------- > 1 file changed, 24 insertions(+), 16 deletions(-) > >diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c >index 115d5e6..0fbe03e 100644 >--- a/drivers/vfio/vfio_iommu_spapr_tce.c >+++ b/drivers/vfio/vfio_iommu_spapr_tce.c >@@ -460,16 +460,21 @@ static int tce_iommu_attach_group(void *iommu_data, > iommu_group_id(container->tbl->it_group), > iommu_group_id(iommu_group)); > ret = -EBUSY; >- } else if (container->enabled) { >+ goto unlock_exit; >+ } >+ >+ if (container->enabled) { > pr_err("tce_vfio: attaching group #%u to enabled container\n", > iommu_group_id(iommu_group)); > ret = -EBUSY; >- } else { >- ret = iommu_take_ownership(tbl); >- if (!ret) >- container->tbl = tbl; >+ goto unlock_exit; > } > >+ ret = iommu_take_ownership(tbl); >+ if (!ret) >+ container->tbl = tbl; >+ >+unlock_exit: > mutex_unlock(&container->lock); > > return ret; >@@ -487,19 +492,22 @@ static void tce_iommu_detach_group(void *iommu_data, > pr_warn("tce_vfio: detaching group #%u, expected group is #%u\n", > iommu_group_id(iommu_group), > iommu_group_id(tbl->it_group)); >- } else { >- if (container->enabled) { >- pr_warn("tce_vfio: detaching group #%u from enabled container, forcing disable\n", >- iommu_group_id(tbl->it_group)); >- tce_iommu_disable(container); >- } >+ goto unlock_exit; >+ } > >- /* pr_debug("tce_vfio: detaching group #%u from iommu %p\n", >- iommu_group_id(iommu_group), iommu_group); */ >- container->tbl = NULL; >- tce_iommu_clear(container, tbl, tbl->it_offset, tbl->it_size); >- iommu_release_ownership(tbl); >+ if (container->enabled) { >+ pr_warn("tce_vfio: detaching group #%u from enabled container, forcing disable\n", >+ iommu_group_id(tbl->it_group)); >+ tce_iommu_disable(container); > } >+ >+ /* pr_debug("tce_vfio: detaching group #%u from iommu %p\n", >+ iommu_group_id(iommu_group), iommu_group); */ >+ container->tbl = NULL; >+ tce_iommu_clear(container, tbl, tbl->it_offset, tbl->it_size); >+ iommu_release_ownership(tbl); >+ >+unlock_exit: > mutex_unlock(&container->lock); > } > >-- >2.4.0.rc3.8.gfb3e7d5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/