From nobody Wed Feb 11 05:40:59 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 77F862D738E for ; Mon, 9 Feb 2026 02:20:07 +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=1770603607; cv=none; b=J+5+v64IxdGzScZ7LUhPNi2sVohfhcSAg+thpErVKOXV+KyaBi4fcN53wA3ZpyvhYReg6gPQa3sYCplAJiWidiGs3Vj1YU1jk748cy9okiYJnOkL5xFMt2vD2wAB9awS3AU77BgCNDpUk5MhrHlZWfmNExU5hnbA/J2L+6J0H+I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770603607; c=relaxed/simple; bh=dekH0pbbsKuZXJAh6/ik9exOyvu3HaNrCaWGRiCcxt4=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=t4p0WXXMZKVrTGIwE811Crq6HRZ4WCQHVQZWNpHi9QHlRZj16ImD2cogwZf3F7Fg/RkaUC3t3FfV+6QGUmLpJAyj8GKBkDGpktN5xjJdwDuUy9xB/iReGrTiM5V7kqBT47JK5emYa8IytjO04g/p/9xoit8TU/eOpiq1rODhU7A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NsS1cgtz; 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="NsS1cgtz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AE5CC16AAE; Mon, 9 Feb 2026 02:20:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770603607; bh=dekH0pbbsKuZXJAh6/ik9exOyvu3HaNrCaWGRiCcxt4=; h=Date:From:To:Cc:Subject:References:From; b=NsS1cgtzOYd2mq3zuR5bhrgDkGFGFhWH1X5n+q9+T10RtN1yMTrF94v9PrGv5vHvl R4Prz2GV8z0AEjArETLT/Nbv5/nxBGEH87I5ce2qAuW7NaZCkr+no/YkSaNqn5BIut iYTa9dWugqSTIBmMV9VTHf2qDYE86wBqKWJUz1YF79hJTu88uxoGr7nOqYtdOfkFQ8 1hpwycCoPgxdvuy8p/h9eZsVsnPwLoP1IltKhLEHMpkb7k7FlZaFNHOYTN+g88OsBY oi4XB/REIOiyolfeDQywLbzEeZjK1k2tVkOmBMPtOzaU1+/4Vw5JuThkVtoXoh04fE 02vEQD2X0uezQ== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1vpGtR-0000000Aa5M-4BEN; Sun, 08 Feb 2026 21:20:53 -0500 Message-ID: <20260209022053.852007796@kernel.org> User-Agent: quilt/0.68 Date: Sun, 08 Feb 2026 21:20:37 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton Subject: [for-next][PATCH 11/20] tracing: Move ftrace_trace_stack() out of trace.c and into trace.h 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 The file trace.c has become a catchall for most things tracing. Start making it smaller by breaking out various aspects into their own files. Make ftrace_trace_stack() into a static inline that tests if stack tracing is enabled and if so to call __ftrace_trace_stack() to do the stack trace. This keeps the test inlined in the fast paths and only does the function call if stack tracing is enabled. Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Link: https://patch.msgid.link/20260208032449.974218132@kernel.org Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace.c | 45 ++++---------------------------------------- kernel/trace/trace.h | 31 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 41 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 55cd0c774886..a515b5241391 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1032,32 +1032,6 @@ static inline void trace_access_lock_init(void) =20 #endif =20 -#ifdef CONFIG_STACKTRACE -static void __ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned int trace_ctx, - int skip, struct pt_regs *regs); -static inline void ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned int trace_ctx, - int skip, struct pt_regs *regs); - -#else -static inline void __ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned int trace_ctx, - int skip, struct pt_regs *regs) -{ -} -static inline void ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned long trace_ctx, - int skip, struct pt_regs *regs) -{ -} - -#endif - void tracer_tracing_on(struct trace_array *tr) { if (tr->array_buffer.buffer) @@ -2964,10 +2938,10 @@ struct ftrace_stacks { static DEFINE_PER_CPU(struct ftrace_stacks, ftrace_stacks); static DEFINE_PER_CPU(int, ftrace_stack_reserve); =20 -static void __ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned int trace_ctx, - int skip, struct pt_regs *regs) +void __ftrace_trace_stack(struct trace_array *tr, + struct trace_buffer *buffer, + unsigned int trace_ctx, + int skip, struct pt_regs *regs) { struct ring_buffer_event *event; unsigned int size, nr_entries; @@ -3050,17 +3024,6 @@ static void __ftrace_trace_stack(struct trace_array = *tr, trace_clear_recursion(bit); } =20 -static inline void ftrace_trace_stack(struct trace_array *tr, - struct trace_buffer *buffer, - unsigned int trace_ctx, - int skip, struct pt_regs *regs) -{ - if (!(tr->trace_flags & TRACE_ITER(STACKTRACE))) - return; - - __ftrace_trace_stack(tr, buffer, trace_ctx, skip, regs); -} - void __trace_stack(struct trace_array *tr, unsigned int trace_ctx, int skip) { diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index c2beabe96952..605ee23f3262 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -2279,6 +2279,37 @@ static inline void sanitize_event_name(char *name) *name =3D '_'; } =20 +#ifdef CONFIG_STACKTRACE +void __ftrace_trace_stack(struct trace_array *tr, + struct trace_buffer *buffer, + unsigned int trace_ctx, + int skip, struct pt_regs *regs); + +static __always_inline void ftrace_trace_stack(struct trace_array *tr, + struct trace_buffer *buffer, + unsigned int trace_ctx, + int skip, struct pt_regs *regs) +{ + if (!(tr->trace_flags & TRACE_ITER(STACKTRACE))) + return; + + __ftrace_trace_stack(tr, buffer, trace_ctx, skip, regs); +} +#else +static inline void __ftrace_trace_stack(struct trace_array *tr, + struct trace_buffer *buffer, + unsigned int trace_ctx, + int skip, struct pt_regs *regs) +{ +} +static inline void ftrace_trace_stack(struct trace_array *tr, + struct trace_buffer *buffer, + unsigned long trace_ctx, + int skip, struct pt_regs *regs) +{ +} +#endif + /* * This is a generic way to read and write a u64 value from a file in trac= efs. * --=20 2.51.0