Re: [PATCH 03/17] tracing/kprobes: Factor out struct trace_probe

[Srikar Dronamraju <srikar@linux.vnet.ibm.com>]

* Namhyung Kim <namhyung@kernel.org> [2013-11-27 15:19:49]:

> From: Namhyung Kim <namhyung.kim@lge.com>
> 
> There are functions that can be shared to both of kprobes and uprobes.
> Separate common data structure to struct trace_probe and use it from
> the shared functions.
> 
> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
> Cc: Oleg Nesterov <oleg@redhat.com>
> Cc: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  kernel/trace/trace_kprobe.c | 396 +++++++++++++++++++++-----------------------
>  kernel/trace/trace_probe.h  |  20 +++
>  2 files changed, 213 insertions(+), 203 deletions(-)
> 
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index dae9541ada9e..72b76e1f2d34 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -27,18 +27,12 @@
>  /**
>   * Kprobe event core functions
>   */
> -struct trace_probe {
> +struct trace_kprobe {
>  	struct list_head	list;
>  	struct kretprobe	rp;	/* Use rp.kp for kprobe use */
>  	unsigned long 		nhit;
> -	unsigned int		flags;	/* For TP_FLAG_* */
>  	const char		*symbol;	/* symbol name */
> -	struct ftrace_event_class	class;
> -	struct ftrace_event_call	call;
> -	struct list_head	files;
> -	ssize_t			size;		/* trace entry size */
> -	unsigned int		nr_args;
> -	struct probe_arg	args[];
> +	struct trace_probe	p;

Can I suggest to use tp instead of p to denote trace_probe?

>  };
> 
> 

<..snipped..>

> -static int register_probe_event(struct trace_probe *tp);
> -static int unregister_probe_event(struct trace_probe *tp);
> +static int register_kprobe_event(struct trace_kprobe *tk);
> +static int unregister_kprobe_event(struct trace_kprobe *tk);
> 
>  static DEFINE_MUTEX(probe_lock);
>  static LIST_HEAD(probe_list);
> @@ -107,14 +91,14 @@ static int kretprobe_dispatcher(struct kretprobe_instance *ri,
>  /*
>   * Allocate new trace_probe and initialize it (including kprobes).
>   */
> -static struct trace_probe *alloc_trace_probe(const char *group,
> +static struct trace_kprobe *alloc_trace_kprobe(const char *group,
>  					     const char *event,
>  					     void *addr,
>  					     const char *symbol,
>  					     unsigned long offs,
>  					     int nargs, bool is_return)
>  {
> -	struct trace_probe *tp;
> +	struct trace_kprobe *tp;

Nit: Here and couple of places below: Given that tk was used to
represent trace_kprobe, can we use tk everywhere. Using tp to represent
trace_probe and trace_kprobe is a bit confusing.

>  	int ret = -ENOMEM;
> 

The rest looks fine.

-- 
Thanks and Regards
Srikar Dronamraju