* [PATCH] tracing: Have traceon and traceoff trigger honor the instance
@ 2022-02-24 3:38 Steven Rostedt
2022-02-24 8:54 ` Daniel Bristot de Oliveira
2022-02-25 17:00 ` Tom Zanussi
0 siblings, 2 replies; 4+ messages in thread
From: Steven Rostedt @ 2022-02-24 3:38 UTC (permalink / raw)
To: LKML; +Cc: Ingo Molnar, Andrew Morton, Daniel Bristot de Oliveira, Tom Zanussi
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
If a trigger is set on an event to disable or enable tracing within an
instance, then tracing should be disabled or enabled in the instance and
not at the top level, which is confusing to users.
Cc: stable@vger.kernel.org
Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/trace_events_trigger.c | 52 +++++++++++++++++++++++++----
1 file changed, 46 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index e0d50c9577f3..efe563140f27 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1295,6 +1295,16 @@ traceon_trigger(struct event_trigger_data *data,
struct trace_buffer *buffer, void *rec,
struct ring_buffer_event *event)
{
+ struct trace_event_file *file = data->private_data;
+
+ if (file) {
+ if (tracer_tracing_is_on(file->tr))
+ return;
+
+ tracer_tracing_on(file->tr);
+ return;
+ }
+
if (tracing_is_on())
return;
@@ -1306,8 +1316,15 @@ traceon_count_trigger(struct event_trigger_data *data,
struct trace_buffer *buffer, void *rec,
struct ring_buffer_event *event)
{
- if (tracing_is_on())
- return;
+ struct trace_event_file *file = data->private_data;
+
+ if (file) {
+ if (tracer_tracing_is_on(file->tr))
+ return;
+ } else {
+ if (tracing_is_on())
+ return;
+ }
if (!data->count)
return;
@@ -1315,7 +1332,10 @@ traceon_count_trigger(struct event_trigger_data *data,
if (data->count != -1)
(data->count)--;
- tracing_on();
+ if (file)
+ tracer_tracing_on(file->tr);
+ else
+ tracing_on();
}
static void
@@ -1323,6 +1343,16 @@ traceoff_trigger(struct event_trigger_data *data,
struct trace_buffer *buffer, void *rec,
struct ring_buffer_event *event)
{
+ struct trace_event_file *file = data->private_data;
+
+ if (file) {
+ if (!tracer_tracing_is_on(file->tr))
+ return;
+
+ tracer_tracing_off(file->tr);
+ return;
+ }
+
if (!tracing_is_on())
return;
@@ -1334,8 +1364,15 @@ traceoff_count_trigger(struct event_trigger_data *data,
struct trace_buffer *buffer, void *rec,
struct ring_buffer_event *event)
{
- if (!tracing_is_on())
- return;
+ struct trace_event_file *file = data->private_data;
+
+ if (file) {
+ if (!tracer_tracing_is_on(file->tr))
+ return;
+ } else {
+ if (!tracing_is_on())
+ return;
+ }
if (!data->count)
return;
@@ -1343,7 +1380,10 @@ traceoff_count_trigger(struct event_trigger_data *data,
if (data->count != -1)
(data->count)--;
- tracing_off();
+ if (file)
+ tracer_tracing_off(file->tr);
+ else
+ tracing_off();
}
static int
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] tracing: Have traceon and traceoff trigger honor the instance
2022-02-24 3:38 [PATCH] tracing: Have traceon and traceoff trigger honor the instance Steven Rostedt
@ 2022-02-24 8:54 ` Daniel Bristot de Oliveira
2022-02-25 17:00 ` Tom Zanussi
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Bristot de Oliveira @ 2022-02-24 8:54 UTC (permalink / raw)
To: Steven Rostedt, LKML; +Cc: Ingo Molnar, Andrew Morton, Tom Zanussi
On 2/24/22 04:38, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> If a trigger is set on an event to disable or enable tracing within an
> instance, then tracing should be disabled or enabled in the instance and
> not at the top level, which is confusing to users.
>
> Cc: stable@vger.kernel.org
> Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global variables")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Tested-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Thanks!
-- Daniel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tracing: Have traceon and traceoff trigger honor the instance
2022-02-24 3:38 [PATCH] tracing: Have traceon and traceoff trigger honor the instance Steven Rostedt
2022-02-24 8:54 ` Daniel Bristot de Oliveira
@ 2022-02-25 17:00 ` Tom Zanussi
2022-02-25 17:05 ` Steven Rostedt
1 sibling, 1 reply; 4+ messages in thread
From: Tom Zanussi @ 2022-02-25 17:00 UTC (permalink / raw)
To: Steven Rostedt, LKML
Cc: Ingo Molnar, Andrew Morton, Daniel Bristot de Oliveira
Hi Steve,
On Wed, 2022-02-23 at 22:38 -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
>
> If a trigger is set on an event to disable or enable tracing within
> an
> instance, then tracing should be disabled or enabled in the instance
> and
> not at the top level, which is confusing to users.
>
> Cc: stable@vger.kernel.org
> Fixes: ae63b31e4d0e2 ("tracing: Separate out trace events from global
> variables")
> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
> ---
> kernel/trace/trace_events_trigger.c | 52 +++++++++++++++++++++++++
> ----
> 1 file changed, 46 insertions(+), 6 deletions(-)
>
> diff --git a/kernel/trace/trace_events_trigger.c
> b/kernel/trace/trace_events_trigger.c
> index e0d50c9577f3..efe563140f27 100644
> --- a/kernel/trace/trace_events_trigger.c
> +++ b/kernel/trace/trace_events_trigger.c
> @@ -1295,6 +1295,16 @@ traceon_trigger(struct event_trigger_data
> *data,
> struct trace_buffer *buffer, void *rec,
> struct ring_buffer_event *event)
> {
> + struct trace_event_file *file = data->private_data;
> +
> + if (file) {
> + if (tracer_tracing_is_on(file->tr))
> + return;
> +
> + tracer_tracing_on(file->tr);
> + return;
> + }
> +
> if (tracing_is_on())
> return;
>
> @@ -1306,8 +1316,15 @@ traceon_count_trigger(struct
> event_trigger_data *data,
> struct trace_buffer *buffer, void *rec,
> struct ring_buffer_event *event)
> {
> - if (tracing_is_on())
> - return;
> + struct trace_event_file *file = data->private_data;
> +
> + if (file) {
> + if (tracer_tracing_is_on(file->tr))
> + return;
> + } else {
> + if (tracing_is_on())
> + return;
> + }
>
> if (!data->count)
> return;
> @@ -1315,7 +1332,10 @@ traceon_count_trigger(struct
> event_trigger_data *data,
> if (data->count != -1)
> (data->count)--;
>
> - tracing_on();
> + if (file)
> + tracer_tracing_on(file->tr);
> + else
> + tracing_on();
> }
>
> static void
> @@ -1323,6 +1343,16 @@ traceoff_trigger(struct event_trigger_data
> *data,
> struct trace_buffer *buffer, void *rec,
> struct ring_buffer_event *event)
> {
> + struct trace_event_file *file = data->private_data;
> +
> + if (file) {
> + if (!tracer_tracing_is_on(file->tr))
> + return;
> +
> + tracer_tracing_off(file->tr);
> + return;
> + }
> +
> if (!tracing_is_on())
> return;
>
> @@ -1334,8 +1364,15 @@ traceoff_count_trigger(struct
> event_trigger_data *data,
> struct trace_buffer *buffer, void *rec,
> struct ring_buffer_event *event)
> {
> - if (!tracing_is_on())
> - return;
> + struct trace_event_file *file = data->private_data;
> +
> + if (file) {
> + if (!tracer_tracing_is_on(file->tr))
> + return;
> + } else {
> + if (!tracing_is_on())
> + return;
> + }
>
> if (!data->count)
> return;
> @@ -1343,7 +1380,10 @@ traceoff_count_trigger(struct
> event_trigger_data *data,
> if (data->count != -1)
> (data->count)--;
>
> - tracing_off();
> + if (file)
> + tracer_tracing_off(file->tr);
> + else
> + tracing_off();
> }
>
> static int
Looks good,
Reviewed-by: Tom Zanussi <zanussi@kernel.org>
Thanks,
Tom
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tracing: Have traceon and traceoff trigger honor the instance
2022-02-25 17:00 ` Tom Zanussi
@ 2022-02-25 17:05 ` Steven Rostedt
0 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2022-02-25 17:05 UTC (permalink / raw)
To: Tom Zanussi; +Cc: LKML, Ingo Molnar, Andrew Morton, Daniel Bristot de Oliveira
On Fri, 25 Feb 2022 11:00:18 -0600
Tom Zanussi <zanussi@kernel.org> wrote:
> Looks good,
>
> Reviewed-by: Tom Zanussi <zanussi@kernel.org>
Thanks.
Oo, I was just about to send my pull request. It's not too late to add
this tag ;-)
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-25 17:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-24 3:38 [PATCH] tracing: Have traceon and traceoff trigger honor the instance Steven Rostedt
2022-02-24 8:54 ` Daniel Bristot de Oliveira
2022-02-25 17:00 ` Tom Zanussi
2022-02-25 17:05 ` Steven Rostedt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.