From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932529AbcHITV0 (ORCPT ); Tue, 9 Aug 2016 15:21:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53238 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932207AbcHITVY (ORCPT ); Tue, 9 Aug 2016 15:21:24 -0400 Date: Tue, 9 Aug 2016 12:20:45 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org, naveen.n.rao@linux.vnet.ibm.com, ananth@in.ibm.com, ravi.bangoria@linux.vnet.ibm.com, bsingharora@gmail.com, mhiramat@kernel.org, peterz@infradead.org, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com Reply-To: peterz@infradead.org, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, tglx@linutronix.de, mhiramat@kernel.org, ananth@in.ibm.com, bsingharora@gmail.com, naveen.n.rao@linux.vnet.ibm.com, ravi.bangoria@linux.vnet.ibm.com In-Reply-To: <1470723805-5081-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1470723805-5081-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Add function to post process kernel trace events Git-Commit-ID: d820456dc70b231d62171ba46b43db0045e9bd57 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: d820456dc70b231d62171ba46b43db0045e9bd57 Gitweb: http://git.kernel.org/tip/d820456dc70b231d62171ba46b43db0045e9bd57 Author: Ravi Bangoria AuthorDate: Tue, 9 Aug 2016 01:23:24 -0500 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 9 Aug 2016 12:09:59 -0300 perf probe: Add function to post process kernel trace events Instead of inline code, introduce function to post process kernel probe trace events. Signed-off-by: Ravi Bangoria Acked-by: Masami Hiramatsu Cc: Alexander Shishkin Cc: Ananth N Mavinakayanahalli Cc: Balbir Singh Cc: Namhyung Kim Cc: Naveen N. Rao Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1470723805-5081-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 1201f73..234fbfb 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -666,22 +666,14 @@ static int add_module_to_probe_trace_events(struct probe_trace_event *tevs, return ret; } -/* Post processing the probe events */ -static int post_process_probe_trace_events(struct probe_trace_event *tevs, - int ntevs, const char *module, - bool uprobe) +static int +post_process_kernel_probe_trace_events(struct probe_trace_event *tevs, + int ntevs) { struct ref_reloc_sym *reloc_sym; char *tmp; int i, skipped = 0; - if (uprobe) - return add_exec_to_probe_trace_events(tevs, ntevs, module); - - /* Note that currently ref_reloc_sym based probe is not for drivers */ - if (module) - return add_module_to_probe_trace_events(tevs, ntevs, module); - reloc_sym = kernel_get_ref_reloc_sym(); if (!reloc_sym) { pr_warning("Relocated base symbol is not found!\n"); @@ -713,6 +705,21 @@ static int post_process_probe_trace_events(struct probe_trace_event *tevs, return skipped; } +/* Post processing the probe events */ +static int post_process_probe_trace_events(struct probe_trace_event *tevs, + int ntevs, const char *module, + bool uprobe) +{ + if (uprobe) + return add_exec_to_probe_trace_events(tevs, ntevs, module); + + if (module) + /* Currently ref_reloc_sym based probe is not for drivers */ + return add_module_to_probe_trace_events(tevs, ntevs, module); + + return post_process_kernel_probe_trace_events(tevs, ntevs); +} + /* Try to find perf_probe_event with debuginfo */ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, struct probe_trace_event **tevs)