From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gavin Shan <gwshan@linux.vnet.ibm.com>
Subject: Re: [PATCH kernel v11 05/34] powerpc/iommu: Always release
 iommu_table in iommu_free_table()
Date: Fri, 5 Jun 2015 10:10:05 +1000
Message-ID: <20150605001005.GA15839@gwshan>
References: <1432889098-22924-1-git-send-email-aik@ozlabs.ru>
 <1432889098-22924-6-git-send-email-aik@ozlabs.ru>
Reply-To: Gavin Shan <gwshan@linux.vnet.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: linuxppc-dev@lists.ozlabs.org,
	Alex Williamson <alex.williamson@redhat.com>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	David Gibson <david@gibson.dropbear.id.au>,
	Gavin Shan <gwshan@linux.vnet.ibm.com>,
	Paul Mackerras <paulus@samba.org>, kvm@vger.kernel.org,
	linux-kernel@vger.kernel.org
To: Alexey Kardashevskiy <aik@ozlabs.ru>
Return-path: <kvm-owner@vger.kernel.org>
Received: from e23smtp09.au.ibm.com ([202.81.31.142]:38518 "EHLO
	e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753136AbbFEALI (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 4 Jun 2015 20:11:08 -0400
Received: from /spool/local
	by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted
	for <kvm@vger.kernel.org> from <gwshan@linux.vnet.ibm.com>;
	Fri, 5 Jun 2015 10:11:06 +1000
Content-Disposition: inline
In-Reply-To: <1432889098-22924-6-git-send-email-aik@ozlabs.ru>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

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 <aik@ozlabs.ru>

Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>

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
>