mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-20 13:03:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

drm/sched: Cleanup gpu_scheduler trace events

Browse Source 
A fence uniquely identify a job, so this commits updates the places
where a kernel pointer was used as an identifier by:

   "fence=%llu:%llu"

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Signed-off-by: Philipp Stanner <phasta@kernel.org>
Link: https://lore.kernel.org/r/20250526125505.2360-5-pierre-eric.pelloux-prayer@amd.com
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2025-05-26 14:54:46 +02:00
committed by Philipp Stanner
parent d6b7b46232
commit 8a98df7006
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/gpu/drm/scheduler/gpu_scheduler_trace.h
View File

@@ -36,28 +36,28 @@ DECLARE_EVENT_CLASS(drm_sched_job,
TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity),
TP_ARGS(sched_job, entity),
TP_STRUCT__entry(
__field(struct drm_sched_entity *, entity)
__field(struct dma_fence *, fence)
__string(name, sched_job->sched->name)
__field(uint64_t, id)
__string(name, sched_job->sched->name)
__field(u32, job_count)
__field(int, hw_job_count)
__string(dev, dev_name(sched_job->sched->dev))
__field(u64, fence_context)
__field(u64, fence_seqno)
),
TP_fast_assign(
__entry->entity = entity;
__entry->id = sched_job->id;
__entry->fence = &sched_job->s_fence->finished;
__assign_str(name);
__entry->job_count = spsc_queue_count(&entity->job_queue);
__entry->hw_job_count = atomic_read(
&sched_job->sched->credit_count);
__assign_str(dev);
__entry->fence_context = sched_job->s_fence->finished.context;
__entry->fence_seqno = sched_job->s_fence->finished.seqno;
),
TP_printk("dev=%s, entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",
__get_str(dev), __entry->entity, __entry->id,
__entry->fence, __get_str(name),
TP_printk("dev=%s, id=%llu, fence=%llu:%llu, ring=%s, job count:%u, hw job count:%d",
__get_str(dev), __entry->id,
__entry->fence_context, __entry->fence_seqno, __get_str(name),
__entry->job_count, __entry->hw_job_count)
);
@@ -75,37 +75,39 @@ TRACE_EVENT(drm_sched_process_job,
TP_PROTO(struct drm_sched_fence *fence),
TP_ARGS(fence),
TP_STRUCT__entry(
__field(struct dma_fence *, fence)
__field(u64, fence_context)
__field(u64, fence_seqno)
),
TP_fast_assign(
__entry->fence = &fence->finished;
__entry->fence_context = fence->finished.context;
__entry->fence_seqno = fence->finished.seqno;
),
TP_printk("fence=%p signaled", __entry->fence)
TP_printk("fence=%llu:%llu signaled",
__entry->fence_context, __entry->fence_seqno)
);
TRACE_EVENT(drm_sched_job_wait_dep,
TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence),
TP_ARGS(sched_job, fence),
TP_STRUCT__entry(
__string(name, sched_job->sched->name)
__field(u64, fence_context)
__field(u64, fence_seqno)
__field(uint64_t, id)
__field(struct dma_fence *, fence)
__field(uint64_t, ctx)
__field(unsigned, seqno)
__field(u64, ctx)
__field(u64, seqno)
),
TP_fast_assign(
__assign_str(name);
__entry->fence_context = sched_job->s_fence->finished.context;
__entry->fence_seqno = sched_job->s_fence->finished.seqno;
__entry->id = sched_job->id;
__entry->fence = fence;
__entry->ctx = fence->context;
__entry->seqno = fence->seqno;
),
TP_printk("job ring=%s, id=%llu, depends fence=%p, context=%llu, seq=%u",
__get_str(name), __entry->id,
__entry->fence, __entry->ctx,
__entry->seqno)
TP_printk("fence=%llu:%llu, id=%llu depends on unsignalled fence=%llu:%llu",
__entry->fence_context, __entry->fence_seqno, __entry->id,
__entry->ctx, __entry->seqno)
);
#endif /* _GPU_SCHED_TRACE_H_ */