From nobody Wed Feb 11 05:40:58 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90BB927B357 for ; Mon, 9 Feb 2026 02:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770603606; cv=none; b=ZwMi0ApGuAuzMaGWOcSZl1Uz9hdEWsW00CW2NfQospcZXCZLUBLwSHp2HZjhbyMJVVSLXsfarTurOzpap8WjlMIGJL3azMEdfBMKP948bta5JGsNYVATAH+WjmXRu/eHpyyeRfKoOYu4Hz+aXGat0vPgJef6oXWhrXN3rcfWCnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770603606; c=relaxed/simple; bh=pFV9tnmcckb4RxVzF95qloyI9IWFNLRdN8Kik0fkAG8=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=hxQa3h+oDjqYWMEQgMrpq6WkZgotVmeYFVpI9yvP7G7ZjpwfC2FuwOt3G5KKyNXCEeT/rdAtPTs3K0flxjk1zIcZY0WkpTipiOLdmoHEIcCq1czz9j1pE/GduBKmklV7jJS4G7E9eXvHhc+StxIeIc8hMHuphpLsKX4u6rnnJBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O+sqx7VI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O+sqx7VI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71413C19424; Mon, 9 Feb 2026 02:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770603606; bh=pFV9tnmcckb4RxVzF95qloyI9IWFNLRdN8Kik0fkAG8=; h=Date:From:To:Cc:Subject:References:From; b=O+sqx7VI+Wp2SH1sCy/BE8/uZxOyNP2OOJyecI35/kPIisGiVaK/1wXtb9dhzZOmL e6/+suD3b6o1ZvitVtjMq4Z87L7Hkc2ubBB+39m/cb4TpWd1ozzSSNZNEnHJFkhOA9 bbDn7psef0kqliune241uAsk9L2J7w5KJNrffbPp6iq7BSlJO9Yl3xSi0pcLkOGxJs EyNVi/ZVLw2UrQEF7J4vCiUwB7D2rGjNJ7kUSfpH3owKVabb8jTPENeY3eOoMs/eGi HPjqDvYM+OkkjTjCul3gBWrMWGqzk78vhu07IBom46No9ktghInoRoUbItcFWOpExb jgZHoPF1FPMmA== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vpGtR-0000000Aa2N-03MB; Sun, 08 Feb 2026 21:20:53 -0500 Message-ID: <20260209022052.868107499@kernel.org> User-Agent: quilt/0.68 Date: Sun, 08 Feb 2026 21:20:31 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Tom Zanussi Subject: [for-next][PATCH 05/20] tracing: Have all triggers expect a file parameter References: <20260209022026.627895421@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Steven Rostedt 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 Acked-by: Masami Hiramatsu (Google) Reviewed-by: Tom Zanussi Link: https://patch.msgid.link/20260206101351.609d8906@gandalf.local.home Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_trigger.c | 62 +++++++++++------------------ 1 file changed, 24 insertions(+), 38 deletions(-) diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_event= s_trigger.c index 06b75bcfc7b8..7fa26327c9c7 100644 --- a/kernel/trace/trace_events_trigger.c +++ b/kernel/trace/trace_events_trigger.c @@ -1347,18 +1347,13 @@ traceon_trigger(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) { - if (tracer_tracing_is_on(file->tr)) - return; - - tracer_tracing_on(file->tr); + if (WARN_ON_ONCE(!file)) return; - } =20 - if (tracing_is_on()) + if (tracer_tracing_is_on(file->tr)) return; =20 - tracing_on(); + tracer_tracing_on(file->tr); } =20 static bool @@ -1368,13 +1363,11 @@ traceon_count_func(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) { - if (tracer_tracing_is_on(file->tr)) - return false; - } else { - if (tracing_is_on()) - return false; - } + if (WARN_ON_ONCE(!file)) + return false; + + if (tracer_tracing_is_on(file->tr)) + return false; =20 if (!data->count) return false; @@ -1392,18 +1385,13 @@ traceoff_trigger(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) { - if (!tracer_tracing_is_on(file->tr)) - return; - - tracer_tracing_off(file->tr); + if (WARN_ON_ONCE(!file)) return; - } =20 - if (!tracing_is_on()) + if (!tracer_tracing_is_on(file->tr)) return; =20 - tracing_off(); + tracer_tracing_off(file->tr); } =20 static bool @@ -1413,13 +1401,11 @@ traceoff_count_func(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) { - if (!tracer_tracing_is_on(file->tr)) - return false; - } else { - if (!tracing_is_on()) - return false; - } + if (WARN_ON_ONCE(!file)) + return false; + + if (!tracer_tracing_is_on(file->tr)) + return false; =20 if (!data->count) return false; @@ -1481,10 +1467,10 @@ snapshot_trigger(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) - tracing_snapshot_instance(file->tr); - else - tracing_snapshot(); + if (WARN_ON_ONCE(!file)) + return; + + tracing_snapshot_instance(file->tr); } =20 static int @@ -1570,10 +1556,10 @@ stacktrace_trigger(struct event_trigger_data *data, { struct trace_event_file *file =3D data->private_data; =20 - if (file) - __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP); - else - trace_dump_stack(STACK_SKIP); + if (WARN_ON_ONCE(!file)) + return; + + __trace_stack(file->tr, tracing_gen_ctx_dec(), STACK_SKIP); } =20 static int --=20 2.51.0