From patchwork Fri Feb 12 08:13:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 61826 Delivered-To: patches@linaro.org Received: by 10.112.43.199 with SMTP id y7csp676722lbl; Fri, 12 Feb 2016 00:14:22 -0800 (PST) X-Received: by 10.28.182.136 with SMTP id g130mr1530925wmf.10.1455264862132; Fri, 12 Feb 2016 00:14:22 -0800 (PST) Return-Path: Received: from mail-wm0-x233.google.com (mail-wm0-x233.google.com. [2a00:1450:400c:c09::233]) by mx.google.com with ESMTPS id n1si17682799wjf.177.2016.02.12.00.14.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Feb 2016 00:14:22 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::233 as permitted sender) client-ip=2a00:1450:400c:c09::233; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::233 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x233.google.com with SMTP id p63so9130972wmp.1 for ; Fri, 12 Feb 2016 00:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UKFmbaNKDyfPSdKuCT8gpiApo3OxYgDoZJ670XyxPAk=; b=iccTFqrCRGbyZxVBpSkea5oY19z7rTf2dzBE25wIjFyH0T+QJXxy542PhLeLw7MgCF umyQexMLS3yKDdDnBLEIeF0WXQP7ZRTg+scneKILThsCSHkDZV6Z08H73Aax7f3DH0rq o9CFqNr6y1sOu4oOTBHPdw1S/Dbw5c5j6hm9Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UKFmbaNKDyfPSdKuCT8gpiApo3OxYgDoZJ670XyxPAk=; b=SpyrSD6VfHGLBYfhmaFYY8pvdJrBISPlKeCAj4y9Oxv0o2gLc8NzPtIOACwdeQBnhY khdXFtsXaL1CdNM2TL744i2l2VUWCcFFQkWQ9YrJxmkqQmlGf0mwlBWCbghzgXKvF/qh 7n+Zv5aLk3JIlePMTigyn0g3fsua1S5cCEWjjwZp9uzlm5t+LSPW+0hYua0o/ji8rfuY DykiuxaFMrZSdDFS3qVt0nEKrzW3RXynCh27t9rVqr27s/r0ozIMHKE3LkjcAKwaAcw/ HxyDrQo/ktgtVeyA61T9woSvzMZC5z2YwgpwEdBaQK6yyvsgTLiRdDEqx3Li9tqJgf+f rvfQ== X-Gm-Message-State: AG10YOSTcS1fA8T+ygUHEaCCxD03YDO76C5GfTd4SeHVCjcJlUfseNAnvBX3DdKe6sr8Dwdku3c= X-Received: by 10.194.87.161 with SMTP id az1mr194637wjb.163.1455264861945; Fri, 12 Feb 2016 00:14:21 -0800 (PST) Return-Path: Received: from new-host-17.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id x66sm1243977wmb.20.2016.02.12.00.14.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Feb 2016 00:14:20 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, will.deacon@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, christoffer.dall@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: suravee.suthikulpanit@amd.com, patches@linaro.org, linux-kernel@vger.kernel.org, Manish.Jaggi@caviumnetworks.com, Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, iommu@lists.linux-foundation.org, sherry.hurwitz@amd.com, brijesh.singh@amd.com, leo.duran@amd.com, Thomas.Lendacky@amd.com Subject: [RFC v3 09/15] iommu/arm-smmu: relinquish reserved resources on domain deletion Date: Fri, 12 Feb 2016 08:13:11 +0000 Message-Id: <1455264797-2334-10-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455264797-2334-1-git-send-email-eric.auger@linaro.org> References: <1455264797-2334-1-git-send-email-eric.auger@linaro.org> arm_smmu_unmap_reserved releases all reserved binding resources: destroy all bindings, free iova, free iova_domain. This happens on domain deletion. Signed-off-by: Eric Auger --- drivers/iommu/arm-smmu.c | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 9961bfd..ae8a97d 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -363,6 +363,7 @@ struct arm_smmu_reserved_binding { dma_addr_t iova; size_t size; }; +static void arm_smmu_unmap_reserved(struct iommu_domain *domain); static struct iommu_ops arm_smmu_ops; @@ -1057,6 +1058,7 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) * already been detached. */ arm_smmu_destroy_domain_context(domain); + arm_smmu_unmap_reserved(domain); kfree(smmu_domain); } @@ -1547,19 +1549,23 @@ unlock: return ret; } -static void arm_smmu_free_reserved_iova_domain(struct iommu_domain *domain) +static void __arm_smmu_free_reserved_iova_domain(struct arm_smmu_domain *sd) { - struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); - struct iova_domain *iovad = smmu_domain->reserved_iova_domain; + struct iova_domain *iovad = sd->reserved_iova_domain; if (!iovad) return; - mutex_lock(&smmu_domain->reserved_mutex); - put_iova_domain(iovad); kfree(iovad); +} +static void arm_smmu_free_reserved_iova_domain(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + + mutex_lock(&smmu_domain->reserved_mutex); + __arm_smmu_free_reserved_iova_domain(smmu_domain); mutex_unlock(&smmu_domain->reserved_mutex); } @@ -1675,6 +1681,24 @@ unlock: mutex_unlock(&smmu_domain->reserved_mutex); } +static void arm_smmu_unmap_reserved(struct iommu_domain *domain) +{ + struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); + struct rb_node *node; + + mutex_lock(&smmu_domain->reserved_mutex); + while ((node = rb_first(&smmu_domain->reserved_binding_list))) { + struct arm_smmu_reserved_binding *b = + rb_entry(node, struct arm_smmu_reserved_binding, node); + + while (!kref_put(&b->kref, reserved_binding_release)) + ; + } + smmu_domain->reserved_binding_list = RB_ROOT; + __arm_smmu_free_reserved_iova_domain(smmu_domain); + mutex_unlock(&smmu_domain->reserved_mutex); +} + static struct iommu_ops arm_smmu_ops = { .capable = arm_smmu_capable, .domain_alloc = arm_smmu_domain_alloc,