mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-04 08:25:51 +00:00
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 73ad7ee5b5504b356b95554b8eca6fd7b860f4c4 Mon Sep 17 00:00:00 2001
|
|
From: Tom Zanussi <tom.zanussi@linux.intel.com>
|
|
Date: Thu, 26 Apr 2018 20:04:49 -0500
|
|
Subject: [PATCH 408/437] tracing: Add field modifier parsing hist error for
|
|
hist triggers
|
|
|
|
[ commit dcf234577cd31fa16874e828b90659166ad6b80d ]
|
|
|
|
If the user specifies an invalid field modifier for a hist trigger,
|
|
the current code correctly flags that as an error, but doesn't tell
|
|
the user what happened.
|
|
|
|
Fix this by invoking hist_err() with an appropriate message when
|
|
invalid modifiers are specified.
|
|
|
|
Before:
|
|
|
|
# echo 'hist:keys=pid:ts0=common_timestamp.junkusecs' >> /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger
|
|
-su: echo: write error: Invalid argument
|
|
# cat /sys/kernel/debug/tracing/events/sched/sched_wakeup/hist
|
|
|
|
After:
|
|
|
|
# echo 'hist:keys=pid:ts0=common_timestamp.junkusecs' >> /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger
|
|
-su: echo: write error: Invalid argument
|
|
# cat /sys/kernel/debug/tracing/events/sched/sched_wakeup/hist
|
|
ERROR: Invalid field modifier: junkusecs
|
|
Last command: keys=pid:ts0=common_timestamp.junkusecs
|
|
|
|
Link: http://lkml.kernel.org/r/b043c59fa79acd06a5f14a1d44dee9e5a3cd1248.1524790601.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>
|
|
---
|
|
kernel/trace/trace_events_hist.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
|
|
index 37db86145c8b..b8fee11b5be9 100644
|
|
--- a/kernel/trace/trace_events_hist.c
|
|
+++ b/kernel/trace/trace_events_hist.c
|
|
@@ -2466,6 +2466,7 @@ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
|
|
else if (strcmp(modifier, "usecs") == 0)
|
|
*flags |= HIST_FIELD_FL_TIMESTAMP_USECS;
|
|
else {
|
|
+ hist_err("Invalid field modifier: ", modifier);
|
|
field = ERR_PTR(-EINVAL);
|
|
goto out;
|
|
}
|
|
--
|
|
2.19.1
|
|
|