tracing: add print_fmt field
PATCH 6/10 tracing: add print_fmt field
Add print_fmt field and the initialization codes.
It will be used for replacing ->show_format().
---
include/linux/ftrace_event.h +1 -0
@@ -120,6 +120,7 @@ struct ftrace_event_call {int (*regfunc)(struct ftrace_event_call *);void (*unregfunc)(struct ftrace_event_call *);int id; +const char *print_fmt;int (*raw_init)(struct ftrace_event_call *);int (*show_format)(struct ftrace_event_call *,struct trace_seq *);
include/trace/ftrace.h +27 -1
@@ -723,8 +723,20 @@ static struct trace_event ftrace_event_type_##call = { \#include TRACE_INCLUDE (TRACE_INCLUDE_FILE ) +#undef __entry +#define __entry REC + +#undef __print_flags +#undef __print_symbolic +#undef __get_dynamic_array +#undef __get_str + +#undef TP_printk +#define TP_printk(fmt, args...) #fmt ", " __stringify(args) +#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS (call, proto, args, tstruct, assign, print) +#define DECLARE_EVENT_CLASS (call, proto, args, tstruct, assign, print) \ +static const char print_fmt_##call[] = print;#undef DEFINE_EVENT#define DEFINE_EVENT (template, call, proto, args) \
@@ -738,6 +750,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .raw_init = trace_event_raw_init, \ .regfunc = ftrace_raw_reg_event_##call, \ .unregfunc = ftrace_raw_unreg_event_##call, \ + .print_fmt = print_fmt_##template, \ .show_format = ftrace_format_##template, \ .define_fields = ftrace_define_fields_##template, \ _TRACE_PROFILE_INIT(call) \
@@ -746,6 +759,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \#undef DEFINE_EVENT_PRINT#define DEFINE_EVENT_PRINT (template, call, proto, args, print) \ \ +static const char print_fmt_##call[] = print; \ + \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) event_##call = { \
@@ -755,6 +770,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .raw_init = trace_event_raw_init, \ .regfunc = ftrace_raw_reg_event_##call, \ .unregfunc = ftrace_raw_unreg_event_##call, \ + .print_fmt = print_fmt_##call, \ .show_format = ftrace_format_##call, \ .define_fields = ftrace_define_fields_##template, \ _TRACE_PROFILE_INIT(call) \
@@ -838,6 +854,16 @@ __attribute__((section("_ftrace_events"))) event_##call = { \#ifdef CONFIG_EVENT_PROFILE +#undef __entry +#define __entry entry + +#undef __get_dynamic_array +#define __get_dynamic_array (field) \ + ((void *)__entry + (__entry->__data_loc_##field & 0xffff)) + +#undef __get_str +#define __get_str (field) (char *)__get_dynamic_array(field) +#undef __perf_addr#define __perf_addr (a) __addr = (a)
kernel/trace/trace_export.c +7 -0
@@ -203,6 +203,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)return 0 ; } +#undef __entry +#define __entry REC +#undef __field#define __field (type, item)
@@ -218,6 +221,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)#undef __dynamic_array#define __dynamic_array (type, item) +#undef F_printk +#define F_printk(fmt, args...) #fmt ", " __stringify(args) +#undef FTRACE_ENTRY#define FTRACE_ENTRY (call, struct_name, type, tstruct, print) \ \
@@ -228,6 +234,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .id = type, \ .system = __stringify(TRACE_SYSTEM), \ .raw_init = ftrace_raw_init_event, \ + .print_fmt = print, \ .show_format = ftrace_format_##call, \ .define_fields = ftrace_define_fields_##call, \ }; \
Steven Rostedt
maintainerQuoted 2 lines · Lai Jiangshan
Add
print_fmtfield and the initialization codes.
It will be used for replacing ->show_format().
This change log is very lacking. I don't even know what this patch is doing. I'm guessing other patches will depend on it. But this patch alone should have a change log that describes the goal that will happen to give it rational.
If I'm bisecting the kernel and I come across this change, I want the change log to explain why this change exists, and not have to spend time searching the logs for other patches that may depend on this one.
-- Steve
Quoted 117 lines
Signed-off-by Lai Jiangshan <[email protected]>---
include/linux/ftrace_event.h +1
-0@@ -120,6 +120,7 @@ struct ftrace_event_call {int (*regfunc)(struct ftrace_event_call *);void (*unregfunc)(struct ftrace_event_call *);int id; +const char *print_fmt;int (*raw_init)(struct ftrace_event_call *);int (*show_format)(struct ftrace_event_call *,struct trace_seq *);include/trace/ftrace.h +27
-1@@ -723,8 +723,20 @@ static struct trace_event ftrace_event_type_##call = { \#include TRACE_INCLUDE (TRACE_INCLUDE_FILE ) +#undef __entry +#define __entry REC + +#undef __print_flags +#undef __print_symbolic +#undef __get_dynamic_array +#undef __get_str + +#undef TP_printk +#define TP_printk(fmt, args...) #fmt ", " __stringify(args) +#undef DECLARE_EVENT_CLASS -#define DECLARE_EVENT_CLASS (call, proto, args, tstruct, assign, print) +#define DECLARE_EVENT_CLASS (call, proto, args, tstruct, assign, print) \ +static const char print_fmt_##call[] = print;#undef DEFINE_EVENT#define DEFINE_EVENT (template, call, proto, args) \@@ -738,6 +750,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .raw_init = trace_event_raw_init, \ .regfunc = ftrace_raw_reg_event_##call, \ .unregfunc = ftrace_raw_unreg_event_##call, \ + .print_fmt = print_fmt_##template, \ .show_format = ftrace_format_##template, \ .define_fields = ftrace_define_fields_##template, \ _TRACE_PROFILE_INIT(call) \@@ -746,6 +759,8 @@ __attribute__((section("_ftrace_events"))) event_##call = { \#undef DEFINE_EVENT_PRINT#define DEFINE_EVENT_PRINT (template, call, proto, args, print) \ \ +static const char print_fmt_##call[] = print; \ + \ static struct ftrace_event_call __used \ __attribute__((__aligned__(4))) \ __attribute__((section("_ftrace_events"))) event_##call = { \@@ -755,6 +770,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .raw_init = trace_event_raw_init, \ .regfunc = ftrace_raw_reg_event_##call, \ .unregfunc = ftrace_raw_unreg_event_##call, \ + .print_fmt = print_fmt_##call, \ .show_format = ftrace_format_##call, \ .define_fields = ftrace_define_fields_##template, \ _TRACE_PROFILE_INIT(call) \@@ -838,6 +854,16 @@ __attribute__((section("_ftrace_events"))) event_##call = { \#ifdef CONFIG_EVENT_PROFILE +#undef __entry +#define __entry entry + +#undef __get_dynamic_array +#define __get_dynamic_array (field) \ + ((void *)__entry + (__entry->__data_loc_##field & 0xffff)) + +#undef __get_str +#define __get_str (field) (char *)__get_dynamic_array(field) +#undef __perf_addr#define __perf_addr (a) __addr = (a)kernel/trace/trace_export.c +7
-0@@ -203,6 +203,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)return 0 ; } +#undef __entry +#define __entry REC +#undef __field#define __field (type, item)@@ -218,6 +221,9 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call)#undef __dynamic_array#define __dynamic_array (type, item) +#undef F_printk +#define F_printk(fmt, args...) #fmt ", " __stringify(args) +#undef FTRACE_ENTRY#define FTRACE_ENTRY (call, struct_name, type, tstruct, print) \ \@@ -228,6 +234,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ .id = type, \ .system = __stringify(TRACE_SYSTEM), \ .raw_init = ftrace_raw_init_event, \ + .print_fmt = print, \ .show_format = ftrace_format_##call, \ .define_fields = ftrace_define_fields_##call, \ }; \
Quoted 4 lines · Steven Rostedt
Quoted 2 lines · Lai Jiangshan
Add
print_fmtfield and the initialization codes.
It will be used for replacing ->show_format().
Quoted 10 lines
This change log is very lacking. I don't even know what this patch is doing. I'm guessing other patches will depend on it. But this patch alone should have a change log that describes the goal that will happen to give it rational.
If I'm bisecting the kernel and I come across this change, I want the change log to explain why this change exists, and not have to spend time searching the logs for other patches that may depend on this one.
For a format file
# cat events/irq/irq_handler_entry/format name: irq_handler_entry ID: 97 format:
A) ======> name, ID, and a string "format:"
field:unsigned short common_type; offset:0; size:2; signed:0;
field:unsigned char common_flags; offset:2; size:1; signed:0;
field:unsigned char common_preempt_count; offset:3; size:1; signed:0;
field:int common_pid; offset:4; size:4; signed:1;
field:int common_lock_depth; offset:8; size:4; signed:1;
field:int irq; offset:12; size:4; signed:1;
field:__data_loc char[] name; offset:16; size:4; signed:1;B) ========> fields.
print fmt: "irq=%d name=%s", REC->irq, __get_str(name)
C) ========> string "print fmt: " and the print format after it.
How my patches work:
For B)
Ensure all fields are add into struct ftrace_event_call->fields. (patch#4) Ensure all fields are correct. (patch#5)
For C)
add a print_fmt field (this patch)
init print_fmt carefully (this patch and patch#7 patch#8)
So when we generate format file:
print name
print ID
print string "format:"
use struct ftrace_event_call->fields to print fields
use struct ftrace_event_call->print_fmt to print "print fmt: XXXXXXXXXXX"
Thanks
-- Lai