Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932106AbbFEALL (ORCPT ); Thu, 4 Jun 2015 20:11:11 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:38517 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752486AbbFEALI (ORCPT ); Thu, 4 Jun 2015 20:11:08 -0400 Date: Fri, 5 Jun 2015 10:10:05 +1000 From: Gavin Shan To: Alexey Kardashevskiy Cc: linuxppc-dev@lists.ozlabs.org, Alex Williamson , Benjamin Herrenschmidt , David Gibson , Gavin Shan , Paul Mackerras , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH kernel v11 05/34] powerpc/iommu: Always release iommu_table in iommu_free_table() Message-ID: <20150605001005.GA15839@gwshan> Reply-To: Gavin Shan References: <1432889098-22924-1-git-send-email-aik@ozlabs.ru> <1432889098-22924-6-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1432889098-22924-6-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: 15060500-0033-0000-0000-0000019B974A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1481 Lines: 52 On Fri, May 29, 2015 at 06:44:29PM +1000, Alexey Kardashevskiy wrote: >At the moment iommu_free_table() only releases memory if >the table was initialized for the platform code use, i.e. it had >it_map initialized (which purpose is to track DMA memory space use). > >With dynamic DMA windows, we will need to be able to release >iommu_table even if it was used for VFIO in which case it_map is NULL >so does the patch. > >Signed-off-by: Alexey Kardashevskiy Reviewed-by: Gavin Shan Thanks, Gavin >--- >Changes: >v11: >* fixed parameter checks >--- > arch/powerpc/kernel/iommu.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > >diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c >index 3d47eb3..73eb39a 100644 >--- a/arch/powerpc/kernel/iommu.c >+++ b/arch/powerpc/kernel/iommu.c >@@ -713,9 +713,11 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name) > unsigned long bitmap_sz; > unsigned int order; > >- if (!tbl || !tbl->it_map) { >- printk(KERN_ERR "%s: expected TCE map for %s\n", __func__, >- node_name); >+ if (!tbl) >+ return; >+ >+ if (!tbl->it_map) { >+ kfree(tbl); > return; > } > >-- >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/