Commit ba504235 authored Feb 26, 2016 by Wang Nan Committed by Arnaldo Carvalho de Melo Feb 26, 2016

perf trace: Call bpf__apply_obj_config in 'perf trace'



Without this patch BPF map configuration is not applied.

Command like this:
 # ./perf trace --ev bpf-output/no-inherit,name=evt/ \
                --ev ./test_bpf_trace.c/map:channel.event=evt/ \
                usleep 100000

Load BPF files without error, but since map:channel.event=evt is not
applied, bpf-output event not work.

This patch allows 'perf trace' load and run BPF scripts.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1456479154-136027-7-git-send-email-wangnan0@huawei.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent fdf14720

tools/perf/builtin-trace.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include "util/stat.h"
		#include "trace-event.h"
		#include "util/parse-events.h"
		#include "util/bpf-loader.h"

		#include <libaudit.h>
		#include <stdlib.h>
		@@ -2586,6 +2587,16 @@ static int trace__run(struct trace trace, int argc, const char *argv)
		if (err < 0)
		goto out_error_open;

		err = bpf__apply_obj_config();
		if (err) {
		char errbuf[BUFSIZ];

		bpf__strerror_apply_obj_config(err, errbuf, sizeof(errbuf));
		pr_err("ERROR: Apply config to BPF failed: %s\n",
		errbuf);
		goto out_error_open;
		}

		/*
		* Better not use !target__has_task() here because we need to cover the
		* case where no threads were specified in the command line, but a