From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753161AbdCNPIw (ORCPT ); Tue, 14 Mar 2017 11:08:52 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33885 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753256AbdCNPHe (ORCPT ); Tue, 14 Mar 2017 11:07:34 -0400 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 v5 6/7] perf/sdt: List events fetched from uprobe_events Date: Tue, 14 Mar 2017 20:36:57 +0530 X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170314150658.7065-1-ravi.bangoria@linux.vnet.ibm.com> References: <20170314150658.7065-1-ravi.bangoria@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17031415-0004-0000-0000-0000054FB99C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17031415-0005-0000-0000-0000134C6F3E Message-Id: <20170314150658.7065-7-ravi.bangoria@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-03-14_08:,, 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-1703140118 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-event.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 7bf8783..e150de0 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -3593,6 +3593,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, @@ -3607,10 +3625,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); @@ -3660,11 +3682,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