From: Chunyan Zhang <chunyan.zhang@unisoc.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
"Robin Murphy" <robin.murphy@arm.com>
Cc: <iommu@lists.linux.dev>, Baolu Lu <baolu.lu@linux.intel.com>,
Baolin Wang <baolin.wang@linux.alibaba.com>,
Orson Zhai <orsonzhai@gmail.com>,
"Chunyan Zhang" <zhang.lyra@gmail.com>,
Chunyan Zhang <chunyan.zhang@unisoc.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH V2] iommu: sprd: release dma buffer to avoid memory leak
Date: Wed, 8 Mar 2023 11:41:58 +0800 [thread overview]
Message-ID: <20230308034158.509458-1-chunyan.zhang@unisoc.com> (raw)
Release page table DMA buffer when the IOMMU domain is not used:
- Domain freed.
- IOMMU is attaching to a new domain.
Since one sprd IOMMU servers only one client device, if the IOMMU has
been attached to other domain, it has to be detached first, that's
saying the DMA buffer should be released, otherwise that would
cause memory leak issue.
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
---
V2:
* Added some comment in sprd_iommu_attach_device() for the reason
of calling sprd_iommu_cleanup().
V1: https://lkml.org/lkml/2023/2/10/198
---
drivers/iommu/sprd-iommu.c | 46 ++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c
index ae94d74b73f4..fb2f96df3bca 100644
--- a/drivers/iommu/sprd-iommu.c
+++ b/drivers/iommu/sprd-iommu.c
@@ -62,6 +62,7 @@ enum sprd_iommu_version {
* @eb: gate clock which controls IOMMU access
*/
struct sprd_iommu_device {
+ struct sprd_iommu_domain *dom;
enum sprd_iommu_version ver;
u32 *prot_page_va;
dma_addr_t prot_page_pa;
@@ -151,13 +152,6 @@ static struct iommu_domain *sprd_iommu_domain_alloc(unsigned int domain_type)
return &dom->domain;
}
-static void sprd_iommu_domain_free(struct iommu_domain *domain)
-{
- struct sprd_iommu_domain *dom = to_sprd_domain(domain);
-
- kfree(dom);
-}
-
static void sprd_iommu_first_vpn(struct sprd_iommu_domain *dom)
{
struct sprd_iommu_device *sdev = dom->sdev;
@@ -230,6 +224,29 @@ static void sprd_iommu_hw_en(struct sprd_iommu_device *sdev, bool en)
sprd_iommu_update_bits(sdev, reg_cfg, mask, 0, val);
}
+static void sprd_iommu_cleanup(struct sprd_iommu_device *sdev)
+{
+ struct sprd_iommu_domain *dom = sdev->dom;
+ size_t pgt_size = sprd_iommu_pgt_size(&dom->domain);
+
+ dma_free_coherent(sdev->dev, pgt_size, dom->pgt_va, dom->pgt_pa);
+ dom->sdev = NULL;
+ sdev->dom = NULL;
+ sprd_iommu_hw_en(sdev, false);
+}
+
+static void sprd_iommu_domain_free(struct iommu_domain *domain)
+{
+ struct sprd_iommu_domain *dom = to_sprd_domain(domain);
+ struct sprd_iommu_device *sdev = dom->sdev;
+
+ /* Free DMA buffer first if the domain has been attached */
+ if (sdev)
+ sprd_iommu_cleanup(sdev);
+
+ kfree(dom);
+}
+
static int sprd_iommu_attach_device(struct iommu_domain *domain,
struct device *dev)
{
@@ -237,14 +254,29 @@ static int sprd_iommu_attach_device(struct iommu_domain *domain,
struct sprd_iommu_domain *dom = to_sprd_domain(domain);
size_t pgt_size = sprd_iommu_pgt_size(domain);
+ /* Return directly if the domain attached to IOMMU already */
if (dom->sdev)
return -EINVAL;
+ /* The IOMMU already attached to a domain */
+ if (sdev->dom) {
+ if (sdev->dom == dom)
+ return 0;
+
+ /*
+ * Clean up the previous domain, one sprd IOMMU servers only
+ * one client device, if the IOMMU has been attached to other
+ * domain, it has to be detached first.
+ */
+ sprd_iommu_cleanup(sdev);
+ }
+
dom->pgt_va = dma_alloc_coherent(sdev->dev, pgt_size, &dom->pgt_pa, GFP_KERNEL);
if (!dom->pgt_va)
return -ENOMEM;
dom->sdev = sdev;
+ sdev->dom = dom;
sprd_iommu_first_ppn(dom);
sprd_iommu_first_vpn(dom);
--
2.25.1
next reply other threads:[~2023-03-08 3:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 3:41 Chunyan Zhang [this message]
2023-03-08 12:37 ` Robin Murphy
2023-03-09 2:50 ` Baolu Lu
2023-03-09 11:23 ` Robin Murphy
2023-03-10 2:11 ` Chunyan Zhang
2023-03-09 2:08 ` Baolu Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230308034158.509458-1-chunyan.zhang@unisoc.com \
--to=chunyan.zhang@unisoc.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®