Commit 2c2fdb8b authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher

drm/amdgpu: fix amdgpu trace event print string format error

the trace event print string format error.
(use integer type to handle string)

before:
amdgpu_test_kev-1556  [002]   138.508781: amdgpu_cs_ioctl:
sched_job=8, timeline=gfx_0.0.0, context=177, seqno=1,
ring_name=ffff94d01c207bf0, num_ibs=2

after:
amdgpu_test_kev-1506  [004]   370.703783: amdgpu_cs_ioctl:
sched_job=12, timeline=gfx_0.0.0, context=234, seqno=2,
ring_name=gfx_0.0.0, num_ibs=1

change trace event list:
1.amdgpu_cs_ioctl
2.amdgpu_sched_run_job
3.amdgpu_ib_pipe_sync
Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 367039bf
...@@ -170,7 +170,7 @@ TRACE_EVENT(amdgpu_cs_ioctl, ...@@ -170,7 +170,7 @@ TRACE_EVENT(amdgpu_cs_ioctl,
__field(unsigned int, context) __field(unsigned int, context)
__field(unsigned int, seqno) __field(unsigned int, seqno)
__field(struct dma_fence *, fence) __field(struct dma_fence *, fence)
__field(char *, ring_name) __string(ring, to_amdgpu_ring(job->base.sched)->name)
__field(u32, num_ibs) __field(u32, num_ibs)
), ),
...@@ -179,12 +179,12 @@ TRACE_EVENT(amdgpu_cs_ioctl, ...@@ -179,12 +179,12 @@ TRACE_EVENT(amdgpu_cs_ioctl,
__assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))
__entry->context = job->base.s_fence->finished.context; __entry->context = job->base.s_fence->finished.context;
__entry->seqno = job->base.s_fence->finished.seqno; __entry->seqno = job->base.s_fence->finished.seqno;
__entry->ring_name = to_amdgpu_ring(job->base.sched)->name; __assign_str(ring, to_amdgpu_ring(job->base.sched)->name)
__entry->num_ibs = job->num_ibs; __entry->num_ibs = job->num_ibs;
), ),
TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
__entry->sched_job_id, __get_str(timeline), __entry->context, __entry->sched_job_id, __get_str(timeline), __entry->context,
__entry->seqno, __entry->ring_name, __entry->num_ibs) __entry->seqno, __get_str(ring), __entry->num_ibs)
); );
TRACE_EVENT(amdgpu_sched_run_job, TRACE_EVENT(amdgpu_sched_run_job,
...@@ -195,7 +195,7 @@ TRACE_EVENT(amdgpu_sched_run_job, ...@@ -195,7 +195,7 @@ TRACE_EVENT(amdgpu_sched_run_job,
__string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __string(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))
__field(unsigned int, context) __field(unsigned int, context)
__field(unsigned int, seqno) __field(unsigned int, seqno)
__field(char *, ring_name) __string(ring, to_amdgpu_ring(job->base.sched)->name)
__field(u32, num_ibs) __field(u32, num_ibs)
), ),
...@@ -204,12 +204,12 @@ TRACE_EVENT(amdgpu_sched_run_job, ...@@ -204,12 +204,12 @@ TRACE_EVENT(amdgpu_sched_run_job,
__assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job)) __assign_str(timeline, AMDGPU_JOB_GET_TIMELINE_NAME(job))
__entry->context = job->base.s_fence->finished.context; __entry->context = job->base.s_fence->finished.context;
__entry->seqno = job->base.s_fence->finished.seqno; __entry->seqno = job->base.s_fence->finished.seqno;
__entry->ring_name = to_amdgpu_ring(job->base.sched)->name; __assign_str(ring, to_amdgpu_ring(job->base.sched)->name)
__entry->num_ibs = job->num_ibs; __entry->num_ibs = job->num_ibs;
), ),
TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u", TP_printk("sched_job=%llu, timeline=%s, context=%u, seqno=%u, ring_name=%s, num_ibs=%u",
__entry->sched_job_id, __get_str(timeline), __entry->context, __entry->sched_job_id, __get_str(timeline), __entry->context,
__entry->seqno, __entry->ring_name, __entry->num_ibs) __entry->seqno, __get_str(ring), __entry->num_ibs)
); );
...@@ -473,7 +473,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, ...@@ -473,7 +473,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync,
TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence), TP_PROTO(struct amdgpu_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(ring, sched_job->base.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)
...@@ -481,14 +481,14 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, ...@@ -481,14 +481,14 @@ TRACE_EVENT(amdgpu_ib_pipe_sync,
), ),
TP_fast_assign( TP_fast_assign(
__entry->name = sched_job->base.sched->name; __assign_str(ring, sched_job->base.sched->name)
__entry->id = sched_job->base.id; __entry->id = sched_job->base.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, need pipe sync to fence=%p, context=%llu, seq=%u", TP_printk("job ring=%s, id=%llu, need pipe sync to fence=%p, context=%llu, seq=%u",
__entry->name, __entry->id, __get_str(ring), __entry->id,
__entry->fence, __entry->ctx, __entry->fence, __entry->ctx,
__entry->seqno) __entry->seqno)
); );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment