From: Matthew Brost <matthew.brost@xxxxxxxxx>
commit 5d30de4311d2d4165e78dc021c5cacb7496b3491 upstream.
job->fence is not assigned until xe_sched_job_arm(), check for
job->fence in xe_sched_job_seqno() so any usage of this function (trace
points) do not result in NULL ptr dereference. Also check job->fence
before assigning error in job trace points.
Fixes: 0ac7a2c745e8 ("drm/xe: Don't initialize fences at xe_sched_job_create()")
Cc: Thomas Hellström <thomas.hellstrom@xxxxxxxxxxxxxxx>
Signed-off-by: Matthew Brost <matthew.brost@xxxxxxxxx>
Reviewed-by: Lucas De Marchi <lucas.demarchi@xxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20240605055041.2082074-1-matthew.brost@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/xe/xe_sched_job.h | 2 +-
drivers/gpu/drm/xe/xe_trace.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpu/drm/xe/xe_sched_job.h
+++ b/drivers/gpu/drm/xe/xe_sched_job.h
@@ -70,7 +70,7 @@ to_xe_sched_job(struct drm_sched_job *dr
static inline u32 xe_sched_job_seqno(struct xe_sched_job *job)
{
- return job->fence->seqno;
+ return job->fence ? job->fence->seqno : 0;
}
static inline u32 xe_sched_job_lrc_seqno(struct xe_sched_job *job)
--- a/drivers/gpu/drm/xe/xe_trace.h
+++ b/drivers/gpu/drm/xe/xe_trace.h
@@ -270,7 +270,7 @@ DECLARE_EVENT_CLASS(xe_sched_job,
__entry->guc_state =
atomic_read(&job->q->guc->state);
__entry->flags = job->q->flags;
- __entry->error = job->fence->error;
+ __entry->error = job->fence ? job->fence->error : 0;
__entry->fence = job->fence;
__entry->batch_addr = (u64)job->ptrs[0].batch_addr;
),
Patches currently in stable-queue which might be from matthew.brost@xxxxxxxxx are
queue-6.10/drm-xe-free-job-before-xe_exec_queue_put.patch
queue-6.10/drm-xe-relax-runtime-pm-protection-during-execution.patch
queue-6.10/drm-xe-don-t-initialize-fences-at-xe_sched_job_creat.patch
queue-6.10/drm-xe-decouple-job-seqno-and-lrc-seqno.patch
queue-6.10/drm-xe-do-not-dereference-null-job-fence-in-trace-points.patch
queue-6.10/drm-xe-fix-missing-workqueue-destroy-in-xe_gt_pagefa.patch
queue-6.10/drm-xe-split-lrc-seqno-fence-creation-up.patch
queue-6.10/drm-xe-fix-tile-fini-sequence.patch
