From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753641AbcDNFrQ (ORCPT ); Thu, 14 Apr 2016 01:47:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47722 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbcDNFrO (ORCPT ); Thu, 14 Apr 2016 01:47:14 -0400 Date: Wed, 13 Apr 2016 22:46:54 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, jolsa@kernel.org, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, milian.wolff@kdab.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: jolsa@kernel.org, dsahern@gmail.com, mingo@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com, namhyung@kernel.org, milian.wolff@kdab.com, adrian.hunter@intel.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Do not accept --no-syscalls together with -e Git-Commit-ID: 59247e33ff494e3643cdff54b64bf72575052b76 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: 59247e33ff494e3643cdff54b64bf72575052b76 Gitweb: http://git.kernel.org/tip/59247e33ff494e3643cdff54b64bf72575052b76 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 12 Apr 2016 16:05:02 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 13 Apr 2016 10:11:52 -0300 perf trace: Do not accept --no-syscalls together with -e Doesn't make sense and was causing a segfault, fix it. # trace -e clone --no-syscalls --event sched:*exec firefox The -e option can't be used with --no-syscalls. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-ccrahezikdk2uebptzr1eyyi@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index b842ddd..d49c131 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -3344,6 +3344,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) goto out; } + err = -1; + if (trace.trace_pgfaults) { trace.opts.sample_address = true; trace.opts.sample_time = true; @@ -3368,6 +3370,11 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) return -1; } + if (!trace.trace_syscalls && ev_qualifier_str) { + pr_err("The -e option can't be used with --no-syscalls.\n"); + goto out; + } + if (output_name != NULL) { err = trace__open_output(&trace, output_name); if (err < 0) {