* [PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr()
@ 2020-06-05 18:52 Denis Efremov
2020-06-08 7:56 ` Steven Price
2020-06-08 15:17 ` [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts Denis Efremov
0 siblings, 2 replies; 4+ messages in thread
From: Denis Efremov @ 2020-06-05 18:52 UTC (permalink / raw)
To: David Airlie, Daniel Vetter
Cc: Denis Efremov, Rob Herring, Tomeu Vizoso, Steven Price,
dri-devel, linux-kernel, stable
Use kvfree() to free bo->sgts, because the memory is allocated with
kvmalloc_array().
Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
Cc: stable@vger.kernel.org
Signed-off-by: Denis Efremov <efremov@linux.com>
---
drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index ed28aeba6d59..3c8ae7411c80 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
if (!pages) {
- kfree(bo->sgts);
+ kvfree(bo->sgts);
bo->sgts = NULL;
mutex_unlock(&bo->base.pages_lock);
ret = -ENOMEM;
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr()
2020-06-05 18:52 [PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr() Denis Efremov
@ 2020-06-08 7:56 ` Steven Price
2020-06-08 15:17 ` [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts Denis Efremov
1 sibling, 0 replies; 4+ messages in thread
From: Steven Price @ 2020-06-08 7:56 UTC (permalink / raw)
To: Denis Efremov, David Airlie, Daniel Vetter
Cc: Rob Herring, Tomeu Vizoso, dri-devel, linux-kernel, stable
On 05/06/2020 19:52, Denis Efremov wrote:
> Use kvfree() to free bo->sgts, because the memory is allocated with
> kvmalloc_array().
>
> Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
> Cc: stable@vger.kernel.org
> Signed-off-by: Denis Efremov <efremov@linux.com>
Well spotted, but there's another one in panfrost_gem_free_object().
Please can you fix that at the same time?
Thanks,
Steve
> ---
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index ed28aeba6d59..3c8ae7411c80 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
> pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
> sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
> if (!pages) {
> - kfree(bo->sgts);
> + kvfree(bo->sgts);
> bo->sgts = NULL;
> mutex_unlock(&bo->base.pages_lock);
> ret = -ENOMEM;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts
2020-06-05 18:52 [PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr() Denis Efremov
2020-06-08 7:56 ` Steven Price
@ 2020-06-08 15:17 ` Denis Efremov
2020-06-11 9:31 ` Steven Price
1 sibling, 1 reply; 4+ messages in thread
From: Denis Efremov @ 2020-06-08 15:17 UTC (permalink / raw)
To: David Airlie, Daniel Vetter
Cc: Denis Efremov, Steven Price, linux-kernel, dri-devel,
Tomeu Vizoso, Rob Herring, stable
Use kvfree() to free bo->sgts, because the memory is allocated with
kvmalloc_array() in panfrost_mmu_map_fault_addr().
Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
Cc: stable@vger.kernel.org
Signed-off-by: Denis Efremov <efremov@linux.com>
---
Change in v2:
- kvfree() fixed in panfrost_gem_free_object(), thanks to Steven Price
drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
index 17b654e1eb94..556181ea4a07 100644
--- a/drivers/gpu/drm/panfrost/panfrost_gem.c
+++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
@@ -46,7 +46,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)
sg_free_table(&bo->sgts[i]);
}
}
- kfree(bo->sgts);
+ kvfree(bo->sgts);
}
drm_gem_shmem_free_object(obj);
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index ed28aeba6d59..3c8ae7411c80 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
if (!pages) {
- kfree(bo->sgts);
+ kvfree(bo->sgts);
bo->sgts = NULL;
mutex_unlock(&bo->base.pages_lock);
ret = -ENOMEM;
--
2.26.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts
2020-06-08 15:17 ` [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts Denis Efremov
@ 2020-06-11 9:31 ` Steven Price
0 siblings, 0 replies; 4+ messages in thread
From: Steven Price @ 2020-06-11 9:31 UTC (permalink / raw)
To: Denis Efremov, David Airlie, Daniel Vetter
Cc: linux-kernel, dri-devel, Tomeu Vizoso, Rob Herring, stable
On 08/06/2020 16:17, Denis Efremov wrote:
> Use kvfree() to free bo->sgts, because the memory is allocated with
> kvmalloc_array() in panfrost_mmu_map_fault_addr().
>
> Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
> Cc: stable@vger.kernel.org
> Signed-off-by: Denis Efremov <efremov@linux.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Thanks,
Steve
> ---
> Change in v2:
> - kvfree() fixed in panfrost_gem_free_object(), thanks to Steven Price
>
> drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +-
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c
> index 17b654e1eb94..556181ea4a07 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_gem.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c
> @@ -46,7 +46,7 @@ static void panfrost_gem_free_object(struct drm_gem_object *obj)
> sg_free_table(&bo->sgts[i]);
> }
> }
> - kfree(bo->sgts);
> + kvfree(bo->sgts);
> }
>
> drm_gem_shmem_free_object(obj);
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index ed28aeba6d59..3c8ae7411c80 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as,
> pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
> sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
> if (!pages) {
> - kfree(bo->sgts);
> + kvfree(bo->sgts);
> bo->sgts = NULL;
> mutex_unlock(&bo->base.pages_lock);
> ret = -ENOMEM;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-11 9:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-05 18:52 [PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr() Denis Efremov
2020-06-08 7:56 ` Steven Price
2020-06-08 15:17 ` [PATCH v2] drm/panfrost: Use kvfree() to free bo->sgts Denis Efremov
2020-06-11 9:31 ` Steven Price
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).