From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp09.au.ibm.com (e23smtp09.au.ibm.com [202.81.31.142]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 357081A0018 for ; Fri, 5 Jun 2015 10:11:06 +1000 (AEST) Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 5 Jun 2015 10:11:05 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id 955E03578048 for ; Fri, 5 Jun 2015 10:11:02 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t550As1O62455976 for ; Fri, 5 Jun 2015 10:11:02 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t550ATOI020866 for ; Fri, 5 Jun 2015 10:10:30 +1000 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 In-Reply-To: <1432889098-22924-6-git-send-email-aik@ozlabs.ru> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 >