Skip to content

Commit 232674e

Browse files
peppsacmripard
authored andcommitted
drm/sched: Fix racy access to drm_sched_entity.dependency
The drm_sched_job_unschedulable trace point can access entity->dependency after it was cleared by the callback installed in drm_sched_entity_add_dependency_cb, causing: BUG: kernel NULL pointer dereference, address: 0000000000000020 [...] Workqueue: comp_1.1.0 drm_sched_run_job_work [gpu_sched] RIP: 0010:trace_event_raw_event_drm_sched_job_unschedulable+0x70/0xd0 [gpu_sched] To fix this we either need to keep a reference to the fence before setting up the callbacks, or move the trace_drm_sched_job_unschedulable calls into drm_sched_entity_add_dependency_cb where they can be done earlier. Fixes: 76d97c8 ("drm/sched: Trace dependencies for GPU jobs") Signed-off-by: Pierre-Eric Pelloux-Prayer <[email protected]> Reviewed-by: Tvrtko Ursulin <[email protected]> Signed-off-by: Philipp Stanner <[email protected]> Link: https://lore.kernel.org/r/[email protected] (cherry picked from commit b2b8af2) Signed-off-by: Maxime Ripard <[email protected]>
1 parent 69a79ad commit 232674e

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,8 @@ EXPORT_SYMBOL(drm_sched_entity_set_priority);
391391
* Add a callback to the current dependency of the entity to wake up the
392392
* scheduler when the entity becomes available.
393393
*/
394-
static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity)
394+
static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity,
395+
struct drm_sched_job *sched_job)
395396
{
396397
struct drm_gpu_scheduler *sched = entity->rq->sched;
397398
struct dma_fence *fence = entity->dependency;
@@ -421,6 +422,10 @@ static bool drm_sched_entity_add_dependency_cb(struct drm_sched_entity *entity)
421422
entity->dependency = fence;
422423
}
423424

425+
if (trace_drm_sched_job_unschedulable_enabled() &&
426+
!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &entity->dependency->flags))
427+
trace_drm_sched_job_unschedulable(sched_job, entity->dependency);
428+
424429
if (!dma_fence_add_callback(entity->dependency, &entity->cb,
425430
drm_sched_entity_wakeup))
426431
return true;
@@ -461,10 +466,8 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity)
461466

462467
while ((entity->dependency =
463468
drm_sched_job_dependency(sched_job, entity))) {
464-
if (drm_sched_entity_add_dependency_cb(entity)) {
465-
trace_drm_sched_job_unschedulable(sched_job, entity->dependency);
469+
if (drm_sched_entity_add_dependency_cb(entity, sched_job))
466470
return NULL;
467-
}
468471
}
469472

470473
/* skip jobs from entity that marked guilty */

0 commit comments

Comments
 (0)