[PATCH] fgraph: Read the task->ret_stack with a smp_load_acquire()

From: Steven Rostedt

Date: Tue Nov 17 2026 - 19:30:44 EST


From: Steven Rostedt <rostedt@xxxxxxxxxxx>

The setting of task->ret_stack was switched from a smp_wmb() and the
update to the variable with a smp_store_release(). Match the reading of
the task->ret_stack with a smp_load_acquire() to replace the read and
smp_rmb().

Link: https://lore.kernel.org/all/20261021174406.2891598-2-vineet.gupta@xxxxxxxxx/

Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
kernel/trace/fgraph.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index bbf6e4e2da2d..1383cc3db1b1 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -568,7 +568,11 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func,
if (unlikely(ftrace_graph_is_dead()))
return -EBUSY;

- if (!current->ret_stack)
+ /*
+ * We must make sure the ret_stack is tested before we read
+ * anything else (See alloc_retstack_tasklist()).
+ */
+ if (!smp_load_acquire(&current->ret_stack))
return -EBUSY;

BUILD_BUG_ON(SHADOW_STACK_SIZE % sizeof(long));
@@ -576,12 +580,6 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func,
/* Set val to "reserved" with the delta to the new fgraph frame */
val = (FGRAPH_TYPE_RESERVED << FGRAPH_TYPE_SHIFT) | FGRAPH_FRAME_OFFSET;

- /*
- * We must make sure the ret_stack is tested before we read
- * anything else.
- */
- smp_rmb();
-
/*
* Check if there's room on the shadow stack to fit a fraph frame
* and a bitmap word.
--
2.53.0