Skip to contentSkip to conversation

iommu: rockchip: Free domain on .domain_free

PATCH Applied Ezequiel Garcia 4 participants 5 messages Oct 2, 2019 – Oct 16, 2019

Subsystems (2)
Arm Rockchip IOMMU
lore
Share & tools
lore

Ezequiel Garcia

author
#0 lore raw

PATCH 1/1 iommu: rockchip: Free domain on .domain_free

IOMMU domain resource life is well-defined, managed by .domain_alloc and .domain_free.

Therefore, domain-specific resources shouldn't be tied to the device life, but instead to its domain.

Signed-off-by Ezequiel Garcia <[email protected]>
---
 drivers/iommu/rockchip-iommu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/rockchip-iommu.c +5 -2
index 26290f310f90..e845bd01a1a2 100644
@@ -979,13 +979,13 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
 	if (!dma_dev)
 		return NULL;
 
-	rk_domain = devm_kzalloc(dma_dev, sizeof(*rk_domain), GFP_KERNEL);
+	rk_domain = kzalloc(sizeof(*rk_domain), GFP_KERNEL);
 	if (!rk_domain)
 		return NULL;
 
 	if (type == IOMMU_DOMAIN_DMA &&
 	    iommu_get_dma_cookie(&rk_domain->domain))
-		return NULL;
+		goto err_free_domain;
 
 	/*
 	 * rk32xx iommus use a 2 level pagetable.

@@ -1020,6 +1020,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
 err_put_cookie:
 	if (type == IOMMU_DOMAIN_DMA)
 		iommu_put_dma_cookie(&rk_domain->domain);
+err_free_domain:
+	kfree(rk_domain);
 
 	return NULL;
 }

@@ -1048,6 +1050,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
 
 	if (domain->type == IOMMU_DOMAIN_DMA)
 		iommu_put_dma_cookie(&rk_domain->domain);
+	kfree(rk_domain);
 }
 
 static int rk_iommu_add_device(struct device *dev)
Signature · 1 line
2.22.0
maintainer
#1 lore raw
Quoted 7 lines · Ezequiel Garcia

IOMMU domain resource life is well-defined, managed by .domain_alloc and .domain_free.

Therefore, domain-specific resources shouldn't be tied to the device life, but instead to its domain.

Signed-off-by Ezequiel Garcia <[email protected]>

Looks good to me, if Heiko Acks it I apply it for v5.5.

reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Ezequiel Garcia
Quoted 5 lines · Ezequiel Garcia

IOMMU domain resource life is well-defined, managed by .domain_alloc and .domain_free.

Therefore, domain-specific resources shouldn't be tied to the device life, but instead to its domain.

FWIW,

Reviewed-by Robin Murphy <[email protected]>
Quoted 43 lines
Signed-off-by Ezequiel Garcia <[email protected]>
---
  drivers/iommu/rockchip-iommu.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
drivers/iommu/rockchip-iommu.c +5 -2
index 26290f310f90..e845bd01a1a2 100644
@@ -979,13 +979,13 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
  	if (!dma_dev)
  		return NULL;
 
-	rk_domain = devm_kzalloc(dma_dev, sizeof(*rk_domain), GFP_KERNEL);
+	rk_domain = kzalloc(sizeof(*rk_domain), GFP_KERNEL);
  	if (!rk_domain)
  		return NULL;
 
  	if (type == IOMMU_DOMAIN_DMA &&
  	    iommu_get_dma_cookie(&rk_domain->domain))
-		return NULL;
+		goto err_free_domain;
 
  	/*
  	 * rk32xx iommus use a 2 level pagetable.

@@ -1020,6 +1020,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)
  err_put_cookie:
  	if (type == IOMMU_DOMAIN_DMA)
  		iommu_put_dma_cookie(&rk_domain->domain);
+err_free_domain:
+	kfree(rk_domain);
 
  	return NULL;
  }

@@ -1048,6 +1050,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
 
  	if (domain->type == IOMMU_DOMAIN_DMA)
  		iommu_put_dma_cookie(&rk_domain->domain);
+	kfree(rk_domain);
  }
 
  static int rk_iommu_add_device(struct device *dev)
maintainer Applied
#4 lore raw
In reply to Ezequiel Garcia
Quoted 10 lines · Ezequiel Garcia

IOMMU domain resource life is well-defined, managed by .domain_alloc and .domain_free.

Therefore, domain-specific resources shouldn't be tied to the device life, but instead to its domain.

Signed-off-by Ezequiel Garcia <[email protected]>
---
 drivers/iommu/rockchip-iommu.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Applied, thanks.