Re: [PATCH RFC bpf-next 1/4] fprobe: Add entry/exit callbacks types

[Jiri Olsa <olsajiri@gmail.com>]

On Wed, Feb 14, 2024 at 12:35:46AM +0900, Masami Hiramatsu wrote:
> Hi,
> 
> On Wed,  7 Feb 2024 16:35:47 +0100
> Jiri Olsa <jolsa@kernel.org> wrote:
> 
> > We are going to store callbacks in following change,
> > so this will ease up the code.
> > 
> 
> Yeah, this looks good to me.
> 
> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
> 
> Hmm, can I pick this in my for-next tree?

I don't mind you picking that up, I'll have to send new version of
the rest of the patchset, but I think I'll still need these types

jirka

> 
> Thank you,
> 
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > ---
> >  include/linux/fprobe.h | 18 ++++++++++++------
> >  1 file changed, 12 insertions(+), 6 deletions(-)
> > 
> > diff --git a/include/linux/fprobe.h b/include/linux/fprobe.h
> > index 3e03758151f4..f39869588117 100644
> > --- a/include/linux/fprobe.h
> > +++ b/include/linux/fprobe.h
> > @@ -7,6 +7,16 @@
> >  #include <linux/ftrace.h>
> >  #include <linux/rethook.h>
> >  
> > +struct fprobe;
> > +
> > +typedef int (*fprobe_entry_cb)(struct fprobe *fp, unsigned long entry_ip,
> > +			       unsigned long ret_ip, struct pt_regs *regs,
> > +			       void *entry_data);
> > +
> > +typedef void (*fprobe_exit_cb)(struct fprobe *fp, unsigned long entry_ip,
> > +			       unsigned long ret_ip, struct pt_regs *regs,
> > +			       void *entry_data);
> > +
> >  /**
> >   * struct fprobe - ftrace based probe.
> >   * @ops: The ftrace_ops.
> > @@ -34,12 +44,8 @@ struct fprobe {
> >  	size_t			entry_data_size;
> >  	int			nr_maxactive;
> >  
> > -	int (*entry_handler)(struct fprobe *fp, unsigned long entry_ip,
> > -			     unsigned long ret_ip, struct pt_regs *regs,
> > -			     void *entry_data);
> > -	void (*exit_handler)(struct fprobe *fp, unsigned long entry_ip,
> > -			     unsigned long ret_ip, struct pt_regs *regs,
> > -			     void *entry_data);
> > +	fprobe_entry_cb entry_handler;
> > +	fprobe_exit_cb  exit_handler;
> >  };
> >  
> >  /* This fprobe is soft-disabled. */
> > -- 
> > 2.43.0
> > 
> 
> 
> -- 
> Masami Hiramatsu (Google) <mhiramat@kernel.org>