* [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM
@ 2024-11-06 18:58 Liviu Dudau
2024-11-07 7:59 ` Boris Brezillon
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Liviu Dudau @ 2024-11-06 18:58 UTC (permalink / raw)
To: Boris Brezillon
Cc: Liviu Dudau, Steven Price, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Simona Vetter, dri-devel,
linux-kernel, Jann Horn
Similar to cac075706f29 ("drm/panthor: Fix race when converting
group handle to group object") we need to use the XArray's internal
locking when retrieving a vm pointer from there.
v2: Removed part of the patch that was trying to protect fetching
the heap pointer from XArray, as that operation is protected by
the @pool->lock.
Fixes: 647810ec2476 ("drm/panthor: Add the MMU/VM logical block")
Reported-by: Jann Horn <jannh@google.com>
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Cc: Steven Price <steven.price@arm.com>
Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
---
drivers/gpu/drm/panthor/panthor_mmu.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
index 8ca85526491e6..46b84a557d9cc 100644
--- a/drivers/gpu/drm/panthor/panthor_mmu.c
+++ b/drivers/gpu/drm/panthor/panthor_mmu.c
@@ -1580,7 +1580,9 @@ panthor_vm_pool_get_vm(struct panthor_vm_pool *pool, u32 handle)
{
struct panthor_vm *vm;
+ xa_lock(&pool->xa);
vm = panthor_vm_get(xa_load(&pool->xa, handle));
+ xa_unlock(&pool->xa);
return vm;
}
--
2.47.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM
2024-11-06 18:58 [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM Liviu Dudau
@ 2024-11-07 7:59 ` Boris Brezillon
2024-11-07 10:42 ` Steven Price
2024-11-07 15:26 ` Steven Price
2 siblings, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2024-11-07 7:59 UTC (permalink / raw)
To: Liviu Dudau
Cc: Steven Price, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
David Airlie, Simona Vetter, dri-devel, linux-kernel, Jann Horn
On Wed, 6 Nov 2024 18:58:06 +0000
Liviu Dudau <liviu.dudau@arm.com> wrote:
> Similar to cac075706f29 ("drm/panthor: Fix race when converting
> group handle to group object") we need to use the XArray's internal
> locking when retrieving a vm pointer from there.
>
> v2: Removed part of the patch that was trying to protect fetching
> the heap pointer from XArray, as that operation is protected by
> the @pool->lock.
>
> Fixes: 647810ec2476 ("drm/panthor: Add the MMU/VM logical block")
> Reported-by: Jann Horn <jannh@google.com>
> Cc: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Steven Price <steven.price@arm.com>
> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
> ---
> drivers/gpu/drm/panthor/panthor_mmu.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
> index 8ca85526491e6..46b84a557d9cc 100644
> --- a/drivers/gpu/drm/panthor/panthor_mmu.c
> +++ b/drivers/gpu/drm/panthor/panthor_mmu.c
> @@ -1580,7 +1580,9 @@ panthor_vm_pool_get_vm(struct panthor_vm_pool *pool, u32 handle)
> {
> struct panthor_vm *vm;
>
> + xa_lock(&pool->xa);
> vm = panthor_vm_get(xa_load(&pool->xa, handle));
> + xa_unlock(&pool->xa);
>
> return vm;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM
2024-11-06 18:58 [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM Liviu Dudau
2024-11-07 7:59 ` Boris Brezillon
@ 2024-11-07 10:42 ` Steven Price
2024-11-07 15:26 ` Steven Price
2 siblings, 0 replies; 4+ messages in thread
From: Steven Price @ 2024-11-07 10:42 UTC (permalink / raw)
To: Liviu Dudau, Boris Brezillon
Cc: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, dri-devel, linux-kernel, Jann Horn
On 06/11/2024 18:58, Liviu Dudau wrote:
> Similar to cac075706f29 ("drm/panthor: Fix race when converting
> group handle to group object") we need to use the XArray's internal
> locking when retrieving a vm pointer from there.
>
> v2: Removed part of the patch that was trying to protect fetching
> the heap pointer from XArray, as that operation is protected by
> the @pool->lock.
>
> Fixes: 647810ec2476 ("drm/panthor: Add the MMU/VM logical block")
> Reported-by: Jann Horn <jannh@google.com>
> Cc: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Steven Price <steven.price@arm.com>
> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Reviewed-by: Steven Price <steven.price@arm.com>
> ---
> drivers/gpu/drm/panthor/panthor_mmu.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
> index 8ca85526491e6..46b84a557d9cc 100644
> --- a/drivers/gpu/drm/panthor/panthor_mmu.c
> +++ b/drivers/gpu/drm/panthor/panthor_mmu.c
> @@ -1580,7 +1580,9 @@ panthor_vm_pool_get_vm(struct panthor_vm_pool *pool, u32 handle)
> {
> struct panthor_vm *vm;
>
> + xa_lock(&pool->xa);
> vm = panthor_vm_get(xa_load(&pool->xa, handle));
> + xa_unlock(&pool->xa);
>
> return vm;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM
2024-11-06 18:58 [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM Liviu Dudau
2024-11-07 7:59 ` Boris Brezillon
2024-11-07 10:42 ` Steven Price
@ 2024-11-07 15:26 ` Steven Price
2 siblings, 0 replies; 4+ messages in thread
From: Steven Price @ 2024-11-07 15:26 UTC (permalink / raw)
To: Liviu Dudau, Boris Brezillon
Cc: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, David Airlie,
Simona Vetter, dri-devel, linux-kernel, Jann Horn
On 06/11/2024 18:58, Liviu Dudau wrote:
> Similar to cac075706f29 ("drm/panthor: Fix race when converting
> group handle to group object") we need to use the XArray's internal
> locking when retrieving a vm pointer from there.
>
> v2: Removed part of the patch that was trying to protect fetching
> the heap pointer from XArray, as that operation is protected by
> the @pool->lock.
>
> Fixes: 647810ec2476 ("drm/panthor: Add the MMU/VM logical block")
> Reported-by: Jann Horn <jannh@google.com>
> Cc: Boris Brezillon <boris.brezillon@collabora.com>
> Cc: Steven Price <steven.price@arm.com>
> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com>
Pushed to drm-misc-fixes.
Thanks,
Steve
> ---
> drivers/gpu/drm/panthor/panthor_mmu.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c
> index 8ca85526491e6..46b84a557d9cc 100644
> --- a/drivers/gpu/drm/panthor/panthor_mmu.c
> +++ b/drivers/gpu/drm/panthor/panthor_mmu.c
> @@ -1580,7 +1580,9 @@ panthor_vm_pool_get_vm(struct panthor_vm_pool *pool, u32 handle)
> {
> struct panthor_vm *vm;
>
> + xa_lock(&pool->xa);
> vm = panthor_vm_get(xa_load(&pool->xa, handle));
> + xa_unlock(&pool->xa);
>
> return vm;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-11-07 15:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-06 18:58 [PATCH v2] drm/panthor: Lock XArray when getting entries for the VM Liviu Dudau
2024-11-07 7:59 ` Boris Brezillon
2024-11-07 10:42 ` Steven Price
2024-11-07 15:26 ` Steven Price
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox