AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tracing: Allow whitespace to surround hist trigger filter

Browse Source 
The existing code only allows for one space before and after the 'if'
specifying the filter for a hist trigger.  Add code to make that more
permissive as far as whitespace goes.  Specifically, we want to allow
spaces in the trigger itself now that we have additional syntax
(onmatch/onmax) where spaces are more natural e.g. spaces after commas
in param lists.

Link: http://lkml.kernel.org/r/1053090c3c308d4f431accdeb59dff4b511d4554.1516069914.git.tom.zanussi@linux.intel.com

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Tom Zanussi 2018-01-15 20:52:02 -06:00 committed by Steven Rostedt (VMware)
parent 50450603ec
commit ec5ce09875
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
kernel/trace/trace_events_hist.c
View File

@ -5162,7 +5162,7 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
struct synth_event *se; struct synth_event *se;
const char *se_name; const char *se_name;
bool remove = false; bool remove = false;
char *trigger; char *trigger, *p;
int ret = 0; int ret = 0;
if (!param) if (!param)
@ -5171,10 +5171,37 @@ static int event_hist_trigger_func(struct event_command *cmd_ops,
if (glob[0] == '!') if (glob[0] == '!')
remove = true; remove = true;
/* separate the trigger from the filter (k:v [if filter]) */ /*
trigger = strsep(&param, " \t"); * separate the trigger from the filter (k:v [if filter])
if (!trigger) * allowing for whitespace in the trigger
return -EINVAL; */
p = trigger = param;
do {
p = strstr(p, "if");
if (!p)
break;
if (p == param)
return -EINVAL;
if (*(p - 1) != ' ' && *(p - 1) != '\t') {
p++;
continue;
}
if (p >= param + strlen(param) - strlen("if") - 1)
return -EINVAL;
if (*(p + strlen("if")) != ' ' && *(p + strlen("if")) != '\t') {
p++;
continue;
}
break;
} while (p);
if (!p)
param = NULL;
else {
*(p - 1) = '\0';
param = strstrip(p);
trigger = strstrip(trigger);
}
attrs = parse_hist_trigger_attrs(trigger); attrs = parse_hist_trigger_attrs(trigger);
if (IS_ERR(attrs)) if (IS_ERR(attrs))