Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755160AbbDNMSN (ORCPT ); Tue, 14 Apr 2015 08:18:13 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38286 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755360AbbDNMR7 (ORCPT ); Tue, 14 Apr 2015 08:17:59 -0400 Date: Tue, 14 Apr 2015 05:17:32 -0700 From: tip-bot for He Kuang Message-ID: Cc: a.p.zijlstra@chello.nl, hekuang@huawei.com, namhyung@kernel.org, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com, wangnan0@huawei.com, hpa@zytor.com Reply-To: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, hpa@zytor.com, wangnan0@huawei.com, a.p.zijlstra@chello.nl, hekuang@huawei.com, namhyung@kernel.org In-Reply-To: <1428925290-5623-1-git-send-email-hekuang@huawei.com> References: <1428925290-5623-1-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf probe: Set retprobe flag when probe in address-based alternative mode Git-Commit-ID: 9d7b45c5721dfd524666bc1f07cf7d0855edb4d5 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 Content-Length: 2438 Lines: 68 Commit-ID: 9d7b45c5721dfd524666bc1f07cf7d0855edb4d5 Gitweb: http://git.kernel.org/tip/9d7b45c5721dfd524666bc1f07cf7d0855edb4d5 Author: He Kuang AuthorDate: Mon, 13 Apr 2015 19:41:28 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 13 Apr 2015 17:25:22 -0300 perf probe: Set retprobe flag when probe in address-based alternative mode When perf probe searched in a debuginfo file and failed, it tried with an alternative, in function get_alternative_probe_event(): memcpy(tmp, &pev->point, sizeof(*tmp)); memset(&pev->point, 0, sizeof(pev->point)); In this case, it drops the retprobe flag and forgets to set it back in find_alternative_probe_point(), so the problem occurs. Can be reproduced as following: $ perf probe -v -k vmlinux --add='sys_write%return' ... Added new event: Writing event: p:probe/sys_write _stext+1584952 probe:sys_write (on sys_write%return) $ cat /sys/kernel/debug/tracing/kprobe_events p:probe/sys_write _stext+1584952 After this patch: $ perf probe -v -k vmlinux --add='sys_write%return' Added new event: Writing event: r:probe/sys_write SyS_write+0 probe:sys_write (on sys_write%return) $ cat /sys/kernel/debug/tracing/kprobe_events r:probe/sys_write SyS_write Signed-off-by: He Kuang Tested-by: Arnaldo Carvalho de Melo Acked-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1428925290-5623-1-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 30545ce..5483d98 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -332,6 +332,7 @@ static int find_alternative_probe_point(struct debuginfo *dinfo, else { result->offset += pp->offset; result->line += pp->line; + result->retprobe = pp->retprobe; ret = 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/