Re: [PATCH 4/8] drm/sched: Add new test for DRM_GPU_SCHED_STAT_RUNNING

[Tvrtko Ursulin]

On 03/05/2025 21:59, Maíra Canal wrote:
Add a test to submit a single job against a scheduler with the timeout
configured and verify that if the job is still running, the timeout
handler will skip the reset and allow the job to complete.

Signed-off-by: Maíra Canal <mca...@igalia.com>
---
  drivers/gpu/drm/scheduler/tests/mock_scheduler.c |  3 ++
  drivers/gpu/drm/scheduler/tests/tests_basic.c    | 44 ++++++++++++++++++++++++
  2 files changed, 47 insertions(+)

diff --git a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c 
b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
index 
e9af202d84bd55ea5cc048215e39f5407bc84458..9d594cb5bf567be25e018ddbcd28b70a7e994260
 100644
--- a/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
+++ b/drivers/gpu/drm/scheduler/tests/mock_scheduler.c
@@ -211,6 +211,9 @@ mock_sched_timedout_job(struct drm_sched_job *sched_job)
  
  	job->flags |= DRM_MOCK_SCHED_JOB_TIMEDOUT;
  
+	if (job->finish_at && ktime_before(ktime_get(), job->finish_at))
+               return DRM_GPU_SCHED_STAT_RUNNING;

Hmm this would prevent testing timeout handling with mock jobs with 
duration set for any future test. It works, but I am thinking if a more 
explicit way wouldn't be better. For example to add a new job flag like 
DRM_MOCK_SCHED_JOB_DONTRESET or similar?

That way test could use the timing insensitive drm_mock_sched_advance() 
and have explicit control of the execution. If you don't mind I think I 
would prefer that.

Regards,

Tvrtko

+
        drm_sched_stop(&sched->base, &job->base);
  
  	usleep_range(200, 500);
diff --git a/drivers/gpu/drm/scheduler/tests/tests_basic.c 
b/drivers/gpu/drm/scheduler/tests/tests_basic.c
index 
00c691cb3c306f609684f554f17fcb54ba74cb95..669a211b216ee298544ac237abb866077d856586
 100644
--- a/drivers/gpu/drm/scheduler/tests/tests_basic.c
+++ b/drivers/gpu/drm/scheduler/tests/tests_basic.c
@@ -249,8 +249,52 @@ static void drm_sched_basic_timeout(struct kunit *test)
        drm_mock_sched_entity_free(entity);
  }
  
+static void drm_sched_skip_reset(struct kunit *test)
+{
+       struct drm_mock_scheduler *sched = test->priv;
+       struct drm_mock_sched_entity *entity;
+       struct drm_mock_sched_job *job;
+       bool done;
+
+       /*
+        * Submit a single job against a scheduler with the timeout configured
+        * and verify that if the job is still running, the timeout handler
+        * will skip the reset and allow the job to complete.
+        */
+
+       entity = drm_mock_sched_entity_new(test,
+                                          DRM_SCHED_PRIORITY_NORMAL,
+                                          sched);
+       job = drm_mock_sched_job_new(test, entity);
+
+       drm_mock_sched_job_set_duration_us(job, jiffies_to_usecs(2 * 
MOCK_TIMEOUT));
+       drm_mock_sched_job_submit(job);
+
+       done = drm_mock_sched_job_wait_finished(job, MOCK_TIMEOUT);
+       KUNIT_ASSERT_FALSE(test, done);
+
+       KUNIT_ASSERT_EQ(test,
+                       job->flags & DRM_MOCK_SCHED_JOB_TIMEDOUT,
+                       DRM_MOCK_SCHED_JOB_TIMEDOUT);
+
+       KUNIT_ASSERT_FALSE(test, list_empty(&sched->job_list));
+
+       done = drm_mock_sched_job_wait_finished(job, MOCK_TIMEOUT);
+       KUNIT_ASSERT_TRUE(test, done);
+
+       KUNIT_ASSERT_EQ(test,
+                       job->flags & DRM_MOCK_SCHED_JOB_TIMEDOUT,
+                       DRM_MOCK_SCHED_JOB_TIMEDOUT);
+
+       KUNIT_ASSERT_TRUE(test, list_empty(&sched->job_list));
+       KUNIT_ASSERT_TRUE(test, list_empty(&sched->done_list));
+
+       drm_mock_sched_entity_free(entity);
+}
+
  static struct kunit_case drm_sched_timeout_tests[] = {
        KUNIT_CASE(drm_sched_basic_timeout),
+       KUNIT_CASE(drm_sched_skip_reset),
        {}
  };