[PATCH v2] drm/amd/sched: print sched job id in amd_sched_job trace

[Christian König]

Am 27.06.2017 um 10:49 schrieb Nicolai Hähnle:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> This makes it easier to correlate amd_sched_job with with other trace
> points that don't log the job pointer.
>
> v2: don't print the sched_job pointer (Andres)
>
> Signed-off-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
> Reviewed-by: Andres Rodriguez <andresx7 at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
> index dbd4fd3a..8bd3810 100644
> --- a/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
> +++ b/drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h
> @@ -9,39 +9,40 @@
>   
>   #undef TRACE_SYSTEM
>   #define TRACE_SYSTEM gpu_sched
>   #define TRACE_INCLUDE_FILE gpu_sched_trace
>   
>   TRACE_EVENT(amd_sched_job,
>   	    TP_PROTO(struct amd_sched_job *sched_job),
>   	    TP_ARGS(sched_job),
>   	    TP_STRUCT__entry(
>   			     __field(struct amd_sched_entity *, entity)
> -			     __field(struct amd_sched_job *, sched_job)
>   			     __field(struct dma_fence *, fence)
>   			     __field(const char *, name)
> +			     __field(uint64_t, id)
>   			     __field(u32, job_count)
>   			     __field(int, hw_job_count)
>   			     ),
>   
>   	    TP_fast_assign(
>   			   __entry->entity = sched_job->s_entity;
> -			   __entry->sched_job = sched_job;
> +			   __entry->id = sched_job->id;
>   			   __entry->fence = &sched_job->s_fence->finished;
>   			   __entry->name = sched_job->sched->name;
>   			   __entry->job_count = kfifo_len(
>   				   &sched_job->s_entity->job_queue) / sizeof(sched_job);
>   			   __entry->hw_job_count = atomic_read(
>   				   &sched_job->sched->hw_rq_count);
>   			   ),
> -	    TP_printk("entity=%p, sched job=%p, fence=%p, ring=%s, job count:%u, hw job count:%d",
> -		      __entry->entity, __entry->sched_job, __entry->fence, __entry->name,
> +	    TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",
> +		      __entry->entity, __entry->id,
> +		      __entry->fence, __entry->name,
>   		      __entry->job_count, __entry->hw_job_count)
>   );
>   
>   TRACE_EVENT(amd_sched_process_job,
>   	    TP_PROTO(struct amd_sched_fence *fence),
>   	    TP_ARGS(fence),
>   	    TP_STRUCT__entry(
>   		    __field(struct dma_fence *, fence)
>   		    ),
>