Skip to content

Commit 09fb2c6

Browse files
melissawenpelwell
authored andcommitted
drm/v3d: create a dedicated lock for dma fence
Don't mix dma fence lock with the active_job lock. Use fence_lock to protect the dma fence used by drm scheduler when signalling a job completion and queue_lock to protect concurrent access to active bin job in OOM and stats collection for a given file priv. The issue was uncovered when PREEMPT_RT on with a system freeze when opening multiple Chromium tabs on Raspberry Pi 5. Link: #7035 Fixes: fa6a20c ("drm/v3d: Address race-condition between per-fd GPU stats and fd release") Signed-off-by: Melissa Wen <[email protected]> Acked-by: Iago Toral Quiroga <[email protected]> Reviewed-by: Maíra Canal <[email protected]> Signed-off-by: Melissa Wen <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent d140b69 commit 09fb2c6

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

drivers/gpu/drm/v3d/v3d_drv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ struct v3d_queue_state {
6262
/* Currently active job for this queue */
6363
struct v3d_job *active_job;
6464
spinlock_t queue_lock;
65+
/* Protect dma fence for signalling job completion */
66+
spinlock_t fence_lock;
6567
};
6668

6769
/* Performance monitor object. The perform lifetime is controlled by userspace

drivers/gpu/drm/v3d/v3d_fence.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct dma_fence *v3d_fence_create(struct v3d_dev *v3d, enum v3d_queue q)
1515
fence->dev = &v3d->drm;
1616
fence->queue = q;
1717
fence->seqno = ++queue->emit_seqno;
18-
dma_fence_init(&fence->base, &v3d_fence_ops, &queue->queue_lock,
18+
dma_fence_init(&fence->base, &v3d_fence_ops, &queue->fence_lock,
1919
queue->fence_context, fence->seqno);
2020

2121
return &fence->base;

drivers/gpu/drm/v3d/v3d_gem.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ v3d_gem_init(struct drm_device *dev)
274274
seqcount_init(&queue->stats.lock);
275275

276276
spin_lock_init(&queue->queue_lock);
277+
spin_lock_init(&queue->fence_lock);
277278
}
278279

279280
spin_lock_init(&v3d->mm_lock);

0 commit comments

Comments
 (0)