]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/sched: Mark scheduler work queues with WQ_MEM_RECLAIM
authorMatthew Brost <matthew.brost@intel.com>
Wed, 23 Oct 2024 23:59:17 +0000 (16:59 -0700)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Mon, 28 Oct 2024 18:12:56 +0000 (14:12 -0400)
drm_gpu_scheduler.submit_wq is used to submit jobs, jobs are in the path
of dma-fences, and dma-fences are in the path of reclaim. Mark scheduler
work queue with WQ_MEM_RECLAIM to ensure forward progress during
reclaim; without WQ_MEM_RECLAIM, work queues cannot make forward
progress during reclaim.

v2:
 - Fixes tags (Philipp)
 - Reword commit message (Philipp)

Cc: Luben Tuikov <ltuikov89@gmail.com>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Philipp Stanner <pstanner@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 34f50cc6441b ("drm/sched: Use drm sched lockdep map for submit_wq")
Fixes: a6149f039369 ("drm/sched: Convert drm scheduler to use a work queue rather than kthread")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Acked-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Philipp Stanner <pstanner@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241023235917.1836428-1-matthew.brost@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
drivers/gpu/drm/scheduler/sched_main.c

index eaef20f41786e6231fb21d0bd167728cb28bdd63..e97c6c60bc96efc452b3045b3e0d359fd2d51ac0 100644 (file)
@@ -1276,10 +1276,11 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
                sched->own_submit_wq = false;
        } else {
 #ifdef CONFIG_LOCKDEP
-               sched->submit_wq = alloc_ordered_workqueue_lockdep_map(name, 0,
+               sched->submit_wq = alloc_ordered_workqueue_lockdep_map(name,
+                                                                      WQ_MEM_RECLAIM,
                                                                       &drm_sched_lockdep_map);
 #else
-               sched->submit_wq = alloc_ordered_workqueue(name, 0);
+               sched->submit_wq = alloc_ordered_workqueue(name, WQ_MEM_RECLAIM);
 #endif
                if (!sched->submit_wq)
                        return -ENOMEM;