Skip to content

L
linux
Commit 02aa3162 authored by Jiri Olsa's avatar Jiri Olsa Committed by Steven Rostedt
Browse files
Options

ftrace: Allow to specify filter field type for ftrace events 

Adding FILTER_TRACE_FN event field type for function tracepoint
event, so it can be properly recognized within filtering code.

Currently all fields of ftrace subsystem events share the common
field type FILTER_OTHER. Since the function trace fields need
special care within the filtering code we need to recognize it
properly, hence adding the FILTER_TRACE_FN event type.

Adding filter parameter to the FTRACE_ENTRY macro, to specify the
filter field type for the event.

Link: http://lkml.kernel.org/r/1329317514-8131-7-git-send-email-jolsa@redhat.comSigned-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ced39002
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 47 deletions
include/linux/ftrace_event.h
View file @ 02aa3162
...@@ -245,6 +245,7 @@ enum { ...@@ -245,6 +245,7 @@ enum {
FILTER_STATIC_STRING, FILTER_STATIC_STRING,
FILTER_DYN_STRING, FILTER_DYN_STRING,
FILTER_PTR_STRING, FILTER_PTR_STRING,
FILTER_TRACE_FN,
}; };
#define EVENT_STORAGE_SIZE 128 #define EVENT_STORAGE_SIZE 128
......
kernel/trace/trace.h
View file @ 02aa3162
...@@ -56,7 +56,7 @@ enum trace_type { ...@@ -56,7 +56,7 @@ enum trace_type {
#define F_STRUCT(args...) args #define F_STRUCT(args...) args
#undef FTRACE_ENTRY #undef FTRACE_ENTRY
#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter) \
struct struct_name { \ struct struct_name { \
struct trace_entry ent; \ struct trace_entry ent; \
tstruct \ tstruct \
...@@ -66,11 +66,13 @@ enum trace_type { ...@@ -66,11 +66,13 @@ enum trace_type {
#define TP_ARGS(args...) args #define TP_ARGS(args...) args
#undef FTRACE_ENTRY_DUP #undef FTRACE_ENTRY_DUP
#define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk) #define FTRACE_ENTRY_DUP(name, name_struct, id, tstruct, printk, filter)
#undef FTRACE_ENTRY_REG #undef FTRACE_ENTRY_REG
#define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print, regfn) \ #define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print, \
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print)) filter, regfn) \
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \
filter)
#include "trace_entries.h" #include "trace_entries.h"
...@@ -826,12 +828,13 @@ extern const char *__start___trace_bprintk_fmt[]; ...@@ -826,12 +828,13 @@ extern const char *__start___trace_bprintk_fmt[];
extern const char *__stop___trace_bprintk_fmt[]; extern const char *__stop___trace_bprintk_fmt[];
#undef FTRACE_ENTRY #undef FTRACE_ENTRY
#define FTRACE_ENTRY(call, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY(call, struct_name, id, tstruct, print, filter) \
extern struct ftrace_event_call \ extern struct ftrace_event_call \
__attribute__((__aligned__(4))) event_##call; __attribute__((__aligned__(4))) event_##call;
#undef FTRACE_ENTRY_DUP #undef FTRACE_ENTRY_DUP
#define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print, filter) \
FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print), \
filter)
#include "trace_entries.h" #include "trace_entries.h"
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
......
kernel/trace/trace_entries.h
View file @ 02aa3162
...@@ -66,6 +66,8 @@ FTRACE_ENTRY_REG(function, ftrace_entry, ...@@ -66,6 +66,8 @@ FTRACE_ENTRY_REG(function, ftrace_entry,
F_printk(" %lx <-- %lx", __entry->ip, __entry->parent_ip), F_printk(" %lx <-- %lx", __entry->ip, __entry->parent_ip),
FILTER_TRACE_FN,
perf_ftrace_event_register perf_ftrace_event_register
); );
...@@ -80,7 +82,9 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry, ...@@ -80,7 +82,9 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry,
__field_desc( int, graph_ent, depth ) __field_desc( int, graph_ent, depth )
), ),
F_printk("--> %lx (%d)", __entry->func, __entry->depth) F_printk("--> %lx (%d)", __entry->func, __entry->depth),
FILTER_OTHER
); );
/* Function return entry */ /* Function return entry */
...@@ -100,7 +104,9 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry, ...@@ -100,7 +104,9 @@ FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry,
F_printk("<-- %lx (%d) (start: %llx end: %llx) over: %d", F_printk("<-- %lx (%d) (start: %llx end: %llx) over: %d",
__entry->func, __entry->depth, __entry->func, __entry->depth,
__entry->calltime, __entry->rettime, __entry->calltime, __entry->rettime,
__entry->depth) __entry->depth),
FILTER_OTHER
); );
/* /*
...@@ -129,8 +135,9 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry, ...@@ -129,8 +135,9 @@ FTRACE_ENTRY(context_switch, ctx_switch_entry,
F_printk("%u:%u:%u ==> %u:%u:%u [%03u]", F_printk("%u:%u:%u ==> %u:%u:%u [%03u]",
__entry->prev_pid, __entry->prev_prio, __entry->prev_state, __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
__entry->next_pid, __entry->next_prio, __entry->next_state, __entry->next_pid, __entry->next_prio, __entry->next_state,
__entry->next_cpu __entry->next_cpu),
)
FILTER_OTHER
); );
/* /*
...@@ -148,8 +155,9 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry, ...@@ -148,8 +155,9 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry,
F_printk("%u:%u:%u ==+ %u:%u:%u [%03u]", F_printk("%u:%u:%u ==+ %u:%u:%u [%03u]",
__entry->prev_pid, __entry->prev_prio, __entry->prev_state, __entry->prev_pid, __entry->prev_prio, __entry->prev_state,
__entry->next_pid, __entry->next_prio, __entry->next_state, __entry->next_pid, __entry->next_prio, __entry->next_state,
__entry->next_cpu __entry->next_cpu),
)
FILTER_OTHER
); );
/* /*
...@@ -171,7 +179,9 @@ FTRACE_ENTRY(kernel_stack, stack_entry, ...@@ -171,7 +179,9 @@ FTRACE_ENTRY(kernel_stack, stack_entry,
"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n", "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
__entry->caller[0], __entry->caller[1], __entry->caller[2], __entry->caller[0], __entry->caller[1], __entry->caller[2],
__entry->caller[3], __entry->caller[4], __entry->caller[5], __entry->caller[3], __entry->caller[4], __entry->caller[5],
__entry->caller[6], __entry->caller[7]) __entry->caller[6], __entry->caller[7]),
FILTER_OTHER
); );
FTRACE_ENTRY(user_stack, userstack_entry, FTRACE_ENTRY(user_stack, userstack_entry,
...@@ -187,7 +197,9 @@ FTRACE_ENTRY(user_stack, userstack_entry, ...@@ -187,7 +197,9 @@ FTRACE_ENTRY(user_stack, userstack_entry,
"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n", "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
__entry->caller[0], __entry->caller[1], __entry->caller[2], __entry->caller[0], __entry->caller[1], __entry->caller[2],
__entry->caller[3], __entry->caller[4], __entry->caller[5], __entry->caller[3], __entry->caller[4], __entry->caller[5],
__entry->caller[6], __entry->caller[7]) __entry->caller[6], __entry->caller[7]),
FILTER_OTHER
); );
/* /*
...@@ -204,7 +216,9 @@ FTRACE_ENTRY(bprint, bprint_entry, ...@@ -204,7 +216,9 @@ FTRACE_ENTRY(bprint, bprint_entry,
), ),
F_printk("%08lx fmt:%p", F_printk("%08lx fmt:%p",
__entry->ip, __entry->fmt) __entry->ip, __entry->fmt),
FILTER_OTHER
); );
FTRACE_ENTRY(print, print_entry, FTRACE_ENTRY(print, print_entry,
...@@ -217,7 +231,9 @@ FTRACE_ENTRY(print, print_entry, ...@@ -217,7 +231,9 @@ FTRACE_ENTRY(print, print_entry,
), ),
F_printk("%08lx %s", F_printk("%08lx %s",
__entry->ip, __entry->buf) __entry->ip, __entry->buf),
FILTER_OTHER
); );
FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw, FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
...@@ -236,7 +252,9 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw, ...@@ -236,7 +252,9 @@ FTRACE_ENTRY(mmiotrace_rw, trace_mmiotrace_rw,
F_printk("%lx %lx %lx %d %x %x", F_printk("%lx %lx %lx %d %x %x",
(unsigned long)__entry->phys, __entry->value, __entry->pc, (unsigned long)__entry->phys, __entry->value, __entry->pc,
__entry->map_id, __entry->opcode, __entry->width) __entry->map_id, __entry->opcode, __entry->width),
FILTER_OTHER
); );
FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map, FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
...@@ -254,7 +272,9 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map, ...@@ -254,7 +272,9 @@ FTRACE_ENTRY(mmiotrace_map, trace_mmiotrace_map,
F_printk("%lx %lx %lx %d %x", F_printk("%lx %lx %lx %d %x",
(unsigned long)__entry->phys, __entry->virt, __entry->len, (unsigned long)__entry->phys, __entry->virt, __entry->len,
__entry->map_id, __entry->opcode) __entry->map_id, __entry->opcode),
FILTER_OTHER
); );
...@@ -274,6 +294,8 @@ FTRACE_ENTRY(branch, trace_branch, ...@@ -274,6 +294,8 @@ FTRACE_ENTRY(branch, trace_branch,
F_printk("%u:%s:%s (%u)", F_printk("%u:%s:%s (%u)",
__entry->line, __entry->line,
__entry->func, __entry->file, __entry->correct) __entry->func, __entry->file, __entry->correct),
FILTER_OTHER
); );
kernel/trace/trace_events_filter.c
View file @ 02aa3162
...@@ -899,6 +899,11 @@ int filter_assign_type(const char *type) ...@@ -899,6 +899,11 @@ int filter_assign_type(const char *type)
return FILTER_OTHER; return FILTER_OTHER;
} }
static bool is_function_field(struct ftrace_event_field *field)
{
return field->filter_type == FILTER_TRACE_FN;
}
static bool is_string_field(struct ftrace_event_field *field) static bool is_string_field(struct ftrace_event_field *field)
{ {
return field->filter_type == FILTER_DYN_STRING || return field->filter_type == FILTER_DYN_STRING ||
...@@ -986,7 +991,7 @@ static int init_pred(struct filter_parse_state *ps, ...@@ -986,7 +991,7 @@ static int init_pred(struct filter_parse_state *ps,
fn = filter_pred_strloc; fn = filter_pred_strloc;
else else
fn = filter_pred_pchar; fn = filter_pred_pchar;
} else { } else if (!is_function_field(field)) {
if (field->is_signed) if (field->is_signed)
ret = strict_strtoll(pred->regex.pattern, 0, &val); ret = strict_strtoll(pred->regex.pattern, 0, &val);
else else
......
kernel/trace/trace_export.c
View file @ 02aa3162
...@@ -23,8 +23,10 @@ ...@@ -23,8 +23,10 @@
* function and thus become accesible via perf. * function and thus become accesible via perf.
*/ */
#undef FTRACE_ENTRY_REG #undef FTRACE_ENTRY_REG
#define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print, regfn) \ #define FTRACE_ENTRY_REG(name, struct_name, id, tstruct, print, \
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print)) filter, regfn) \
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \
filter)
/* not needed for this file */ /* not needed for this file */
#undef __field_struct #undef __field_struct
...@@ -52,7 +54,7 @@ ...@@ -52,7 +54,7 @@
#define F_printk(fmt, args...) fmt, args #define F_printk(fmt, args...) fmt, args
#undef FTRACE_ENTRY #undef FTRACE_ENTRY
#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter) \
struct ____ftrace_##name { \ struct ____ftrace_##name { \
tstruct \ tstruct \
}; \ }; \
...@@ -65,8 +67,9 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -65,8 +67,9 @@ static void __always_unused ____ftrace_check_##name(void) \
} }
#undef FTRACE_ENTRY_DUP #undef FTRACE_ENTRY_DUP
#define FTRACE_ENTRY_DUP(name, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY_DUP(name, struct_name, id, tstruct, print, filter) \
FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print)) FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \
filter)
#include "trace_entries.h" #include "trace_entries.h"
...@@ -75,7 +78,7 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -75,7 +78,7 @@ static void __always_unused ____ftrace_check_##name(void) \
ret = trace_define_field(event_call, #type, #item, \ ret = trace_define_field(event_call, #type, #item, \
offsetof(typeof(field), item), \ offsetof(typeof(field), item), \
sizeof(field.item), \ sizeof(field.item), \
is_signed_type(type), FILTER_OTHER); \ is_signed_type(type), filter_type); \
if (ret) \ if (ret) \
return ret; return ret;
...@@ -85,7 +88,7 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -85,7 +88,7 @@ static void __always_unused ____ftrace_check_##name(void) \
offsetof(typeof(field), \ offsetof(typeof(field), \
container.item), \ container.item), \
sizeof(field.container.item), \ sizeof(field.container.item), \
is_signed_type(type), FILTER_OTHER); \ is_signed_type(type), filter_type); \
if (ret) \ if (ret) \
return ret; return ret;
...@@ -99,7 +102,7 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -99,7 +102,7 @@ static void __always_unused ____ftrace_check_##name(void) \
ret = trace_define_field(event_call, event_storage, #item, \ ret = trace_define_field(event_call, event_storage, #item, \
offsetof(typeof(field), item), \ offsetof(typeof(field), item), \
sizeof(field.item), \ sizeof(field.item), \
is_signed_type(type), FILTER_OTHER); \ is_signed_type(type), filter_type); \
mutex_unlock(&event_storage_mutex); \ mutex_unlock(&event_storage_mutex); \
if (ret) \ if (ret) \
return ret; \ return ret; \
...@@ -112,7 +115,7 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -112,7 +115,7 @@ static void __always_unused ____ftrace_check_##name(void) \
offsetof(typeof(field), \ offsetof(typeof(field), \
container.item), \ container.item), \
sizeof(field.container.item), \ sizeof(field.container.item), \
is_signed_type(type), FILTER_OTHER); \ is_signed_type(type), filter_type); \
if (ret) \ if (ret) \
return ret; return ret;
...@@ -120,17 +123,18 @@ static void __always_unused ____ftrace_check_##name(void) \ ...@@ -120,17 +123,18 @@ static void __always_unused ____ftrace_check_##name(void) \
#define __dynamic_array(type, item) \ #define __dynamic_array(type, item) \
ret = trace_define_field(event_call, #type, #item, \ ret = trace_define_field(event_call, #type, #item, \
offsetof(typeof(field), item), \ offsetof(typeof(field), item), \
0, is_signed_type(type), FILTER_OTHER);\ 0, is_signed_type(type), filter_type);\
if (ret) \ if (ret) \
return ret; return ret;
#undef FTRACE_ENTRY #undef FTRACE_ENTRY
#define FTRACE_ENTRY(name, struct_name, id, tstruct, print) \ #define FTRACE_ENTRY(name, struct_name, id, tstruct, print, filter) \
int \ int \
ftrace_define_fields_##name(struct ftrace_event_call *event_call) \ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
{ \ { \
struct struct_name field; \ struct struct_name field; \
int ret; \ int ret; \
int filter_type = filter; \
\ \
tstruct; \ tstruct; \
\ \
...@@ -161,7 +165,8 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \ ...@@ -161,7 +165,8 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
#define F_printk(fmt, args...) #fmt ", " __stringify(args) #define F_printk(fmt, args...) #fmt ", " __stringify(args)
#undef FTRACE_ENTRY_REG #undef FTRACE_ENTRY_REG
#define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, regfn)\ #define FTRACE_ENTRY_REG(call, struct_name, etype, tstruct, print, filter,\
regfn) \
\ \
struct ftrace_event_class event_class_ftrace_##call = { \ struct ftrace_event_class event_class_ftrace_##call = { \
.system = __stringify(TRACE_SYSTEM), \ .system = __stringify(TRACE_SYSTEM), \
...@@ -180,9 +185,9 @@ struct ftrace_event_call __used \ ...@@ -180,9 +185,9 @@ struct ftrace_event_call __used \
__attribute__((section("_ftrace_events"))) *__event_##call = &event_##call; __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call;
#undef FTRACE_ENTRY #undef FTRACE_ENTRY
#define FTRACE_ENTRY(call, struct_name, etype, tstruct, print) \ #define FTRACE_ENTRY(call, struct_name, etype, tstruct, print, filter) \
FTRACE_ENTRY_REG(call, struct_name, etype, \ FTRACE_ENTRY_REG(call, struct_name, etype, \
PARAMS(tstruct), PARAMS(print), NULL) PARAMS(tstruct), PARAMS(print), filter, NULL)
int ftrace_event_is_function(struct ftrace_event_call *call) int ftrace_event_is_function(struct ftrace_event_call *call)
{ {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7