Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753816AbdCFO7A (ORCPT ); Mon, 6 Mar 2017 09:59:00 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41665 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754096AbdCFO6u (ORCPT ); Mon, 6 Mar 2017 09:58:50 -0500 From: Ravi Bangoria To: mingo@redhat.com, acme@kernel.org, mhiramat@kernel.org Cc: brendan.d.gregg@gmail.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, jolsa@kernel.org, ak@linux.intel.com, treeze.taeung@gmail.com, mathieu.poirier@linaro.org, hekuang@huawei.com, sukadev@linux.vnet.ibm.com, ananth@in.ibm.com, naveen.n.rao@linux.vnet.ibm.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, hemant@linux.vnet.ibm.com, Ravi Bangoria Subject: [PATCH v4 6/7] perf/sdt: List events fetched from uprobe_events Date: Mon, 6 Mar 2017 18:43:03 +0530 X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170306131304.1625-1-ravi.bangoria@linux.vnet.ibm.com> References: <20170306131304.1625-1-ravi.bangoria@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030613-0032-0000-0000-000001F49B7A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030613-0033-0000-0000-00001227E6D6 Message-Id: <20170306131304.1625-7-ravi.bangoria@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-06_11:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703060111 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2238 Lines: 81 List those events which are fetched from uprobe_events as 'event addr@file' followed by hint on how these events can be deleted with 'perf probe -d' command. For example: $ sudo cat /sys/kernel/debug/tracing/uprobe_events p:sdt_libpthread/mutex_release /usr/lib64/libpthread-2.24.so:0x000000000000b126 $ sudo ./perf record -a -e sdt_libpthread:mutex_release Matching event(s) from uprobe_events: sdt_libpthread:mutex_release 0xb126@/usr/lib64/libpthread-2.24.so Use 'perf probe -d ' to delete event(s). Signed-off-by: Ravi Bangoria --- tools/perf/util/probe-file.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c index 90444e5..7d52efe 100644 --- a/tools/perf/util/probe-file.c +++ b/tools/perf/util/probe-file.c @@ -1010,6 +1010,24 @@ static void sdt_warn_multi_events(int ctr, struct perf_probe_event *pev) ctr, pev->group, pev->event); } +static void print_exst_sdt_events(struct probe_trace_event *tev) +{ + static bool msg_head; + + if (!msg_head) { + pr_info("Matching event(s) from uprobe_events:\n"); + msg_head = true; + } + + pr_info(" %s:%s 0x%" PRIx64 "@%s\n", tev->group, + tev->event, tev->point.address, tev->point.module); +} + +static void print_exst_sdt_event_footer(void) +{ + pr_info("Use 'perf probe -d ' to delete event(s).\n\n"); +} + static int sdt_event_probepoint_exists(struct perf_probe_event *pev, struct probe_trace_event *tevs, int ntevs, @@ -1024,10 +1042,14 @@ static int sdt_event_probepoint_exists(struct perf_probe_event *pev, if (ret < 0) return ret; + print_exst_sdt_events(&tevs[i]); ctr++; } } + if (ctr > 0) + print_exst_sdt_event_footer(); + if (ctr > 1) sdt_warn_multi_events(ctr, pev); @@ -1088,11 +1110,16 @@ static int sdt_merge_events(struct perf_probe_event *pev, if (!ptrn_used) shift_sdt_events(pev, i); + + print_exst_sdt_events(&exst_tevs[j]); ctr++; } } } + if (ctr > 0) + print_exst_sdt_event_footer(); + if (!ptrn_used || ctr == 0) { /* * Create probe point for all probe-cached events by -- 2.9.3