drm/sched/tests: Use one lock for fence context
Subsystems (3)
Philipp Stanner
maintainerPATCH v2 1/1 drm/sched/tests: Use one lock for fence context
There is no need for separate locks for single jobs and the entire scheduler. The dma_fence context can be protected by the scheduler lock, allowing for removing the jobs' locks. This simplifies things and reduces the likelyhood of deadlocks etc.
Replace the jobs' locks with the mock scheduler lock.
---
Changes in v2:
- Make commit message more neutral by stating it's about simplifying the code. (Tvrtko)
--- drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 5 ++--- drivers/gpu/drm/scheduler/tests/sched_tests.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/scheduler/tests/mock_scheduler.c +2 -3
@@ -64,7 +64,7 @@ static void drm_mock_sched_job_complete(struct drm_mock_sched_job *job) job->flags |=DRM_MOCK_SCHED_JOB_DONE ;list_move_tail (&job->link, &sched->done_list); -dma_fence_signal (&job->hw_fence); +dma_fence_signal_locked (&job->hw_fence);complete (&job->done); }
@@ -123,7 +123,6 @@ drm_mock_sched_job_new(struct kunit *test, job->test = test;init_completion (&job->done); -spin_lock_init (&job->lock);INIT_LIST_HEAD (&job->link);hrtimer_setup (&job->timer, drm_mock_sched_job_signal_timer,CLOCK_MONOTONIC ,HRTIMER_MODE_ABS );
@@ -169,7 +168,7 @@ static struct dma_fence *mock_sched_run_job(struct drm_sched_job *sched_job)dma_fence_init (&job->hw_fence, &drm_mock_sched_hw_fence_ops, - &job->lock, + &sched->lock, sched->hw_timeline.context,atomic_inc_return (&sched->hw_timeline.next_seqno));
drivers/gpu/drm/scheduler/tests/sched_tests.h +0 -1
@@ -106,7 +106,6 @@ struct drm_mock_sched_job {unsigned int duration_us;ktime_t finish_at; -spinlock_t lock;struct dma_fence hw_fence;struct kunit *test;
Signature · 1 line
2.49.0
Quoted 52 lines · Philipp Stanner
There is no need for separate locks for single jobs and the entire scheduler. The
dma_fencecontext can be protected by the scheduler lock, allowing for removing the jobs' locks. This simplifies things and reduces the likelyhood of deadlocks etc.Replace the jobs' locks with the mock scheduler lock.
Signed-off-by Philipp Stanner <[email protected]>---
Changes in v2:
- Make commit message more neutral by stating it's about simplifying the code. (Tvrtko)--- drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 5 ++--- drivers/gpu/drm/scheduler/tests/sched_tests.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/scheduler/tests/mock_scheduler.c +2
-3@@ -64,7 +64,7 @@ static void drm_mock_sched_job_complete(struct drm_mock_sched_job *job) job->flags |=DRM_MOCK_SCHED_JOB_DONE ;list_move_tail (&job->link, &sched->done_list); -dma_fence_signal (&job->hw_fence); +dma_fence_signal_locked (&job->hw_fence);complete (&job->done); }@@ -123,7 +123,6 @@ drm_mock_sched_job_new(struct kunit *test, job->test = test;init_completion (&job->done); -spin_lock_init (&job->lock);INIT_LIST_HEAD (&job->link);hrtimer_setup (&job->timer, drm_mock_sched_job_signal_timer,CLOCK_MONOTONIC ,HRTIMER_MODE_ABS );@@ -169,7 +168,7 @@ static struct dma_fence *mock_sched_run_job(struct drm_sched_job *sched_job)dma_fence_init (&job->hw_fence, &drm_mock_sched_hw_fence_ops, - &job->lock, + &sched->lock, sched->hw_timeline.context,atomic_inc_return (&sched->hw_timeline.next_seqno));drivers/gpu/drm/scheduler/tests/sched_tests.h +0
-0
drivers/gpu/drm/scheduler/tests/sched_tests.h struct drm_mock_sched_job { · line 111
Quoted 7 lines
drivers/gpu/drm/scheduler/tests/sched_tests.h +0
-1@@ -106,7 +106,6 @@ struct drm_mock_sched_job {unsigned int duration_us;ktime_t finish_at; -spinlock_t lock;struct dma_fence hw_fence;struct kunit *test;
Regards,
Tvrtko
Philipp Stanner
AppliedQuoted 9 lines · Philipp Stanner
There is no need for separate locks for single jobs and the entire scheduler. The
dma_fencecontext can be protected by the scheduler lock,
allowing for removing the jobs' locks. This simplifies things and reduces the likelyhood of deadlocks etc.Replace the jobs' locks with the mock scheduler lock.
Signed-off-by Philipp Stanner <[email protected]>
Applied to drm-misc-next
P.
Quoted 57 lines
---
Changes in v2:
- Make commit message more neutral by stating it's about simplifying
the code. (Tvrtko)
---
drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 5 ++--- drivers/gpu/drm/scheduler/tests/sched_tests.h | 1 -2 files changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/scheduler/tests/mock_scheduler.c +0
-0@@ -64,7 +64,7 @@ static void drm_mock_sched_job_complete(struct drm_mock_sched_job *job)
job->flags|=DRM_MOCK_SCHED_JOB_DONE;list_move_tail(&job->link, &sched->done_list);drivers/gpu/drm/scheduler/tests/mock_scheduler.c +1
-1-dma_fence_signal (&job->hw_fence); +dma_fence_signal_locked (&job->hw_fence);
complete(&job->done);
}drivers/gpu/drm/scheduler/tests/mock_scheduler.c +0
-0@@ -123,7 +123,6 @@ drm_mock_sched_job_new(struct kunit *test, job->test = test;
init_completion(&job->done);drivers/gpu/drm/scheduler/tests/mock_scheduler.c +0
-1-spin_lock_init (&job->lock);
INIT_LIST_HEAD(&job->link);hrtimer_setup(&job->timer, drm_mock_sched_job_signal_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);drivers/gpu/drm/scheduler/tests/mock_scheduler.c +0
-0@@ -169,7 +168,7 @@ static struct dma_fence *mock_sched_run_job(struct drm_sched_job *sched_job)
dma_fence_init(&job->hw_fence,&drm_mock_sched_hw_fence_ops,drivers/gpu/drm/scheduler/tests/mock_scheduler.c +1
-1- &job->lock, + &sched->lock,
sched->hw_timeline.context, atomic_inc_return(&sched-Quoted 1 line
hw_timeline.next_seqno));
drivers/gpu/drm/scheduler/tests/sched_tests.h +0
-0@@ -106,7 +106,6 @@ struct drm_mock_sched_job { unsigned int duration_us; ktime_t finish_at;drivers/gpu/drm/scheduler/tests/sched_tests.h +0
-1-spinlock_t lock;struct
dma_fencehw_fence;
struct kunit *test;