| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAJF2gTT9vAgk5O456LrSc8VwwDybguoQdh_ruVzknASqks6ZhQ@mail.gmail.com>
Date: Mon, 28 Nov 2022 20:54:17 +0800
From: Guo Ren <guoren@...nel.org>
To: Song Shuai <suagrfillet@...il.com>
Cc: paul.walmsley@...ive.com, palmer@...belt.com,
aou@...s.berkeley.edu, rostedt@...dmis.org, mhiramat@...nel.org,
mark.rutland@....com, peterz@...radead.org, jolsa@...hat.com,
bp@...e.de, jpoimboe@...nel.org, linux-riscv@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] riscv/ftrace: add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support
On Mon, Nov 28, 2022 at 6:17 PM Guo Ren <guoren@...nel.org> wrote:
>
> On Fri, Nov 25, 2022 at 2:33 PM Song Shuai <suagrfillet@...il.com> wrote:
> >
> > Guo Ren <guoren@...nel.org> 于2022年11月25日周五 03:10写道：
> > >
> > > On Fri, Nov 25, 2022 at 9:53 AM Song Shuai <suagrfillet@...il.com> wrote:
> > > >
> > > > Guo Ren <guoren@...nel.org> 于2022年11月24日周四 15:31写道：
> > > > >
> > > > > On Thu, Nov 24, 2022 at 1:27 AM Song Shuai <suagrfillet@...il.com> wrote:
> > > > > >
> > > > > > Guo Ren <guoren@...nel.org> 于2022年11月23日周三 23:02写道：
> > > > > > >
> > > > > > > Cool job, thx.
> > > > > > >
> > > > > > > On Wed, Nov 23, 2022 at 10:20 PM Song Shuai <suagrfillet@...il.com> wrote:
> > > > > > >>
> > > > > > >> This patch adds DYNAMIC_FTRACE_WITH_DIRECT_CALLS support for RISC-V.
> > > > > > >>
> > > > > > >> select the DYNAMIC_FTRACE_WITH_DIRECT_CALLS to provide the
> > > > > > >> register_ftrace_direct[_multi] interfaces allowing users to register
> > > > > > >> the customed trampoline (direct_caller) as the mcount for one or
> > > > > > >> more target functions. And modify_ftrace_direct[_multi] are also
> > > > > > >> provided for modifying direct_caller.
> > > > > > >>
> > > > > > >> To make the direct_caller and the other ftrace hooks (eg. function/fgraph
> > > > > > >> tracer, k[ret]probes) co-exist, a temporary register is nominated to
> > > > > > >> store the address of direct_caller in ftrace_regs_caller. After the
> > > > > > >> setting of the address direct_caller by direct_ops->func and the
> > > > > > >> RESTORE_REGS in ftrace_regs_caller, direct_caller will be jumped to
> > > > > > >> by the `jr` inst.
> > > > > > >>
> > > > > > >> Signed-off-by: Song Shuai <suagrfillet@...il.com>
> > > > > > >> ---
> > > > > > >> arch/riscv/Kconfig | 1 +
> > > > > > >> arch/riscv/include/asm/ftrace.h | 6 ++++++
> > > > > > >> arch/riscv/kernel/mcount-dyn.S | 4 ++++
> > > > > > >> 3 files changed, 11 insertions(+)
> > > > > > >>
> > > > > > >> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > > > > > >> index 39ec8d628cf6..d083ec08d0b6 100644
> > > > > > >> --- a/arch/riscv/Kconfig
> > > > > > >> +++ b/arch/riscv/Kconfig
> > > > > > >> @@ -278,6 +278,7 @@ config ARCH_RV64I
> > > > > > >> select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
> > > > > > >> select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchable-function-entry=8)
> > > > > > >> select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE
> > > > > > >> + select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
> > > > > > >> select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
> > > > > > >> select HAVE_FUNCTION_GRAPH_TRACER
> > > > > > >> select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION
> > > > > > >> diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrace.h
> > > > > > >> index 01bebb28eabe..be4d57566139 100644
> > > > > > >> --- a/arch/riscv/include/asm/ftrace.h
> > > > > > >> +++ b/arch/riscv/include/asm/ftrace.h
> > > > > > >> @@ -114,6 +114,12 @@ struct ftrace_regs;
> > > > > > >> void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
> > > > > > >> struct ftrace_ops *op, struct ftrace_regs *fregs);
> > > > > > >> #define ftrace_graph_func ftrace_graph_func
> > > > > > >> +
> > > > > > >> +static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs, unsigned long addr)
> > > > > > >> +{
> > > > > > >> + regs->t1 = addr;
> > > > > > >
> > > > > > > How about regs->t0 = addr; ?
> > > > > > > And delete all mcount-dyn.S modification.
> > > > > > >
> > > > > > The direct_caller has the same program layout as the ftrace_caller, which means
> > > > > > the reg t0 will never be changed when direct_caller returns.
> > > > > >
> > > > > > If regs->t0 changes here and ftrace_regs_caller executes `jr t0`,
> > > > > > direct_caller will enter the dead loop.
> > > > > >
> > > > > > Actually the reg t0 always saves the address of function entry with 8B
> > > > > > offset, it should only
> > > > > > changed by the IPMODIFY ops instead of the direct_ops.
> > > > > How about:
> > > > > static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs,
> > > > > unsigned long addr)
> > > > > {
> > > > > regs->t1 = regs->t0;
> > > > > regs->t0 = addr;
> > > > >
> > > > > direct_caller:
> > > > > add sp,sp,-?
> > > > > sd t1,?(sp)
> > > > direct_caller also serves as the first trampoline as ftrace_caller, like this:
> > > > ```
> > > > func -- direct_caller
> > > > -- ftrace_[regs]_caller
> > > > ```
> > > > So the t1 in this line has to be t0 to save the PC.
> > >
> > > direct_caller:
> > > add sp,sp,-?
> > > sd t1,?(sp)
> > > sd t0, ?(so)
> > > sd ra,?(sp)
> > > mov t0, t1
> > This foo is the tracing function along with the direct_caller,
> > and it has the same parameters as the target function.
> > So the t0 or t1 here means nothing for this foo function.
> >
> > No offense, but what's the purpose of this mv inst?
> Here is my modification: [1]
> [1]: https://lore.kernel.org/linux-riscv/20221128101201.4144527-1-guoren@kernel.org/
>
> I've tested like this:
> mount -t debugfs none /sys/kernel/debug/
> cd /sys/kernel/debug/tracing/
> echo handle_mm_fault > set_ftrace_filter
> echo 'r:myr handle_mm_fault' > kprobe_events
> echo function > current_tracer
> echo 1 > events/kprobes/myr/enable
> insmod /root/ftrace/ftrace-direct-too.ko
> cat trace
>
> cat-137 [000] ..... 3132.231948: handle_mm_fault
> <-do_page_fault
> cat-137 [000] ..... 3132.231973: my_direct_func:
> handle mm fault vma=000000001ba58b17 address=aaaaaaaab689c8 flags=254
> cat-137 [000] ..... 3132.232622: myr:
> (do_page_fault+0x176/0x424 <- handle_mm_fault)
> cat-137 [000] ..... 3132.232724: handle_mm_fault
> <-do_page_fault
> cat-137 [000] ..... 3132.232750: my_direct_func:
> handle mm fault vma=000000001ba58b17 address=aaaaaaaab7df9c flags=254
> cat-137 [000] ..... 3132.233385: myr:
> (do_page_fault+0x176/0x424 <- handle_mm_fault)
> cat-137 [000] ..... 3132.233744: handle_mm_fault
> <-do_page_fault
> cat-137 [000] ..... 3132.233772: my_direct_func:
> handle mm fault vma=000000001ba58b17 address=aaaaaaaab2b2c8 flags=354
> cat-137 [000] ..... 3132.234392: myr:
> (do_page_fault+0x176/0x424 <- handle_mm_fault)
> cat-137 [000] ..... 3132.234480: handle_mm_fault
> <-do_page_fault
> cat-137 [000] ..... 3132.234505: my_direct_func:
> handle mm fault vma=000000001ba58b17 address=aaaaaaaab5afc0 flags=354
> cat-137 [000] ..... 3132.235149: myr:
> (do_page_fault+0x176/0x424 <- handle_mm_fault)
> cat-137 [000] ..... 3132.235263: handle_mm_fault
> <-do_page_fault
> cat-137 [000] ..... 3132.235289: my_direct_func:
> handle mm fault vma=0000000071a096de address=fffffff7fac530 flags=254
> cat-137 [000] ..... 3132.235893: myr:
> (do_page_fault+0x176/0x424 <- handle_mm_fault)
I got a fail with no ftrace enabled. Yes, your patch is correct.
# insmod /root/ftrace/ftrace-direct-too.ko
[ 13.586821]
[ 13.586970] **********************************************************
[ 13.587186] ** NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE **
[ 13.587396] ** **
[ 13.587594] ** trace_printk() being used. Allocating extra memory. **
[ 13.587804] ** **
[ 13.588240] ** This means that this is a DEBUG kernel and it is **
[ 13.588488] ** unsafe for production use. **
[ 13.588735] ** **
[ 13.588966] ** If you see this message and you are not debugging **
[ 13.589200] ** the kernel, report this immediately to your vendor! **
[ 13.589435] ** **
[ 13.589682] ** NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE **
[ 13.589922] **********************************************************
[ 13.632876] Unable to handle kernel access to user memory without
uaccess routines at virtual address 0000000000000000
[ 13.633717] Oops [#1]
[ 13.633858] Modules linked in: ftrace_direct_too
[ 13.634294] CPU: 0 PID: 121 Comm: sh Not tainted
6.1.0-rc1-00016-g459bb40f7d97 #388
[ 13.634652] Hardware name: riscv-virtio,qemu (DT)
[ 13.634962] epc : 0x0
[ 13.635313] ra : do_page_fault+0x176/0x424
[ 13.635548] epc : 0000000000000000 ra : ffffffff8000c8d0 sp :
ff2000000083be80
[ 13.635819] gp : ffffffff815dc778 tp : ff600000033a9680 t0 :
0000000000000000
[ 13.636144] t1 : 0000000000000000 t2 : 0000000000000000 s0 :
ff2000000083bee0
[ 13.636427] s1 : ff2000000083bee0 a0 : ff600000038cb660 a1 :
00fffffff7e74790
[ 13.636725] a2 : 0000000000000255 a3 : 0000000000000000 a4 :
0000000000000000
[ 13.637022] a5 : 0000000000000000 a6 : 0000000000000000 a7 :
0000000000000000
[ 13.637308] s2 : 00fffffff7e74790 s3 : 000000000000000f s4 :
ff6000000319b400
[ 13.637600] s5 : ff600000033a9680 s6 : ff600000038cb660 s7 :
ff6000000319b460
[ 13.637889] s8 : 0000000000000255 s9 : 0000000000000001 s10:
00fffffffffff4dc
[ 13.638172] s11: 0000000000000004 t3 : 0000000000000000 t4 :
0000000000000000
[ 13.638453] t5 : 0000000000000000 t6 : 0000000000000000
[ 13.638679] status: 0000000200000120 badaddr: 0000000000000000
cause: 000000000000000c
[ 13.640035] ---[ end trace 0000000000000000 ]---
>
>
> > > call foo
> > > ld t0,?(sp)
> > > ld t1,?(sp)
> > > ld ra,?(sp)
> > > add sp,sp,?
> > > jr t1 // <- back to function entry
> > When direct_caller works as the first trampoline
> > the content of t1 here means nothing for the target function, neither
> > PC nor PIP.
> > >
> > >
> > > > > sd ra,?(sp)
> > > > > call foo
> > > > > ld t1,?(sp)
> > > > And this line.
> > > > > ld ra,?(sp)
> > > > > add sp,sp,?
> > > > > jr t1 // <- back to function entry
> > > > >
> > > > > And delete all mcount-dyn.S modification.
> > > > >
> > > > > > >>
> > > > > > >> +}
> > > > > > >> +
> > > > > > >> #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */
> > > > > > >>
> > > > > > >> #endif /* __ASSEMBLY__ */
> > > > > > >> diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S
> > > > > > >> index 466c6ef217b1..b89c85a58569 100644
> > > > > > >> --- a/arch/riscv/kernel/mcount-dyn.S
> > > > > > >> +++ b/arch/riscv/kernel/mcount-dyn.S
> > > > > > >> @@ -233,6 +233,7 @@ ENDPROC(ftrace_caller)
> > > > > > >> #else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */
> > > > > > >> ENTRY(ftrace_regs_caller)
> > > > > > >> SAVE_ABI_REGS 1
> > > > > > >> + REG_S x0, PT_T1(sp)
> > > > > > >> PREPARE_ARGS
> > > > > > >>
> > > > > > >> ftrace_regs_call:
> > > > > > >> @@ -241,7 +242,10 @@ ftrace_regs_call:
> > > > > > >>
> > > > > > >>
> > > > > > >> RESTORE_ABI_REGS 1
> > > > > > >> + bnez t1,.Ldirect
> > > > > > >> jr t0
> > > > > > >> +.Ldirect:
> > > > > > >> + jr t1
> > > > > > >> ENDPROC(ftrace_regs_caller)
> > > > > > >>
> > > > > > >> ENTRY(ftrace_caller)
> > > > > > >> --
> > > > > > >> 2.20.1
> > > > > > >>
> > > > > > >
> > > > > > >
> > > > > > > --
> > > > > > > Best Regards
> > > > > > > Guo Ren
> > > > >
> > > > >
> > > > >
> > > > > --
> > > > > Best Regards
> > > > > Guo Ren
> > > > Thanks,
> > > > Song
> > >
> > >
> > >
> > > --
> > > Best Regards
> > > Guo Ren
>
>
>
> --
> Best Regards
> Guo Ren
--
Best Regards
Guo Ren
Powered by blists - more mailing lists