From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964852AbcB0Jp7 (ORCPT ); Sat, 27 Feb 2016 04:45:59 -0500 Received: from torg.zytor.com ([198.137.202.12]:39492 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756034AbcB0Jp4 (ORCPT ); Sat, 27 Feb 2016 04:45:56 -0500 Date: Sat, 27 Feb 2016 01:45:24 -0800 From: tip-bot for Wang Nan Message-ID: Cc: linux-kernel@vger.kernel.org, wangnan0@huawei.com, lizefan@huawei.com, peterz@infradead.org, acme@redhat.com, mingo@kernel.org, ast@kernel.org, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org Reply-To: peterz@infradead.org, mingo@kernel.org, acme@redhat.com, lizefan@huawei.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, ast@kernel.org, tglx@linutronix.de In-Reply-To: <1456479154-136027-7-git-send-email-wangnan0@huawei.com> References: <1456479154-136027-7-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Call bpf__apply_obj_config in 'perf trace' Git-Commit-ID: ba50423530200659d4deb703a8f72d3b69bc13ce X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: ba50423530200659d4deb703a8f72d3b69bc13ce Gitweb: http://git.kernel.org/tip/ba50423530200659d4deb703a8f72d3b69bc13ce Author: Wang Nan AuthorDate: Fri, 26 Feb 2016 09:31:54 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 26 Feb 2016 19:50:40 -0300 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 Cc: Alexei Starovoitov Cc: Jiri Olsa Cc: Li Zefan Cc: Peter Zijlstra 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 --- tools/perf/builtin-trace.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 20916dd..254149c 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -33,6 +33,7 @@ #include "util/stat.h" #include "trace-event.h" #include "util/parse-events.h" +#include "util/bpf-loader.h" #include #include @@ -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