Commit 180c86a4 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Greg Kroah-Hartman

tracing: Do not have 'comm' filter override event 'comm' field

commit e57cbaf0 upstream.

Commit 9f616680 "tracing: Allow triggers to filter for CPU ids and
process names" added a 'comm' filter that will filter events based on the
current tasks struct 'comm'. But this now hides the ability to filter events
that have a 'comm' field too. For example, sched_migrate_task trace event.
That has a 'comm' field of the task to be migrated.

 echo 'comm == "bash"' > events/sched_migrate_task/filter

will now filter all sched_migrate_task events for tasks named "bash" that
migrates other tasks (in interrupt context), instead of seeing when "bash"
itself gets migrated.

This fix requires a couple of changes.

1) Change the look up order for filter predicates to look at the events
   fields before looking at the generic filters.

2) Instead of basing the filter function off of the "comm" name, have the
   generic "comm" filter have its own filter_type (FILTER_COMM). Test
   against the type instead of the name to assign the filter function.

3) Add a new "COMM" filter that works just like "comm" but will filter based
   on the current task, even if the trace event contains a "comm" field.

Do the same for "cpu" field, adding a FILTER_CPU and a filter "CPU".

Fixes: 9f616680 "tracing: Allow triggers to filter for CPU ids and process names"
Reported-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a55479ab
...@@ -568,6 +568,8 @@ enum { ...@@ -568,6 +568,8 @@ enum {
FILTER_DYN_STRING, FILTER_DYN_STRING,
FILTER_PTR_STRING, FILTER_PTR_STRING,
FILTER_TRACE_FN, FILTER_TRACE_FN,
FILTER_COMM,
FILTER_CPU,
}; };
extern int trace_event_raw_init(struct trace_event_call *call); extern int trace_event_raw_init(struct trace_event_call *call);
......
...@@ -97,16 +97,16 @@ trace_find_event_field(struct trace_event_call *call, char *name) ...@@ -97,16 +97,16 @@ trace_find_event_field(struct trace_event_call *call, char *name)
struct ftrace_event_field *field; struct ftrace_event_field *field;
struct list_head *head; struct list_head *head;
field = __find_event_field(&ftrace_generic_fields, name); head = trace_get_fields(call);
field = __find_event_field(head, name);
if (field) if (field)
return field; return field;
field = __find_event_field(&ftrace_common_fields, name); field = __find_event_field(&ftrace_generic_fields, name);
if (field) if (field)
return field; return field;
head = trace_get_fields(call); return __find_event_field(&ftrace_common_fields, name);
return __find_event_field(head, name);
} }
static int __trace_define_field(struct list_head *head, const char *type, static int __trace_define_field(struct list_head *head, const char *type,
...@@ -171,8 +171,10 @@ static int trace_define_generic_fields(void) ...@@ -171,8 +171,10 @@ static int trace_define_generic_fields(void)
{ {
int ret; int ret;
__generic_field(int, cpu, FILTER_OTHER); __generic_field(int, CPU, FILTER_CPU);
__generic_field(char *, comm, FILTER_PTR_STRING); __generic_field(int, cpu, FILTER_CPU);
__generic_field(char *, COMM, FILTER_COMM);
__generic_field(char *, comm, FILTER_COMM);
return ret; return ret;
} }
......
...@@ -1043,13 +1043,14 @@ static int init_pred(struct filter_parse_state *ps, ...@@ -1043,13 +1043,14 @@ static int init_pred(struct filter_parse_state *ps,
return -EINVAL; return -EINVAL;
} }
if (is_string_field(field)) { if (field->filter_type == FILTER_COMM) {
filter_build_regex(pred);
fn = filter_pred_comm;
pred->regex.field_len = TASK_COMM_LEN;
} else if (is_string_field(field)) {
filter_build_regex(pred); filter_build_regex(pred);
if (!strcmp(field->name, "comm")) { if (field->filter_type == FILTER_STATIC_STRING) {
fn = filter_pred_comm;
pred->regex.field_len = TASK_COMM_LEN;
} else if (field->filter_type == FILTER_STATIC_STRING) {
fn = filter_pred_string; fn = filter_pred_string;
pred->regex.field_len = field->size; pred->regex.field_len = field->size;
} else if (field->filter_type == FILTER_DYN_STRING) } else if (field->filter_type == FILTER_DYN_STRING)
...@@ -1072,7 +1073,7 @@ static int init_pred(struct filter_parse_state *ps, ...@@ -1072,7 +1073,7 @@ static int init_pred(struct filter_parse_state *ps,
} }
pred->val = val; pred->val = val;
if (!strcmp(field->name, "cpu")) if (field->filter_type == FILTER_CPU)
fn = filter_pred_cpu; fn = filter_pred_cpu;
else else
fn = select_comparison_fn(pred->op, field->size, fn = select_comparison_fn(pred->op, field->size,
......
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