Commit 302e9edd authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google)
Browse files

tracing: Have traceon and traceoff trigger honor the instance 

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.

Link: https://lkml.kernel.org/r/20220223223837.14f94ec3@rorschach.local.home



Cc: stable@vger.kernel.org
Fixes: ae63b31e ("tracing: Separate out trace events from global variables")
Tested-by: default avatarDaniel Bristot de Oliveira <bristot@kernel.org>
Reviewed-by: default avatarTom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent ce33c845

kernel/trace/trace_events_trigger.c

+46 −6
Original line number Diff line number Diff line
@@ -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)

{

	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,6 +1332,9 @@ traceon_count_trigger(struct event_trigger_data *data, 
	if (data->count != -1)

		(data->count)--;



	if (file)

		tracer_tracing_on(file->tr);

	else

		tracing_on();

}
@@ -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)

{

	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,6 +1380,9 @@ traceoff_count_trigger(struct event_trigger_data *data, 
	if (data->count != -1)

		(data->count)--;



	if (file)

		tracer_tracing_off(file->tr);

	else

		tracing_off();

}