Re: [PATCH 07/31] perf probe: Attach trace_probe_event with perf_probe_event

[Wangnan (F)]

On 2015/9/2 12:32, Namhyung Kim wrote:
> Hi,
>
> On Sat, Aug 29, 2015 at 04:21:41AM +0000, Wang Nan wrote:
> > This patch drops struct __event_package structure. Instead, it adds
> > trace_probe_event into 'struct perf_probe_event'.
> >
> > trace_probe_event information gives further patches a chance to access
> > actual probe points and actual arguments. Using them, bpf_loader will
> > be able to attach one bpf program to different probing points of a
> > inline functions (which has multiple probing points) and glob
> > functions. Moreover, by reading arguments information, bpf code for
> > reading those arguments can be generated.
> >
> > Signed-off-by: Wang Nan <wangnan0@xxxxxxxxxx>
> > Cc: Alexei Starovoitov <ast@xxxxxxxxxxxx>
> > Cc: Brendan Gregg <brendan.d.gregg@xxxxxxxxx>
> > Cc: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
> > Cc: David Ahern <dsahern@xxxxxxxxx>
> > Cc: He Kuang <hekuang@xxxxxxxxxx>
> > Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> > Cc: Kaixu Xia <xiakaixu@xxxxxxxxxx>
> > Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
> > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > Cc: Paul Mackerras <paulus@xxxxxxxxx>
> > Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> > Cc: Zefan Li <lizefan@xxxxxxxxxx>
> > Cc: pi3orama@xxxxxxx
> > Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > Link: http://lkml.kernel.org/n/1436445342-1402-22-git-send-email-wangnan0@xxxxxxxxxx
> > ---
> [SNIP]
>
> > +int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
> > +			  bool cleanup)
> > +{
> > +	int i, ret;
> >   
> >   	ret = init_symbol_maps(pevs->uprobes);
> > -	if (ret < 0) {
> > -		free(pkgs);
> > +	if (ret < 0)
> >   		return ret;
> > -	}
> >   
> >   	/* Loop 1: convert all events */
> >   	for (i = 0; i < npevs; i++) {
> > -		pkgs[i].pev = &pevs[i];
> >   		/* Init kprobe blacklist if needed */
> > -		if (!pkgs[i].pev->uprobes)
> > +		if (pevs[i].uprobes)
> Missing '!'.

It's my fault. Already fixed in my local tree.

Thank you for your review!

> Thanks,
> Namhyung
>
>
> >   			kprobe_blacklist__init();
> >   		/* Convert with or without debuginfo */
> > -		ret  = convert_to_probe_trace_events(pkgs[i].pev,
> > -						     &pkgs[i].tevs);
> > -		if (ret < 0)
> > +		ret  = convert_to_probe_trace_events(&pevs[i], &pevs[i].tevs);
> > +		if (ret < 0) {
> > +			cleanup = true;
> >   			goto end;
> > -		pkgs[i].ntevs = ret;
> > +		}
> > +		pevs[i].ntevs = ret;
> >   	}
> >   	/* This just release blacklist only if allocated */
> >   	kprobe_blacklist__release();
> >   
> >   	/* Loop 2: add all events */
> >   	for (i = 0; i < npevs; i++) {
> > -		ret = __add_probe_trace_events(pkgs[i].pev, pkgs[i].tevs,
> > -					       pkgs[i].ntevs,
> > +		ret = __add_probe_trace_events(&pevs[i], pevs[i].tevs,
> > +					       pevs[i].ntevs,
> >   					       probe_conf.force_add);
> >   		if (ret < 0)
> >   			break;
> >   	}
> >   end:
> >   	/* Loop 3: cleanup and free trace events  */
> > -	for (i = 0; i < npevs; i++) {
> > -		for (j = 0; j < pkgs[i].ntevs; j++)
> > -			clear_probe_trace_event(&pkgs[i].tevs[j]);
> > -		zfree(&pkgs[i].tevs);
> > -	}
> > -	free(pkgs);
> > +	for (i = 0; cleanup && (i < npevs); i++)
> > +		cleanup_perf_probe_event(&pevs[i]);
> >   	exit_symbol_maps();
> >   
> >   	return ret;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/