Skip to content

Commit 4286cc2

Browse files
Tvrtko UrsulinChristianKoenigAMD
authored andcommitted
drm/sched: Add locking to drm_sched_entity_modify_sched
Without the locking amdgpu currently can race between amdgpu_ctx_set_entity_priority() (via drm_sched_entity_modify_sched()) and drm_sched_job_arm(), leading to the latter accesing potentially inconsitent entity->sched_list and entity->num_sched_list pair. v2: * Improve commit message. (Philipp) Signed-off-by: Tvrtko Ursulin <[email protected]> Fixes: b37aced ("drm/scheduler: implement a function to modify sched list") Cc: Christian König <[email protected]> Cc: Alex Deucher <[email protected]> Cc: Luben Tuikov <[email protected]> Cc: Matthew Brost <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: [email protected] Cc: Philipp Stanner <[email protected]> Cc: <[email protected]> # v5.7+ Reviewed-by: Christian König <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Christian König <[email protected]>
1 parent ad604f0 commit 4286cc2

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,
133133
{
134134
WARN_ON(!num_sched_list || !sched_list);
135135

136+
spin_lock(&entity->rq_lock);
136137
entity->sched_list = sched_list;
137138
entity->num_sched_list = num_sched_list;
139+
spin_unlock(&entity->rq_lock);
138140
}
139141
EXPORT_SYMBOL(drm_sched_entity_modify_sched);
140142

0 commit comments

Comments
 (0)