From: Tom Zanussi <tom.zanussi@linux.intel.com>
To: rostedt@goodmis.org
Cc: daniel.wagner@bmw-carit.de, masami.hiramatsu.pt@hitachi.com,
namhyung@kernel.org, josh@joshtriplett.org, andi@firstfloor.org,
mathieu.desnoyers@efficios.com, peterz@infradead.org,
linux-kernel@vger.kernel.org,
Tom Zanussi <tom.zanussi@linux.intel.com>
Subject: [PATCH v10 01/26] tracing: Update cond flag when enabling or disabling a trigger
Date: Wed, 30 Sep 2015 14:09:47 -0500 [thread overview]
Message-ID: <71cc3d9a7dc7c56259a4162de36edcf1945e3558.1443637631.git.tom.zanussi@linux.intel.com> (raw)
In-Reply-To: <cover.1443637631.git.tom.zanussi@linux.intel.com>
In-Reply-To: <cover.1443637631.git.tom.zanussi@linux.intel.com>
When a trigger is enabled, the cond flag should be set beforehand,
otherwise a trigger that's expecting to process a trace record
(e.g. one with post_trigger set) could be invoked without one.
Likewise a trigger's cond flag should be reset after it's disabled,
not before.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
kernel/trace/trace_events_trigger.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 42a4009..4d2f3cc 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -543,11 +543,12 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,
list_add_rcu(&data->list, &file->triggers);
ret++;
+ update_cond_flag(file);
if (trace_event_trigger_enable_disable(file, 1) < 0) {
list_del_rcu(&data->list);
+ update_cond_flag(file);
ret--;
}
- update_cond_flag(file);
out:
return ret;
}
@@ -575,8 +576,8 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) {
unregistered = true;
list_del_rcu(&data->list);
- update_cond_flag(file);
trace_event_trigger_enable_disable(file, 0);
+ update_cond_flag(file);
break;
}
}
@@ -1319,11 +1320,12 @@ static int event_enable_register_trigger(char *glob,
list_add_rcu(&data->list, &file->triggers);
ret++;
+ update_cond_flag(file);
if (trace_event_trigger_enable_disable(file, 1) < 0) {
list_del_rcu(&data->list);
+ update_cond_flag(file);
ret--;
}
- update_cond_flag(file);
out:
return ret;
}
@@ -1344,8 +1346,8 @@ static void event_enable_unregister_trigger(char *glob,
(enable_data->file == test_enable_data->file)) {
unregistered = true;
list_del_rcu(&data->list);
- update_cond_flag(file);
trace_event_trigger_enable_disable(file, 0);
+ update_cond_flag(file);
break;
}
}
--
1.9.3
next prev parent reply other threads:[~2015-09-30 19:10 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 19:09 [PATCH 00/26] tracing: 'hist' triggers Tom Zanussi
2015-09-30 19:09 ` Tom Zanussi [this message]
2015-09-30 19:09 ` [PATCH v10 02/26] tracing: Make ftrace_event_field checking functions available Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 03/26] tracing: Make event trigger " Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 04/26] tracing: Add event record param to trigger_ops.func() Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 05/26] tracing: Add get_syscall_name() Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 06/26] tracing: Add a per-event-trigger 'paused' field Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 07/26] tracing: Add needs_rec flag to event triggers Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 08/26] tracing: Add lock-free tracing_map Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 09/26] tracing: Add 'hist' event trigger command Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 10/26] tracing: Add hist trigger support for multiple values ('vals=' param) Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 11/26] tracing: Add hist trigger support for compound keys Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 12/26] tracing: Add hist trigger support for user-defined sorting ('sort=' param) Tom Zanussi
2015-09-30 19:09 ` [PATCH v10 13/26] tracing: Add hist trigger support for pausing and continuing a trace Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 14/26] tracing: Add hist trigger support for clearing " Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 15/26] tracing: Add hist trigger 'hex' modifier for displaying numeric fields Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 16/26] tracing: Add hist trigger 'sym' and 'sym-offset' modifiers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 17/26] tracing: Add hist trigger 'execname' modifier Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 18/26] tracing: Add hist trigger 'syscall' modifier Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 19/26] tracing: Add hist trigger support for stacktraces as keys Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 20/26] tracing: Support string type key properly Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 21/26] tracing: Remove restriction on string position in hist trigger keys Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 22/26] tracing: Add enable_hist/disable_hist triggers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 23/26] tracing: Add 'hist' trigger Documentation Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 24/26] tracing: Add support for multiple hist triggers per event Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 25/26] tracing: Add support for named triggers Tom Zanussi
2015-09-30 19:10 ` [PATCH v10 26/26] tracing: Add support for named hist triggers Tom Zanussi
2015-10-21 12:40 ` [PATCH 00/26] tracing: 'hist' triggers 平松雅巳 / HIRAMATU，MASAMI
2015-10-22 11:17 ` Masami Hiramatsu
2015-10-22 11:17 ` [PATCH 1/2] kselftests/ftrace : Add event trigger testcases Masami Hiramatsu
2015-10-22 11:17 ` [PATCH 2/2] kselftests/ftrace: Add hist " Masami Hiramatsu
2015-10-22 18:10 ` [PATCH 00/26] tracing: 'hist' triggers Tom Zanussi
2015-10-23 6:48 ` 平松雅巳 / HIRAMATU，MASAMI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=71cc3d9a7dc7c56259a4162de36edcf1945e3558.1443637631.git.tom.zanussi@linux.intel.com \
--to=tom.zanussi@linux.intel.com \
--cc=andi@firstfloor.org \
--cc=daniel.wagner@bmw-carit.de \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®