e5ae9b5a65
commit 8be9fbd5345da52f4a74f7f81d55ff9fa0a2958e upstream. Setting filters on an ftrace ops results in some memory being allocated for the filter hashes, which must be freed before the ops can be freed. This can be done by removing every individual element of the hash by calling ftrace_set_filter_ip() or ftrace_set_filter_ips() with `remove` set, but this is somewhat error prone as it's easy to forget to remove an element. Make it easier to clean this up by exporting ftrace_free_filter(), which can be used to clean up all of the filter hashes after an ftrace_ops has been unregistered. Using this, fix the ftrace-direct* samples to free hashes prior to being unloaded. All other code either removes individual filters explicitly or is built-in and already calls ftrace_free_filter(). Link: https://lkml.kernel.org/r/20230103124912.2948963-3-mark.rutland@arm.com Cc: stable@vger.kernel.org Cc: Florent Revest <revest@chromium.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Fixes:e1067a07cf("ftrace/samples: Add module to test multi direct modify interface") Fixes:5fae941b9a("ftrace/samples: Add multi direct interface test module") Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
161 lines
4.1 KiB
C
161 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include <linux/module.h>
|
|
#include <linux/kthread.h>
|
|
#include <linux/ftrace.h>
|
|
#include <asm/asm-offsets.h>
|
|
|
|
extern void my_direct_func1(unsigned long ip);
|
|
extern void my_direct_func2(unsigned long ip);
|
|
|
|
void my_direct_func1(unsigned long ip)
|
|
{
|
|
trace_printk("my direct func1 ip %lx\n", ip);
|
|
}
|
|
|
|
void my_direct_func2(unsigned long ip)
|
|
{
|
|
trace_printk("my direct func2 ip %lx\n", ip);
|
|
}
|
|
|
|
extern void my_tramp1(void *);
|
|
extern void my_tramp2(void *);
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
#include <asm/ibt.h>
|
|
|
|
asm (
|
|
" .pushsection .text, \"ax\", @progbits\n"
|
|
" .type my_tramp1, @function\n"
|
|
" .globl my_tramp1\n"
|
|
" my_tramp1:"
|
|
ASM_ENDBR
|
|
" pushq %rbp\n"
|
|
" movq %rsp, %rbp\n"
|
|
" pushq %rdi\n"
|
|
" movq 8(%rbp), %rdi\n"
|
|
" call my_direct_func1\n"
|
|
" popq %rdi\n"
|
|
" leave\n"
|
|
ASM_RET
|
|
" .size my_tramp1, .-my_tramp1\n"
|
|
|
|
" .type my_tramp2, @function\n"
|
|
" .globl my_tramp2\n"
|
|
" my_tramp2:"
|
|
ASM_ENDBR
|
|
" pushq %rbp\n"
|
|
" movq %rsp, %rbp\n"
|
|
" pushq %rdi\n"
|
|
" movq 8(%rbp), %rdi\n"
|
|
" call my_direct_func2\n"
|
|
" popq %rdi\n"
|
|
" leave\n"
|
|
ASM_RET
|
|
" .size my_tramp2, .-my_tramp2\n"
|
|
" .popsection\n"
|
|
);
|
|
|
|
#endif /* CONFIG_X86_64 */
|
|
|
|
#ifdef CONFIG_S390
|
|
|
|
asm (
|
|
" .pushsection .text, \"ax\", @progbits\n"
|
|
" .type my_tramp1, @function\n"
|
|
" .globl my_tramp1\n"
|
|
" my_tramp1:"
|
|
" lgr %r1,%r15\n"
|
|
" stmg %r0,%r5,"__stringify(__SF_GPRS)"(%r15)\n"
|
|
" stg %r14,"__stringify(__SF_GPRS+8*8)"(%r15)\n"
|
|
" aghi %r15,"__stringify(-STACK_FRAME_OVERHEAD)"\n"
|
|
" stg %r1,"__stringify(__SF_BACKCHAIN)"(%r15)\n"
|
|
" lgr %r2,%r0\n"
|
|
" brasl %r14,my_direct_func1\n"
|
|
" aghi %r15,"__stringify(STACK_FRAME_OVERHEAD)"\n"
|
|
" lmg %r0,%r5,"__stringify(__SF_GPRS)"(%r15)\n"
|
|
" lg %r14,"__stringify(__SF_GPRS+8*8)"(%r15)\n"
|
|
" lgr %r1,%r0\n"
|
|
" br %r1\n"
|
|
" .size my_tramp1, .-my_tramp1\n"
|
|
"\n"
|
|
" .type my_tramp2, @function\n"
|
|
" .globl my_tramp2\n"
|
|
" my_tramp2:"
|
|
" lgr %r1,%r15\n"
|
|
" stmg %r0,%r5,"__stringify(__SF_GPRS)"(%r15)\n"
|
|
" stg %r14,"__stringify(__SF_GPRS+8*8)"(%r15)\n"
|
|
" aghi %r15,"__stringify(-STACK_FRAME_OVERHEAD)"\n"
|
|
" stg %r1,"__stringify(__SF_BACKCHAIN)"(%r15)\n"
|
|
" lgr %r2,%r0\n"
|
|
" brasl %r14,my_direct_func2\n"
|
|
" aghi %r15,"__stringify(STACK_FRAME_OVERHEAD)"\n"
|
|
" lmg %r0,%r5,"__stringify(__SF_GPRS)"(%r15)\n"
|
|
" lg %r14,"__stringify(__SF_GPRS+8*8)"(%r15)\n"
|
|
" lgr %r1,%r0\n"
|
|
" br %r1\n"
|
|
" .size my_tramp2, .-my_tramp2\n"
|
|
" .popsection\n"
|
|
);
|
|
|
|
#endif /* CONFIG_S390 */
|
|
|
|
static unsigned long my_tramp = (unsigned long)my_tramp1;
|
|
static unsigned long tramps[2] = {
|
|
(unsigned long)my_tramp1,
|
|
(unsigned long)my_tramp2,
|
|
};
|
|
|
|
static struct ftrace_ops direct;
|
|
|
|
static int simple_thread(void *arg)
|
|
{
|
|
static int t;
|
|
int ret = 0;
|
|
|
|
while (!kthread_should_stop()) {
|
|
set_current_state(TASK_INTERRUPTIBLE);
|
|
schedule_timeout(2 * HZ);
|
|
|
|
if (ret)
|
|
continue;
|
|
t ^= 1;
|
|
ret = modify_ftrace_direct_multi(&direct, tramps[t]);
|
|
if (!ret)
|
|
my_tramp = tramps[t];
|
|
WARN_ON_ONCE(ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct task_struct *simple_tsk;
|
|
|
|
static int __init ftrace_direct_multi_init(void)
|
|
{
|
|
int ret;
|
|
|
|
ftrace_set_filter_ip(&direct, (unsigned long) wake_up_process, 0, 0);
|
|
ftrace_set_filter_ip(&direct, (unsigned long) schedule, 0, 0);
|
|
|
|
ret = register_ftrace_direct_multi(&direct, my_tramp);
|
|
|
|
if (!ret)
|
|
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
|
|
return ret;
|
|
}
|
|
|
|
static void __exit ftrace_direct_multi_exit(void)
|
|
{
|
|
kthread_stop(simple_tsk);
|
|
unregister_ftrace_direct_multi(&direct, my_tramp);
|
|
ftrace_free_filter(&direct);
|
|
}
|
|
|
|
module_init(ftrace_direct_multi_init);
|
|
module_exit(ftrace_direct_multi_exit);
|
|
|
|
MODULE_AUTHOR("Jiri Olsa");
|
|
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct_multi()");
|
|
MODULE_LICENSE("GPL");
|