From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbbCSJ1t (ORCPT ); Thu, 19 Mar 2015 05:27:49 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:48667 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751204AbbCSJ1p (ORCPT ); Thu, 19 Mar 2015 05:27:45 -0400 From: He Kuang To: , , , , CC: , Subject: [PATCH] perf probe: Fix failure to add multiple probes without debuginfo Date: Thu, 19 Mar 2015 17:23:43 +0800 Message-ID: <1426757023-14290-1-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 2.3.3.220.g9ab698f MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.189] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.550A968F.0003,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 882c35d31f40dfae38523c5da9f5d2e7 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: hekuang Perf tries to find probe function addresses from map when debuginfo could not be found. To the first added function, the value of ref_reloc_sym was set in maps__set_kallsyms_ref_reloc_sym() and can be obtained from host_machine->kmaps->maps. After that, new maps are added to host_machine->kmaps->maps in dso__load_kcore(), all these new added maps do not have a valid ref_reloc_sym. When adding a second function, get_target_map() may get a map without valid ref_reloc_sym, and raise the error "Relocated base symbol is not found". Fix this by getting ref_reloc_sym from machine->vmlinux_maps. This problem can be reproduced as following: $ perf probe --add='sys_write' --add='sys_open' Relocated base symbol is not found! Error: Failed to add events. After this patch: $ perf probe --add='sys_write' --add='sys_open' Added new event: probe:sys_write (on sys_write) You can now use it in all perf tools, such as: perf record -e probe:sys_write -aR sleep 1 Added new event: probe:sys_open (on sys_open) You can now use it in all perf tools, such as: perf record -e probe:sys_open -aR sleep 1 Signed-off-by: He Kuang --- tools/perf/util/probe-event.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index c5e1338..75d41ee 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2540,7 +2540,19 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev, } if (!pev->uprobes && !pp->retprobe) { - kmap = map__kmap(map); + struct machine *machine; + struct map *vmlinux_map = NULL; + + if (map->groups && map->groups->machine) { + machine = map->groups->machine; + vmlinux_map = machine->vmlinux_maps[MAP__FUNCTION]; + } + + if (vmlinux_map) + kmap = map__kmap(vmlinux_map); + else + kmap = map__kmap(map); + reloc_sym = kmap->ref_reloc_sym; if (!reloc_sym) { pr_warning("Relocated base symbol is not found!\n"); -- 2.3.3.220.g9ab698f