Commit e87826ef authored by Chia-I Wu's avatar Chia-I Wu Committed by Andrey Grodzovsky
Browse files

drm/sched: use __string in tracepoints 



Otherwise, ring names are marked [UNSAFE-MEMORY].

Signed-off-by: default avatarChia-I Wu <olvaffe@gmail.com>
Cc: Rob Clark <robdclark@chromium.org>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220412204809.824491-2-olvaffe@gmail.com
parent 4a35c23f

drivers/gpu/drm/scheduler/gpu_scheduler_trace.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(drm_sched_job, 
	    TP_STRUCT__entry(

	    TP_STRUCT__entry(

			     __field(struct drm_sched_entity *, entity)

			     __field(struct drm_sched_entity *, entity)

			     __field(struct dma_fence *, fence)

			     __field(struct dma_fence *, fence)

			     __field(const char *, name)

			     __string(name, sched_job->sched->name)

			     __field(uint64_t, id)

			     __field(uint64_t, id)

			     __field(u32, job_count)

			     __field(u32, job_count)

			     __field(int, hw_job_count)

			     __field(int, hw_job_count)
@@ -48,14 +48,14 @@ DECLARE_EVENT_CLASS(drm_sched_job, 
			   __entry->entity = entity;

			   __entry->entity = entity;

			   __entry->id = sched_job->id;

			   __entry->id = sched_job->id;

			   __entry->fence = &sched_job->s_fence->finished;

			   __entry->fence = &sched_job->s_fence->finished;

			   __entry->name = sched_job->sched->name;

			   __assign_str(name, sched_job->sched->name);

			   __entry->job_count = spsc_queue_count(&entity->job_queue);

			   __entry->job_count = spsc_queue_count(&entity->job_queue);

			   __entry->hw_job_count = atomic_read(

			   __entry->hw_job_count = atomic_read(

				   &sched_job->sched->hw_rq_count);

				   &sched_job->sched->hw_rq_count);

			   ),

			   ),

	    TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",

	    TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",

		      __entry->entity, __entry->id,

		      __entry->entity, __entry->id,

		      __entry->fence, __entry->name,

		      __entry->fence, __get_str(name),

		      __entry->job_count, __entry->hw_job_count)

		      __entry->job_count, __entry->hw_job_count)

);

);
@@ -86,7 +86,7 @@ TRACE_EVENT(drm_sched_job_wait_dep, 
	    TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence),

	    TP_PROTO(struct drm_sched_job *sched_job, struct dma_fence *fence),

	    TP_ARGS(sched_job, fence),

	    TP_ARGS(sched_job, fence),

	    TP_STRUCT__entry(

	    TP_STRUCT__entry(

			     __field(const char *,name)

			     __string(name, sched_job->sched->name)

			     __field(uint64_t, id)

			     __field(uint64_t, id)

			     __field(struct dma_fence *, fence)

			     __field(struct dma_fence *, fence)

			     __field(uint64_t, ctx)

			     __field(uint64_t, ctx)
@@ -94,14 +94,14 @@ TRACE_EVENT(drm_sched_job_wait_dep, 
			     ),

			     ),





	    TP_fast_assign(

	    TP_fast_assign(

			   __entry->name = sched_job->sched->name;

			   __assign_str(name, sched_job->sched->name);

			   __entry->id = sched_job->id;

			   __entry->id = sched_job->id;

			   __entry->fence = fence;

			   __entry->fence = fence;

			   __entry->ctx = fence->context;

			   __entry->ctx = fence->context;

			   __entry->seqno = fence->seqno;

			   __entry->seqno = fence->seqno;

			   ),

			   ),

	    TP_printk("job ring=%s, id=%llu, depends fence=%p, context=%llu, seq=%u",

	    TP_printk("job ring=%s, id=%llu, depends fence=%p, context=%llu, seq=%u",

		      __entry->name, __entry->id,

		      __get_str(name), __entry->id,

		      __entry->fence, __entry->ctx,

		      __entry->fence, __entry->ctx,

		      __entry->seqno)

		      __entry->seqno)

);

);