Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ftrace: Replace uses of _ftrace_direct APIs with _ftrace_direct_multi

Browse Source 
The _multi API requires that users keep their own ops but can enforce
that an op is only associated to one direct call.

Link: https://lkml.kernel.org/r/20230321140424.345218-3-revest@chromium.org

Signed-off-by: Florent Revest <revest@chromium.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
This commit is contained in:
Florent Revest 2023-03-21 15:04:19 +01:00 committed by Steven Rostedt (Google)
parent 59495740f7
commit 23edf48309
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/trace/trace_selftest.c
View File

@ -785,6 +785,7 @@ static struct fgraph_ops fgraph_ops __initdata = {
}; };
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
static struct ftrace_ops direct;
#ifndef CALL_DEPTH_ACCOUNT #ifndef CALL_DEPTH_ACCOUNT
#define CALL_DEPTH_ACCOUNT "" #define CALL_DEPTH_ACCOUNT ""
#endif #endif
@ -870,8 +871,8 @@ trace_selftest_startup_function_graph(struct tracer *trace,
* Register direct function together with graph tracer * Register direct function together with graph tracer
* and make sure we get graph trace. * and make sure we get graph trace.
*/ */
ret = register_ftrace_direct((unsigned long) DYN_FTRACE_TEST_NAME, ftrace_set_filter_ip(&direct, (unsigned long)DYN_FTRACE_TEST_NAME, 0, 0);
(unsigned long) trace_direct_tramp); ret = register_ftrace_direct_multi(&direct, (unsigned long)trace_direct_tramp);
if (ret) if (ret)
goto out; goto out;
@ -891,8 +892,9 @@ trace_selftest_startup_function_graph(struct tracer *trace,
unregister_ftrace_graph(&fgraph_ops); unregister_ftrace_graph(&fgraph_ops);
ret = unregister_ftrace_direct((unsigned long) DYN_FTRACE_TEST_NAME, ret = unregister_ftrace_direct_multi(&direct,
(unsigned long) trace_direct_tramp); (unsigned long) trace_direct_tramp,
true);
if (ret) if (ret)
goto out; goto out;

12
samples/ftrace/ftrace-direct-modify.c
View File

@ -96,6 +96,8 @@ asm (
#endif /* CONFIG_S390 */ #endif /* CONFIG_S390 */
static struct ftrace_ops direct;
static unsigned long my_tramp = (unsigned long)my_tramp1; static unsigned long my_tramp = (unsigned long)my_tramp1;
static unsigned long tramps[2] = { static unsigned long tramps[2] = {
(unsigned long)my_tramp1, (unsigned long)my_tramp1,
@ -114,7 +116,7 @@ static int simple_thread(void *arg)
if (ret) if (ret)
continue; continue;
t ^= 1; t ^= 1;
ret = modify_ftrace_direct(my_ip, my_tramp, tramps[t]); ret = modify_ftrace_direct_multi(&direct, tramps[t]);
if (!ret) if (!ret)
my_tramp = tramps[t]; my_tramp = tramps[t];
WARN_ON_ONCE(ret); WARN_ON_ONCE(ret);
@ -129,7 +131,9 @@ static int __init ftrace_direct_init(void)
{ {
int ret; int ret;
ret = register_ftrace_direct(my_ip, my_tramp); ftrace_set_filter_ip(&direct, (unsigned long) my_ip, 0, 0);
ret = register_ftrace_direct_multi(&direct, my_tramp);
if (!ret) if (!ret)
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn"); simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
return ret; return ret;
@ -138,12 +142,12 @@ static int __init ftrace_direct_init(void)
static void __exit ftrace_direct_exit(void) static void __exit ftrace_direct_exit(void)
{ {
kthread_stop(simple_tsk); kthread_stop(simple_tsk);
unregister_ftrace_direct(my_ip, my_tramp); unregister_ftrace_direct_multi(&direct, my_tramp, true);
} }
module_init(ftrace_direct_init); module_init(ftrace_direct_init);
module_exit(ftrace_direct_exit); module_exit(ftrace_direct_exit);
MODULE_AUTHOR("Steven Rostedt"); MODULE_AUTHOR("Steven Rostedt");
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct()"); MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct_multi()");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

12
samples/ftrace/ftrace-direct-too.c
View File

@ -70,21 +70,23 @@ asm (
#endif /* CONFIG_S390 */ #endif /* CONFIG_S390 */
static struct ftrace_ops direct;
static int __init ftrace_direct_init(void) static int __init ftrace_direct_init(void)
{ {
return register_ftrace_direct((unsigned long)handle_mm_fault, ftrace_set_filter_ip(&direct, (unsigned long) handle_mm_fault, 0, 0);
(unsigned long)my_tramp);
return register_ftrace_direct_multi(&direct, (unsigned long) my_tramp);
} }
static void __exit ftrace_direct_exit(void) static void __exit ftrace_direct_exit(void)
{ {
unregister_ftrace_direct((unsigned long)handle_mm_fault, unregister_ftrace_direct_multi(&direct, (unsigned long)my_tramp, true);
(unsigned long)my_tramp);
} }
module_init(ftrace_direct_init); module_init(ftrace_direct_init);
module_exit(ftrace_direct_exit); module_exit(ftrace_direct_exit);
MODULE_AUTHOR("Steven Rostedt"); MODULE_AUTHOR("Steven Rostedt");
MODULE_DESCRIPTION("Another example use case of using register_ftrace_direct()"); MODULE_DESCRIPTION("Another example use case of using register_ftrace_direct_multi()");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

12
samples/ftrace/ftrace-direct.c
View File

@ -63,21 +63,23 @@ asm (
#endif /* CONFIG_S390 */ #endif /* CONFIG_S390 */
static struct ftrace_ops direct;
static int __init ftrace_direct_init(void) static int __init ftrace_direct_init(void)
{ {
return register_ftrace_direct((unsigned long)wake_up_process, ftrace_set_filter_ip(&direct, (unsigned long) wake_up_process, 0, 0);
(unsigned long)my_tramp);
return register_ftrace_direct_multi(&direct, (unsigned long) my_tramp);
} }
static void __exit ftrace_direct_exit(void) static void __exit ftrace_direct_exit(void)
{ {
unregister_ftrace_direct((unsigned long)wake_up_process, unregister_ftrace_direct_multi(&direct, (unsigned long)my_tramp, true);
(unsigned long)my_tramp);
} }
module_init(ftrace_direct_init); module_init(ftrace_direct_init);
module_exit(ftrace_direct_exit); module_exit(ftrace_direct_exit);
MODULE_AUTHOR("Steven Rostedt"); MODULE_AUTHOR("Steven Rostedt");
MODULE_DESCRIPTION("Example use case of using register_ftrace_direct()"); MODULE_DESCRIPTION("Example use case of using register_ftrace_direct_multi()");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");