Commit 790533e4 authored by Matthew Auld's avatar Matthew Auld Committed by Lucas De Marchi

drm/xe/guc_submit: add missing locking in wedged_fini

Any non-wedged queue can have a zero refcount here and can be running
concurrently with an async queue destroy, therefore dereferencing the
queue ptr to check wedge status after the lookup can trigger UAF if
queue is not wedged.  Fix this by keeping the submission_state lock held
around the check to postpone the free and make the check safe, before
dropping again around the put() to avoid the deadlock.

Fixes: 8ed9aaae ("drm/xe: Force wedged state and block GT reset upon any GPU hang")
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240924150947.118433-2-matthew.auld@intel.com
(cherry picked from commit d28af0b6b9580b9f90c265a7da0315b0ad20bbfd)
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent cffa8e83
...@@ -290,9 +290,15 @@ static void guc_submit_wedged_fini(void *arg) ...@@ -290,9 +290,15 @@ static void guc_submit_wedged_fini(void *arg)
struct xe_exec_queue *q; struct xe_exec_queue *q;
unsigned long index; unsigned long index;
xa_for_each(&guc->submission_state.exec_queue_lookup, index, q) mutex_lock(&guc->submission_state.lock);
if (exec_queue_wedged(q)) xa_for_each(&guc->submission_state.exec_queue_lookup, index, q) {
if (exec_queue_wedged(q)) {
mutex_unlock(&guc->submission_state.lock);
xe_exec_queue_put(q); xe_exec_queue_put(q);
mutex_lock(&guc->submission_state.lock);
}
}
mutex_unlock(&guc->submission_state.lock);
} }
static const struct xe_exec_queue_ops guc_exec_queue_ops; static const struct xe_exec_queue_ops guc_exec_queue_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment