ftrace: Fixes for v6.13
Subsystems (3)
Steven Rostedt
maintainercover ftrace: Fixes for v6.13
Fixes for ftrace in v6.13:
- Add needed READ_ONCE() around access to the fgraph array element
The updates to the fgraph array can happen when callbacks are registered and unregistered. The __ftrace_return_to_handler() can handle reading either the old value or the new value. But once it reads that value it must stay consistent otherwise the check that looks to see if the value is a stub may show false, but if the compiler decides to re-read after that check, it can be true which can cause the code to crash later on.
- Make function profiler use the top level ops for filtering again
When function graph became available for instances, its filter ops became independent from the top level set_ftrace_filter. In the process the function profiler received its own filter ops as well. But the function profiler uses the top level set_ftrace_filter file and does not have one of its own. In giving it its own filter ops, it lost any user interface it once had. Make it use the top level set_ftrace_filter file again. This fixes a regression.
Steven Rostedt
maintainerPATCH 1/2 fgraph: Add READ_ONCE() when accessing fgraph_array[]
From: Zilin Guan <[email protected]>
In __ftrace_return_to_handler(), a loop iterates over the fgraph_array[] elements, which are fgraph_ops. The loop checks if an element is a fgraph_stub to prevent using a fgraph_stub afterward.
However, if the compiler reloads fgraph_array[] after this check, it might race with an update to fgraph_array[] that introduces a fgraph_stub. This could result in the stub being processed, but the stub contains a null "func_hash" field, leading to a NULL pointer dereference.
To ensure that the gops compared against the fgraph_stub matches the gops processed later, add a READ_ONCE(). A similar patch appears in commit 63a8dfb ("function_graph: Add READ_ONCE() when accessing fgraph_array[]").
--- kernel/trace/fgraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/fgraph.c +1 -1
@@ -833,7 +833,7 @@ static unsigned long __ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs#endif {for_each_set_bit (i, &bitmap,sizeof (bitmap) *BITS_PER_BYTE ) { -struct fgraph_ops *gops = fgraph_array[i]; +struct fgraph_ops *gops =READ_ONCE (fgraph_array[i]);if (gops == &fgraph_stub)continue ;
Signature · 1 line
2.45.2
kernel test robot
build botRe: [for-linus][PATCH 1/2] fgraph: Add READ_ONCE() when accessing fgraph_array[]
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [for-linus][PATCH 1/2] fgraph: Add READ_ONCE() when accessing fgraph_array[]
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Steven Rostedt
maintainerRe: [for-linus][PATCH 1/2] fgraph: Add READ_ONCE() when accessing fgraph_array[]
Quoted 4 lines · On Fri, 3 Jan 2025 06:04:27 +0800 kernel test robot <[email protected]> wrote:
Hi,
Thanks for your patch.
Quoted 8 lines
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [for-linus][PATCH 1/2] fgraph: AddREAD_ONCE()when accessing fgraph_array[]
I noticed that it has "Cc:[email protected]". I guess it needs a space before "stable"?
-- Steve
Re: [for-linus][PATCH 1/2] fgraph: Add READ_ONCE() when accessing fgraph_array[]
Quoted 11 lines · Steven Rostedt
Quoted 8 lines · On Fri, 3 Jan 2025 06:04:27 +0800 kernel test robot <[email protected]> wrote:
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Quoted 7 lines
Quoted 4 lines
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [for-linus][PATCH 1/2] fgraph: AddREAD_ONCE()when accessing fgraph_array[]I noticed that it has "Cc:[email protected]". I guess it needs a space before "stable"?
Hi Steve, yes, the check logic expects there's a space before stable.
Quoted 3 lines
-- Steve
Steven Rostedt
maintainerPATCH 2/2 ftrace: Fix function profilers filtering functionality
In reply to Steven RostedtFrom: Kohei Enju <[email protected]>
Commit c132be2c4fcc ("function_graph: Have the instances use their own ftrace_ops for filtering"), function profiler (enabled via function_profile_enabled) has been showing statistics for all functions, ignoring set_ftrace_filter settings.
While tracers are instantiated, the function profiler is not. Therefore, it should use the global set_ftrace_filter for consistency. This patch modifies the function profiler to use the global filter, fixing the filtering functionality.
Before (filtering not working):
```
root@localhost:~# echo 'vfs*' > /sys/kernel/tracing/set_ftrace_filter
root@localhost:~# echo 1 > /sys/kernel/tracing/function_profile_enabled
root@localhost:~# sleep 1
root@localhost:~# echo 0 > /sys/kernel/tracing/function_profile_enabled
root@localhost:~# head /sys/kernel/tracing/trace_stat/*
Function Hit Time Avg
s^2
-------- --- ---- ---
---
schedule 314 22290594 us 70989.15 us
40372231 us
x64_sys_call 1527 8762510 us 5738.382 us
3414354 us
schedule_hrtimeout_range 176 8665356 us 49234.98 us
405618876 us
__x64_sys_ppoll 324 5656635 us 17458.75 us
19203976 us
do_sys_poll 324 5653747 us 17449.83 us
19214945 us
schedule_timeout 67 5531396 us 82558.15 us
2136740827 us
__x64_sys_pselect6 12 3029540 us 252461.7 us
63296940171 us
do_pselect.constprop.0 12 3029532 us 252461.0 us
63296952931 us
```After (filtering working):
```
root@localhost:~# echo 'vfs*' > /sys/kernel/tracing/set_ftrace_filter
root@localhost:~# echo 1 > /sys/kernel/tracing/function_profile_enabled
root@localhost:~# sleep 1
root@localhost:~# echo 0 > /sys/kernel/tracing/function_profile_enabled
root@localhost:~# head /sys/kernel/tracing/trace_stat/*
Function Hit Time Avg
s^2
-------- --- ---- ---
---
vfs_write 462 68476.43 us 148.217 us
25874.48 us
vfs_read 641 9611.356 us 14.994 us
28868.07 us
vfs_fstat 890 878.094 us 0.986 us
1.667 us
vfs_fstatat 227 757.176 us 3.335 us
18.928 us
vfs_statx 226 610.610 us 2.701 us
17.749 us
vfs_getattr_nosec 1187 460.919 us 0.388 us
0.326 us
vfs_statx_path 297 343.287 us 1.155 us
11.116 us
vfs_rename 6 291.575 us 48.595 us
9889.236 us
```--- kernel/trace/ftrace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
kernel/trace/ftrace.c +2 -6
@@ -902,16 +902,13 @@ static void profile_graph_return(struct ftrace_graph_ret *trace, }static struct fgraph_ops fprofiler_ops = { - .ops = { - .flags =FTRACE_OPS_FL_INITIALIZED , -INIT_OPS_HASH (fprofiler_ops.ops) - }, .entryfunc = &profile_graph_entry, .retfunc = &profile_graph_return, };static int register_ftrace_profiler (void ) { +ftrace_ops_set_global_filter (&fprofiler_ops.ops);return register_ftrace_graph (&fprofiler_ops); }
@@ -922,12 +919,11 @@ static void unregister_ftrace_profiler(void)#else static struct ftrace_ops ftrace_profile_ops__read_mostly = { .func = function_profile_call, - .flags =FTRACE_OPS_FL_INITIALIZED , -INIT_OPS_HASH (ftrace_profile_ops) };static int register_ftrace_profiler (void ) { +ftrace_ops_set_global_filter (&ftrace_profile_ops);return register_ftrace_function (&ftrace_profile_ops); }
Signature · 1 line
2.45.2