From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751815AbdGZRSC (ORCPT ); Wed, 26 Jul 2017 13:18:02 -0400 Received: from terminus.zytor.com ([65.50.211.136]:52559 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751657AbdGZRSA (ORCPT ); Wed, 26 Jul 2017 13:18:00 -0400 Date: Wed, 26 Jul 2017 10:15:48 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, namhyung@kernel.org, tglx@linutronix.de, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, hpa@zytor.com Reply-To: adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, acme@redhat.com, wangnan0@huawei.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Allow specifying number of syscall args for tracepointless syscalls Git-Commit-ID: 332337dafc98d88561bf3730f80c59cc93f089e1 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: 332337dafc98d88561bf3730f80c59cc93f089e1 Gitweb: http://git.kernel.org/tip/332337dafc98d88561bf3730f80c59cc93f089e1 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 19 Jul 2017 15:08:14 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 20 Jul 2017 09:55:53 -0300 perf trace: Allow specifying number of syscall args for tracepointless syscalls When we don't have syscalls:sys_{enter,exit}_NAME, we had to resort to dumping all the 6 syscall arguments, fix it by providing that info for such syscalls, like 'clone'. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-dfq1jtrxj8dqvqoeqqpr3slu@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index f8b7bfd..e1988d0 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -611,6 +611,7 @@ static struct syscall_fmt { const char *name; const char *alias; struct syscall_arg_fmt arg[6]; + u8 nr_args; bool errpid; bool timeout; bool hexret; @@ -1169,6 +1170,9 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args) { int idx; + if (nr_args == 6 && sc->fmt && sc->fmt->nr_args != 0) + nr_args = sc->fmt->nr_args; + sc->arg_fmt = calloc(nr_args, sizeof(*sc->arg_fmt)); if (sc->arg_fmt == NULL) return -1; @@ -1413,7 +1417,7 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, * may end up not having any args, like with gettid(), so only * print the raw args when we didn't manage to read it. */ - while (arg.idx < 6) { + while (arg.idx < sc->nr_args) { if (arg.mask & bit) goto next_arg; val = syscall_arg__val(&arg, arg.idx);