* [PATCH] iommu: rockchip: Free domain on .domain_free
@ 2019-10-02 17:29 Ezequiel Garcia
2019-10-15 11:16 ` Joerg Roedel
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ezequiel Garcia @ 2019-10-02 17:29 UTC (permalink / raw)
To: Joerg Roedel, Heiko Stuebner
Cc: linux-rockchip, iommu, kernel, Ezequiel Garcia, linux-kernel
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 <ezequiel@collabora.com>
---
drivers/iommu/rockchip-iommu.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 26290f310f90..e845bd01a1a2 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -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)
--
2.22.0
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] iommu: rockchip: Free domain on .domain_free
2019-10-02 17:29 [PATCH] iommu: rockchip: Free domain on .domain_free Ezequiel Garcia
@ 2019-10-15 11:16 ` Joerg Roedel
2019-10-15 11:43 ` Robin Murphy
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Joerg Roedel @ 2019-10-15 11:16 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: linux-rockchip, iommu, kernel, Heiko Stuebner, linux-kernel
On Wed, Oct 02, 2019 at 02:29:23PM -0300, Ezequiel Garcia wrote:
> 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 <ezequiel@collabora.com>
Looks good to me, if Heiko Acks it I apply it for v5.5.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iommu: rockchip: Free domain on .domain_free
2019-10-02 17:29 [PATCH] iommu: rockchip: Free domain on .domain_free Ezequiel Garcia
2019-10-15 11:16 ` Joerg Roedel
@ 2019-10-15 11:43 ` Robin Murphy
2019-10-15 18:53 ` Heiko Stuebner
2019-10-16 7:43 ` Joerg Roedel
3 siblings, 0 replies; 5+ messages in thread
From: Robin Murphy @ 2019-10-15 11:43 UTC (permalink / raw)
To: Ezequiel Garcia, Joerg Roedel, Heiko Stuebner
Cc: linux-rockchip, iommu, kernel, linux-kernel
On 02/10/2019 18:29, Ezequiel Garcia wrote:
> 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 <robin.murphy@arm.com>
> Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
> ---
> drivers/iommu/rockchip-iommu.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 26290f310f90..e845bd01a1a2 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -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)
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] iommu: rockchip: Free domain on .domain_free
2019-10-02 17:29 [PATCH] iommu: rockchip: Free domain on .domain_free Ezequiel Garcia
2019-10-15 11:16 ` Joerg Roedel
2019-10-15 11:43 ` Robin Murphy
@ 2019-10-15 18:53 ` Heiko Stuebner
2019-10-16 7:43 ` Joerg Roedel
3 siblings, 0 replies; 5+ messages in thread
From: Heiko Stuebner @ 2019-10-15 18:53 UTC (permalink / raw)
To: Ezequiel Garcia; +Cc: linux-rockchip, kernel, iommu, linux-kernel
Am Mittwoch, 2. Oktober 2019, 19:29:23 CEST schrieb 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 <ezequiel@collabora.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] iommu: rockchip: Free domain on .domain_free
2019-10-02 17:29 [PATCH] iommu: rockchip: Free domain on .domain_free Ezequiel Garcia
` (2 preceding siblings ...)
2019-10-15 18:53 ` Heiko Stuebner
@ 2019-10-16 7:43 ` Joerg Roedel
3 siblings, 0 replies; 5+ messages in thread
From: Joerg Roedel @ 2019-10-16 7:43 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: linux-rockchip, iommu, kernel, Heiko Stuebner, linux-kernel
On Wed, Oct 02, 2019 at 02:29:23PM -0300, Ezequiel Garcia wrote:
> 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 <ezequiel@collabora.com>
> ---
> drivers/iommu/rockchip-iommu.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
Applied, thanks.
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-16 7:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-02 17:29 [PATCH] iommu: rockchip: Free domain on .domain_free Ezequiel Garcia
2019-10-15 11:16 ` Joerg Roedel
2019-10-15 11:43 ` Robin Murphy
2019-10-15 18:53 ` Heiko Stuebner
2019-10-16 7:43 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).