* [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr()
@ 2019-08-14 4:48 Wei Yongjun
2019-08-16 8:31 ` Steven Price
2019-08-19 16:56 ` Rob Herring
0 siblings, 2 replies; 3+ messages in thread
From: Wei Yongjun @ 2019-08-14 4:48 UTC (permalink / raw)
To: Rob Herring, Tomeu Vizoso, David Airlie, Daniel Vetter
Cc: Wei Yongjun, dri-devel, linux-kernel, kernel-janitors
Add the missing unlock before return from function panfrost_mmu_map_fault_addr()
in the error handling case.
Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
index 2ed411f09d80..06f1a563e940 100644
--- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
+++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -327,14 +327,17 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr)
if (!bo->base.pages) {
bo->sgts = kvmalloc_array(bo->base.base.size / SZ_2M,
sizeof(struct sg_table), GFP_KERNEL | __GFP_ZERO);
- if (!bo->sgts)
+ if (!bo->sgts) {
+ mutex_unlock(&bo->base.pages_lock);
return -ENOMEM;
+ }
pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
if (!pages) {
kfree(bo->sgts);
bo->sgts = NULL;
+ mutex_unlock(&bo->base.pages_lock);
return -ENOMEM;
}
bo->base.pages = pages;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr()
2019-08-14 4:48 [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr() Wei Yongjun
@ 2019-08-16 8:31 ` Steven Price
2019-08-19 16:56 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Steven Price @ 2019-08-16 8:31 UTC (permalink / raw)
To: Wei Yongjun, Rob Herring, Tomeu Vizoso, David Airlie, Daniel Vetter
Cc: kernel-janitors, linux-kernel, dri-devel
On 14/08/2019 05:48, Wei Yongjun wrote:
> Add the missing unlock before return from function panfrost_mmu_map_fault_addr()
> in the error handling case.
>
> Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Well spotted.
Reviewed-by: Steven Price <steven.price@arm.com>
Steve
> ---
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> index 2ed411f09d80..06f1a563e940 100644
> --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c
> +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
> @@ -327,14 +327,17 @@ int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, u64 addr)
> if (!bo->base.pages) {
> bo->sgts = kvmalloc_array(bo->base.base.size / SZ_2M,
> sizeof(struct sg_table), GFP_KERNEL | __GFP_ZERO);
> - if (!bo->sgts)
> + if (!bo->sgts) {
> + mutex_unlock(&bo->base.pages_lock);
> return -ENOMEM;
> + }
>
> pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT,
> sizeof(struct page *), GFP_KERNEL | __GFP_ZERO);
> if (!pages) {
> kfree(bo->sgts);
> bo->sgts = NULL;
> + mutex_unlock(&bo->base.pages_lock);
> return -ENOMEM;
> }
> bo->base.pages = pages;
>
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr()
2019-08-14 4:48 [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr() Wei Yongjun
2019-08-16 8:31 ` Steven Price
@ 2019-08-19 16:56 ` Rob Herring
1 sibling, 0 replies; 3+ messages in thread
From: Rob Herring @ 2019-08-19 16:56 UTC (permalink / raw)
To: Wei Yongjun
Cc: Tomeu Vizoso, David Airlie, Daniel Vetter, dri-devel,
linux-kernel, kernel-janitors
On Tue, Aug 13, 2019 at 11:44 PM Wei Yongjun <weiyongjun1@huawei.com> wrote:
>
> Add the missing unlock before return from function panfrost_mmu_map_fault_addr()
> in the error handling case.
>
> Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/gpu/drm/panfrost/panfrost_mmu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Applied, thanks.
Rob
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-19 16:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-14 4:48 [PATCH -next] drm/panfrost: Fix missing unlock on error in panfrost_mmu_map_fault_addr() Wei Yongjun
2019-08-16 8:31 ` Steven Price
2019-08-19 16:56 ` Rob Herring
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).