* [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS @ 2022-04-12 20:48 Chia-I Wu 2022-04-12 20:48 ` [PATCH v2 2/2] drm/sched: use __string in tracepoints Chia-I Wu 2022-04-26 16:29 ` [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu 0 siblings, 2 replies; 6+ messages in thread From: Chia-I Wu @ 2022-04-12 20:48 UTC (permalink / raw) To: dri-devel; +Cc: David Airlie, Rob Clark drm_sched_job and drm_run_job have the same prototype. v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey) Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Cc: Rob Clark <robdclark@chromium.org> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> --- .../gpu/drm/scheduler/gpu_scheduler_trace.h | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 877ce9b127f1..188ae2105d57 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -32,7 +32,7 @@ #define TRACE_SYSTEM gpu_scheduler #define TRACE_INCLUDE_FILE gpu_scheduler_trace -TRACE_EVENT(drm_sched_job, +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( @@ -59,31 +59,14 @@ TRACE_EVENT(drm_sched_job, __entry->job_count, __entry->hw_job_count) ); -TRACE_EVENT(drm_run_job, +DEFINE_EVENT(drm_sched_job, 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) - __field(const char *, name) - __field(uint64_t, id) - __field(u32, job_count) - __field(int, hw_job_count) - ), + TP_ARGS(sched_job, entity) +); - TP_fast_assign( - __entry->entity = entity; - __entry->id = sched_job->id; - __entry->fence = &sched_job->s_fence->finished; - __entry->name = sched_job->sched->name; - __entry->job_count = spsc_queue_count(&entity->job_queue); - __entry->hw_job_count = atomic_read( - &sched_job->sched->hw_rq_count); - ), - 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) +DEFINE_EVENT(drm_sched_job, drm_run_job, + TP_PROTO(struct drm_sched_job *sched_job, struct drm_sched_entity *entity), + TP_ARGS(sched_job, entity) ); TRACE_EVENT(drm_sched_process_job, -- 2.35.1.1178.g4f1659d476-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] drm/sched: use __string in tracepoints 2022-04-12 20:48 [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu @ 2022-04-12 20:48 ` Chia-I Wu 2022-04-26 16:29 ` [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu 1 sibling, 0 replies; 6+ messages in thread From: Chia-I Wu @ 2022-04-12 20:48 UTC (permalink / raw) To: dri-devel; +Cc: David Airlie, Rob Clark Otherwise, ring names are marked [UNSAFE-MEMORY]. Signed-off-by: Chia-I Wu <olvaffe@gmail.com> Cc: Rob Clark <robdclark@chromium.org> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> --- drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h index 188ae2105d57..3143ecaaff86 100644 --- a/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +++ b/drivers/gpu/drm/scheduler/gpu_scheduler_trace.h @@ -38,7 +38,7 @@ DECLARE_EVENT_CLASS(drm_sched_job, TP_STRUCT__entry( __field(struct drm_sched_entity *, entity) __field(struct dma_fence *, fence) - __field(const char *, name) + __string(name, sched_job->sched->name) __field(uint64_t, id) __field(u32, job_count) __field(int, hw_job_count) @@ -48,14 +48,14 @@ DECLARE_EVENT_CLASS(drm_sched_job, __entry->entity = entity; __entry->id = sched_job->id; __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->hw_job_count = atomic_read( &sched_job->sched->hw_rq_count); ), 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->fence, __get_str(name), __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_ARGS(sched_job, fence), TP_STRUCT__entry( - __field(const char *,name) + __string(name, sched_job->sched->name) __field(uint64_t, id) __field(struct dma_fence *, fence) __field(uint64_t, ctx) @@ -94,14 +94,14 @@ TRACE_EVENT(drm_sched_job_wait_dep, ), TP_fast_assign( - __entry->name = sched_job->sched->name; + __assign_str(name, sched_job->sched->name); __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", - __entry->name, __entry->id, + __get_str(name), __entry->id, __entry->fence, __entry->ctx, __entry->seqno) ); -- 2.35.1.1178.g4f1659d476-goog ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS 2022-04-12 20:48 [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu 2022-04-12 20:48 ` [PATCH v2 2/2] drm/sched: use __string in tracepoints Chia-I Wu @ 2022-04-26 16:29 ` Chia-I Wu 2022-04-26 18:25 ` Andrey Grodzovsky 1 sibling, 1 reply; 6+ messages in thread From: Chia-I Wu @ 2022-04-26 16:29 UTC (permalink / raw) To: ML dri-devel; +Cc: David Airlie, Rob Clark On Tue, Apr 12, 2022 at 1:48 PM Chia-I Wu <olvaffe@gmail.com> wrote: > > drm_sched_job and drm_run_job have the same prototype. > > v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey) > > Signed-off-by: Chia-I Wu <olvaffe@gmail.com> > Cc: Rob Clark <robdclark@chromium.org> > Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> This series has been reviewed. Is it ok to land (if it hasn't)? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS 2022-04-26 16:29 ` [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu @ 2022-04-26 18:25 ` Andrey Grodzovsky 2022-04-26 18:52 ` Chia-I Wu 0 siblings, 1 reply; 6+ messages in thread From: Andrey Grodzovsky @ 2022-04-26 18:25 UTC (permalink / raw) To: Chia-I Wu, ML dri-devel; +Cc: David Airlie, Rob Clark It's ok to land but it wasn't, do you have push permissions to drm-misc-next ? If not, I will do it for you. Andrey On 2022-04-26 12:29, Chia-I Wu wrote: > On Tue, Apr 12, 2022 at 1:48 PM Chia-I Wu <olvaffe@gmail.com> wrote: >> drm_sched_job and drm_run_job have the same prototype. >> >> v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey) >> >> Signed-off-by: Chia-I Wu <olvaffe@gmail.com> >> Cc: Rob Clark <robdclark@chromium.org> >> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > This series has been reviewed. Is it ok to land (if it hasn't)? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS 2022-04-26 18:25 ` Andrey Grodzovsky @ 2022-04-26 18:52 ` Chia-I Wu 2022-04-26 19:13 ` Andrey Grodzovsky 0 siblings, 1 reply; 6+ messages in thread From: Chia-I Wu @ 2022-04-26 18:52 UTC (permalink / raw) To: Andrey Grodzovsky; +Cc: David Airlie, Rob Clark, ML dri-devel That would be great. I don't have push permission. On Tue, Apr 26, 2022 at 11:25 AM Andrey Grodzovsky <andrey.grodzovsky@amd.com> wrote: > > It's ok to land but it wasn't, do you have push permissions to > drm-misc-next ? If not, I will do it for you. > > Andrey > > On 2022-04-26 12:29, Chia-I Wu wrote: > > On Tue, Apr 12, 2022 at 1:48 PM Chia-I Wu <olvaffe@gmail.com> wrote: > >> drm_sched_job and drm_run_job have the same prototype. > >> > >> v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey) > >> > >> Signed-off-by: Chia-I Wu <olvaffe@gmail.com> > >> Cc: Rob Clark <robdclark@chromium.org> > >> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> > > This series has been reviewed. Is it ok to land (if it hasn't)? ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS 2022-04-26 18:52 ` Chia-I Wu @ 2022-04-26 19:13 ` Andrey Grodzovsky 0 siblings, 0 replies; 6+ messages in thread From: Andrey Grodzovsky @ 2022-04-26 19:13 UTC (permalink / raw) To: Chia-I Wu; +Cc: David Airlie, Rob Clark, ML dri-devel Done Andrey On 2022-04-26 14:52, Chia-I Wu wrote: > That would be great. I don't have push permission. > > On Tue, Apr 26, 2022 at 11:25 AM Andrey Grodzovsky > <andrey.grodzovsky@amd.com> wrote: >> It's ok to land but it wasn't, do you have push permissions to >> drm-misc-next ? If not, I will do it for you. >> >> Andrey >> >> On 2022-04-26 12:29, Chia-I Wu wrote: >>> On Tue, Apr 12, 2022 at 1:48 PM Chia-I Wu <olvaffe@gmail.com> wrote: >>>> drm_sched_job and drm_run_job have the same prototype. >>>> >>>> v2: rename the class from drm_sched_job_entity to drm_sched_job (Andrey) >>>> >>>> Signed-off-by: Chia-I Wu <olvaffe@gmail.com> >>>> Cc: Rob Clark <robdclark@chromium.org> >>>> Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com> >>> This series has been reviewed. Is it ok to land (if it hasn't)? ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-26 19:13 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-04-12 20:48 [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu 2022-04-12 20:48 ` [PATCH v2 2/2] drm/sched: use __string in tracepoints Chia-I Wu 2022-04-26 16:29 ` [PATCH v2 1/2] drm/sched: use DECLARE_EVENT_CLASS Chia-I Wu 2022-04-26 18:25 ` Andrey Grodzovsky 2022-04-26 18:52 ` Chia-I Wu 2022-04-26 19:13 ` Andrey Grodzovsky
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox