github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

tracing: Split the event string parsing logic into a dedicated function

Browse Source 
This new function can be tested with a KUnit test to prevent regressions
when adding new fields to the format.

Link: https://patch.msgid.link/20260908-tracing-cli-event-filter-v2-4-05396a3fb663@linutronix.de
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Thomas Weißschuh 2026-09-08 08:22:18 +02:00 committed by Steven Rostedt
parent 82c9b6a058
commit f572b5d914
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
kernel/trace/trace_events.c
View File

@ -1443,25 +1443,18 @@ static int __ftrace_set_clr_event(struct trace_array *tr, const char *match,
return ret;
}
int ftrace_set_clr_event(struct trace_array *tr, const char *arg_buf, int set)
static void
ftrace_parse_event_string(char *buf, char **match, char **sub, char **event, char **mod)
{
char *event = NULL, *sub = NULL, *match, *mod;
char *buf;
if (!tr)
return -ENOENT;
char *dupped_buf __free(kfree) = kstrdup(arg_buf, GFP_KERNEL);
if (!dupped_buf)
return -ENOMEM;
buf = dupped_buf;
*event = NULL;
*sub = NULL;
/* Modules events can be appended with :mod:<module> */
mod = strstr(buf, ":mod:");
if (mod) {
*mod = '\0';
*mod = strstr(buf, ":mod:");
if (*mod) {
**mod = '\0';
/* move to the module name */
mod += 5;
*mod += 5;
}
/*
@ -1476,21 +1469,35 @@ int ftrace_set_clr_event(struct trace_array *tr, const char *arg_buf, int set)
* the name <name> or any event that matches <name>
*/
match = strsep(&buf, ":");
*match = strsep(&buf, ":");
if (buf) {
sub = match;
event = buf;
match = NULL;
*sub = *match;
*event = buf;
*match = NULL;
if (!strlen(sub) || strcmp(sub, "*") == 0)
sub = NULL;
if (!strlen(event) || strcmp(event, "*") == 0)
event = NULL;
} else if (mod) {
if (!strlen(*sub) || strcmp(*sub, "*") == 0)
*sub = NULL;
if (!strlen(*event) || strcmp(*event, "*") == 0)
*event = NULL;
} else if (*mod) {
/* Allow wildcard for no length or star */
if (!strlen(match) || strcmp(match, "*") == 0)
match = NULL;
if (!strlen(*match) || strcmp(*match, "*") == 0)
*match = NULL;
}
}
int ftrace_set_clr_event(struct trace_array *tr, const char *arg_buf, int set)
{
char *event, *sub, *match, *mod;
if (!tr)
return -ENOENT;
char *dupped_buf __free(kfree) = kstrdup(arg_buf, GFP_KERNEL);
if (!dupped_buf)
return -ENOMEM;
ftrace_parse_event_string(dupped_buf, &match, &sub, &event, &mod);
return __ftrace_set_clr_event(tr, match, sub, event, set, mod);
}