Re: [PATCH 10/18] kprobes: fix compilation without CONFIG_KRETPROBES

Masami Hiramatsu
2019-10-21T09:13:48Z

On Fri, 18 Oct 2019 13:02:57 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

>
> Added Masami who's the maintainer of kprobes.
>
> -- Steve
>
>
> On Fri, 18 Oct 2019 09:10:25 -0700
> Sami Tolvanen <samitolvanen@google.com> wrote:
>
> > kprobe_on_func_entry and arch_kprobe_on_func_entry need to be available
> > even if CONFIG_KRETPROBES is not selected.

Good catch! Since nowadays all arch supports kretprobes, I've missed to
test it.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you,

> >
> > Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
> > ---
> > kernel/kprobes.c | 38 +++++++++++++++++++-------------------
> > 1 file changed, 19 insertions(+), 19 deletions(-)
> >
> > diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> > index 53534aa258a6..b5e20a4669b8 100644
> > --- a/kernel/kprobes.c
> > +++ b/kernel/kprobes.c
> > @@ -1829,6 +1829,25 @@ unsigned long __weak arch_deref_entry_point(void *entry)
> > return (unsigned long)entry;
> > }
> >
> > +bool __weak arch_kprobe_on_func_entry(unsigned long offset)
> > +{
> > + return !offset;
> > +}
> > +
> > +bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
> > +{
> > + kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset);
> > +
> > + if (IS_ERR(kp_addr))
> > + return false;
> > +
> > + if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) ||
> > + !arch_kprobe_on_func_entry(offset))
> > + return false;
> > +
> > + return true;
> > +}
> > +
> > #ifdef CONFIG_KRETPROBES
> > /*
> > * This kprobe pre_handler is registered with every kretprobe. When probe
> > @@ -1885,25 +1904,6 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
> > }
> > NOKPROBE_SYMBOL(pre_handler_kretprobe);
> >
> > -bool __weak arch_kprobe_on_func_entry(unsigned long offset)
> > -{
> > - return !offset;
> > -}
> > -
> > -bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
> > -{
> > - kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset);
> > -
> > - if (IS_ERR(kp_addr))
> > - return false;
> > -
> > - if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) ||
> > - !arch_kprobe_on_func_entry(offset))
> > - return false;
> > -
> > - return true;
> > -}
> > -
> > int register_kretprobe(struct kretprobe *rp)
> > {
> > int ret = 0;
>

--
Masami Hiramatsu <mhiramat@kernel.org>