mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-04 04:06:26 +00:00
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>
133 lines
3.0 KiB
C
133 lines
3.0 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM workqueue
|
|
|
|
#if !defined(_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_WORKQUEUE_H
|
|
|
|
#include <linux/tracepoint.h>
|
|
#include <linux/workqueue.h>
|
|
|
|
struct pool_workqueue;
|
|
|
|
/**
|
|
* workqueue_queue_work - called when a work gets queued
|
|
* @req_cpu: the requested cpu
|
|
* @pwq: pointer to struct pool_workqueue
|
|
* @work: pointer to struct work_struct
|
|
*
|
|
* This event occurs when a work is queued immediately or once a
|
|
* delayed work is actually queued on a workqueue (ie: once the delay
|
|
* has been reached).
|
|
*/
|
|
TRACE_EVENT(workqueue_queue_work,
|
|
|
|
TP_PROTO(int req_cpu, struct pool_workqueue *pwq,
|
|
struct work_struct *work),
|
|
|
|
TP_ARGS(req_cpu, pwq, work),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, work )
|
|
__field( void *, function)
|
|
__string( workqueue, pwq->wq->name)
|
|
__field( int, req_cpu )
|
|
__field( int, cpu )
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->work = work;
|
|
__entry->function = work->func;
|
|
__assign_str(workqueue);
|
|
__entry->req_cpu = req_cpu;
|
|
__entry->cpu = pwq->pool->cpu;
|
|
),
|
|
|
|
TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%d cpu=%d",
|
|
__entry->work, __entry->function, __get_str(workqueue),
|
|
__entry->req_cpu, __entry->cpu)
|
|
);
|
|
|
|
/**
|
|
* workqueue_activate_work - called when a work gets activated
|
|
* @work: pointer to struct work_struct
|
|
*
|
|
* This event occurs when a queued work is put on the active queue,
|
|
* which happens immediately after queueing unless @max_active limit
|
|
* is reached.
|
|
*/
|
|
TRACE_EVENT(workqueue_activate_work,
|
|
|
|
TP_PROTO(struct work_struct *work),
|
|
|
|
TP_ARGS(work),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, work )
|
|
__field( void *, function)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->work = work;
|
|
__entry->function = work->func;
|
|
),
|
|
|
|
TP_printk("work struct %p function=%ps ", __entry->work, __entry->function)
|
|
);
|
|
|
|
/**
|
|
* workqueue_execute_start - called immediately before the workqueue callback
|
|
* @work: pointer to struct work_struct
|
|
*
|
|
* Allows to track workqueue execution.
|
|
*/
|
|
TRACE_EVENT(workqueue_execute_start,
|
|
|
|
TP_PROTO(struct work_struct *work),
|
|
|
|
TP_ARGS(work),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, work )
|
|
__field( void *, function)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->work = work;
|
|
__entry->function = work->func;
|
|
),
|
|
|
|
TP_printk("work struct %p: function %ps", __entry->work, __entry->function)
|
|
);
|
|
|
|
/**
|
|
* workqueue_execute_end - called immediately after the workqueue callback
|
|
* @work: pointer to struct work_struct
|
|
* @function: pointer to worker function
|
|
*
|
|
* Allows to track workqueue execution.
|
|
*/
|
|
TRACE_EVENT(workqueue_execute_end,
|
|
|
|
TP_PROTO(struct work_struct *work, work_func_t function),
|
|
|
|
TP_ARGS(work, function),
|
|
|
|
TP_STRUCT__entry(
|
|
__field( void *, work )
|
|
__field( void *, function)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->work = work;
|
|
__entry->function = function;
|
|
),
|
|
|
|
TP_printk("work struct %p: function %ps", __entry->work, __entry->function)
|
|
);
|
|
|
|
#endif /* _TRACE_WORKQUEUE_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|