From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Florent Revest <revest@chromium.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
bpf <bpf@vger.kernel.org>, Sven Schnelle <svens@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Alan Maguire <alan.maguire@oracle.com>,
Thomas Gleixner <tglx@linutronix.de>, Guo Ren <guoren@kernel.org>,
Peter Zijlstra <peterz@infradead.org>
Subject: [for-next][PATCH 02/27] fgraph: Use BUILD_BUG_ON() to make sure we have structures divisible by long
Date: Tue, 04 Jun 2024 10:41:05 -0400 [thread overview]
Message-ID: <20240604144214.299594261@goodmis.org> (raw)
In-Reply-To: 20240604144103.293353991@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Instead of using "ALIGN()", use BUILD_BUG_ON() as the structures should
always be divisible by sizeof(long).
Co-developed with Masami Hiramatsu:
Link: https://lore.kernel.org/linux-trace-kernel/171509093949.162236.14518699447151894536.stgit@devnote2
Link: http://lkml.kernel.org/r/20190524111144.GI2589@hirez.programming.kicks-ass.net
Link: https://lore.kernel.org/linux-trace-kernel/20240603190821.232168933@goodmis.org
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Florent Revest <revest@chromium.org>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: bpf <bpf@vger.kernel.org>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Alan Maguire <alan.maguire@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Guo Ren <guoren@kernel.org>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/fgraph.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index c62e6db718a0..fdb206aeffe3 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -33,7 +33,7 @@
* SHADOW_STACK_MAX_OFFSET: The max offset of the stack for a new frame to be added
*/
#define FGRAPH_FRAME_SIZE sizeof(struct ftrace_ret_stack)
-#define FGRAPH_FRAME_OFFSET (ALIGN(FGRAPH_FRAME_SIZE, sizeof(long)) / sizeof(long))
+#define FGRAPH_FRAME_OFFSET DIV_ROUND_UP(FGRAPH_FRAME_SIZE, sizeof(long))
#define SHADOW_STACK_SIZE (PAGE_SIZE)
#define SHADOW_STACK_OFFSET \
(ALIGN(SHADOW_STACK_SIZE, sizeof(long)) / sizeof(long))
@@ -103,6 +103,8 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func,
if (!current->ret_stack)
return -EBUSY;
+ BUILD_BUG_ON(SHADOW_STACK_SIZE % sizeof(long));
+
/*
* We must make sure the ret_stack is tested before we read
* anything else.
@@ -326,6 +328,8 @@ ftrace_graph_get_ret_stack(struct task_struct *task, int idx)
{
int index = task->curr_ret_stack;
+ BUILD_BUG_ON(FGRAPH_FRAME_SIZE % sizeof(long));
+
index -= FGRAPH_FRAME_OFFSET * (idx + 1);
if (index < 0)
return NULL;
--
2.43.0
next prev parent reply other threads:[~2024-06-04 14:42 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-04 14:41 [for-next][PATCH 00/27] function_graph: Allow multiple users for v6.11 Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 01/27] function_graph: Convert ret_stack to a series of longs Steven Rostedt
2024-06-04 14:41 ` Steven Rostedt [this message]
2024-06-04 14:41 ` [for-next][PATCH 03/27] function_graph: Add an array structure that will allow multiple callbacks Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 04/27] function_graph: Allow multiple users to attach to function graph Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 05/27] function_graph: Handle tail calls for stack unwinding Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 06/27] function_graph: Remove logic around ftrace_graph_entry and return Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 07/27] ftrace/function_graph: Pass fgraph_ops to function graph callbacks Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 08/27] ftrace: Allow function_graph tracer to be enabled in instances Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 09/27] ftrace: Allow ftrace startup flags to exist without dynamic ftrace Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 10/27] ftrace: Add subops logic to allow one ops to manage many Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 11/27] ftrace: Allow subops filtering to be modified Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 12/27] function_graph: Have the instances use their own ftrace_ops for filtering Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 13/27] function_graph: Add pid tracing back to function graph tracer Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 14/27] function_graph: Use a simple LRU for fgraph_array index number Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 15/27] function_graph: Add "task variables" per task for fgraph_ops Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 16/27] function_graph: Move set_graph_function tests to shadow stack global var Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 17/27] function_graph: Move graph depth stored data " Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 18/27] function_graph: Move graph notrace bit " Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 19/27] function_graph: Implement fgraph_reserve_data() and fgraph_retrieve_data() Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 20/27] function_graph: Add selftest for passing local variables Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 21/27] ftrace: Add multiple fgraph storage selftest Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 22/27] function_graph: Use for_each_set_bit() in __ftrace_return_to_handler() Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 23/27] function_graph: Use bitmask to loop on fgraph entry Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 24/27] function_graph: Use static_call and branch to optimize entry function Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 25/27] function_graph: Use static_call and branch to optimize return function Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 26/27] selftests/ftrace: Add function_graph tracer to func-filter-pid test Steven Rostedt
2024-06-04 14:41 ` [for-next][PATCH 27/27] selftests/ftrace: Add fgraph-multi.tc test Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240604144214.299594261@goodmis.org \
--to=rostedt@goodmis.org \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=alan.maguire@oracle.com \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=guoren@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martin.lau@linux.dev \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=peterz@infradead.org \
--cc=revest@chromium.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.