Commit c8b039c3 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Have all triggers expect a file parameter 



When the triggers were first created, they may not have had a file
parameter passed to them and things needed to be done generically.

But today, all triggers have a file parameter passed to them. Remove the
generic code and add a "if (WARN_ON_ONCE(!file))" to each trigger.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Reviewed-by: default avatarTom Zanussi <zanussi@kernel.org>
Link: https://patch.msgid.link/20260206101351.609d8906@gandalf.local.home


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2cdfe39d

kernel/trace/trace_events_trigger.c

+24 −38
Original line number Diff line number Diff line
@@ -1347,18 +1347,13 @@ traceon_trigger(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file) {

		if (tracer_tracing_is_on(file->tr))

			return;



		tracer_tracing_on(file->tr);

	if (WARN_ON_ONCE(!file))

		return;

	}



	if (tracing_is_on())

	if (tracer_tracing_is_on(file->tr))

		return;



	tracing_on();

	tracer_tracing_on(file->tr);

}



static bool
@@ -1368,13 +1363,11 @@ traceon_count_func(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file) {

		if (tracer_tracing_is_on(file->tr))

	if (WARN_ON_ONCE(!file))

		return false;

	} else {

		if (tracing_is_on())



	if (tracer_tracing_is_on(file->tr))

		return false;

	}



	if (!data->count)

		return false;
@@ -1392,18 +1385,13 @@ traceoff_trigger(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file) {

		if (!tracer_tracing_is_on(file->tr))

			return;



		tracer_tracing_off(file->tr);

	if (WARN_ON_ONCE(!file))

		return;

	}



	if (!tracing_is_on())

	if (!tracer_tracing_is_on(file->tr))

		return;



	tracing_off();

	tracer_tracing_off(file->tr);

}



static bool
@@ -1413,13 +1401,11 @@ traceoff_count_func(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file) {

		if (!tracer_tracing_is_on(file->tr))

	if (WARN_ON_ONCE(!file))

		return false;

	} else {

		if (!tracing_is_on())



	if (!tracer_tracing_is_on(file->tr))

		return false;

	}



	if (!data->count)

		return false;
@@ -1481,10 +1467,10 @@ snapshot_trigger(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file)

	if (WARN_ON_ONCE(!file))

		return;



	tracing_snapshot_instance(file->tr);

	else

		tracing_snapshot();

}



static int
@@ -1570,10 +1556,10 @@ stacktrace_trigger(struct event_trigger_data *data, 
{

	struct trace_event_file *file = data->private_data;



	if (file)

	if (WARN_ON_ONCE(!file))

		return;



	__trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP);

	else

		trace_dump_stack(STACK_SKIP);

}



static int