leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracing: Only add filter list when needed

Browse Source 
replace_system_preds() creates a filter list to free even when it doesn't
really need to have it. Only save filters that require synchronize_sched()
in the filter list to free. This will allow the code to be updated a bit
easier in the future.

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (VMware) 2018-02-22 23:26:11 -05:00
parent c7399708b3
commit 404a3add43
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/trace/trace_events_filter.c
View File

@ -1769,6 +1769,7 @@ static int replace_system_preds(struct trace_subsystem_dir *dir,
{ {
struct trace_event_file *file; struct trace_event_file *file;
struct filter_list *filter_item; struct filter_list *filter_item;
struct event_filter *filter = NULL;
struct filter_list *tmp; struct filter_list *tmp;
LIST_HEAD(filter_list); LIST_HEAD(filter_list);
bool fail = true; bool fail = true;
@ -1790,7 +1791,6 @@ static int replace_system_preds(struct trace_subsystem_dir *dir,
} }
list_for_each_entry(file, &tr->events, list) { list_for_each_entry(file, &tr->events, list) {
struct event_filter *filter;
if (file->system != dir) if (file->system != dir)
continue; continue;
@ -1798,17 +1798,10 @@ static int replace_system_preds(struct trace_subsystem_dir *dir,
if (event_no_set_filter_flag(file)) if (event_no_set_filter_flag(file))
continue; continue;
filter_item = kzalloc(sizeof(*filter_item), GFP_KERNEL); filter = kzalloc(sizeof(*filter), GFP_KERNEL);
if (!filter_item) if (!filter)
goto fail_mem; goto fail_mem;
list_add_tail(&filter_item->list, &filter_list);
filter_item->filter = kzalloc(sizeof(*filter), GFP_KERNEL);
if (!filter_item->filter)
goto fail_mem;
filter = filter_item->filter;
/* Can only fail on no memory */ /* Can only fail on no memory */
err = replace_filter_string(filter, filter_string); err = replace_filter_string(filter, filter_string);
if (err) if (err)
@ -1821,13 +1814,20 @@ static int replace_system_preds(struct trace_subsystem_dir *dir,
append_filter_err(ps, filter); append_filter_err(ps, filter);
} else } else
event_set_filtered_flag(file); event_set_filtered_flag(file);
filter_item = kzalloc(sizeof(*filter_item), GFP_KERNEL);
if (!filter_item)
goto fail_mem;
list_add_tail(&filter_item->list, &filter_list);
/* /*
* Regardless of if this returned an error, we still * Regardless of if this returned an error, we still
* replace the filter for the call. * replace the filter for the call.
*/ */
filter = event_filter(file); filter_item->filter = event_filter(file);
event_set_filter(file, filter_item->filter); event_set_filter(file, filter);
filter_item->filter = filter; filter = NULL;
fail = false; fail = false;
} }
@ -1856,6 +1856,7 @@ static int replace_system_preds(struct trace_subsystem_dir *dir,
parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0); parse_error(ps, FILT_ERR_BAD_SUBSYS_FILTER, 0);
return -EINVAL; return -EINVAL;
fail_mem: fail_mem:
kfree(filter);
/* If any call succeeded, we still need to sync */ /* If any call succeeded, we still need to sync */
if (!fail) if (!fail)
synchronize_sched(); synchronize_sched();