Skip to content

Commit a3211a4

Browse files
mbrost05gregkh
authored andcommitted
drm/xe: Do not dereference NULL job->fence in trace points
commit 5d30de4 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: 0ac7a2c ("drm/xe: Don't initialize fences at xe_sched_job_create()") Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240605055041.2082074-1-matthew.brost@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fbacee4 commit a3211a4

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_sched_job.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ to_xe_sched_job(struct drm_sched_job *drm)
7070

7171
static inline u32 xe_sched_job_seqno(struct xe_sched_job *job)
7272
{
73-
return job->fence->seqno;
73+
return job->fence ? job->fence->seqno : 0;
7474
}
7575

7676
static inline u32 xe_sched_job_lrc_seqno(struct xe_sched_job *job)

drivers/gpu/drm/xe/xe_trace.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ DECLARE_EVENT_CLASS(xe_sched_job,
270270
__entry->guc_state =
271271
atomic_read(&job->q->guc->state);
272272
__entry->flags = job->q->flags;
273-
__entry->error = job->fence->error;
273+
__entry->error = job->fence ? job->fence->error : 0;
274274
__entry->fence = job->fence;
275275
__entry->batch_addr = (u64)job->ptrs[0].batch_addr;
276276
),

0 commit comments

Comments
 (0)