2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
114 lines
3.8 KiB
C
114 lines
3.8 KiB
C
/*
|
|
* Copyright 2017 Advanced Micro Devices, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#if !defined(_GPU_SCHED_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _GPU_SCHED_TRACE_H_
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/types.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM gpu_scheduler
|
|
#define TRACE_INCLUDE_FILE gpu_scheduler_trace
|
|
|
|
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)
|
|
__field(u32, job_count)
|
|
__field(int, hw_job_count)
|
|
),
|
|
|
|
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);
|
|
),
|
|
TP_printk("entity=%p, id=%llu, fence=%p, ring=%s, job count:%u, hw job count:%d",
|
|
__entry->entity, __entry->id,
|
|
__entry->fence, __get_str(name),
|
|
__entry->job_count, __entry->hw_job_count)
|
|
);
|
|
|
|
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)
|
|
);
|
|
|
|
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,
|
|
TP_PROTO(struct drm_sched_fence *fence),
|
|
TP_ARGS(fence),
|
|
TP_STRUCT__entry(
|
|
__field(struct dma_fence *, fence)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->fence = &fence->finished;
|
|
),
|
|
TP_printk("fence=%p signaled", __entry->fence)
|
|
);
|
|
|
|
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(uint64_t, id)
|
|
__field(struct dma_fence *, fence)
|
|
__field(uint64_t, ctx)
|
|
__field(unsigned, seqno)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(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",
|
|
__get_str(name), __entry->id,
|
|
__entry->fence, __entry->ctx,
|
|
__entry->seqno)
|
|
);
|
|
|
|
#endif
|
|
|
|
/* This part must be outside protection */
|
|
#undef TRACE_INCLUDE_PATH
|
|
#define TRACE_INCLUDE_PATH ../../drivers/gpu/drm/scheduler
|
|
#include <trace/define_trace.h>
|