From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752856AbcFBGd3 (ORCPT ); Thu, 2 Jun 2016 02:33:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55814 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932177AbcFBGdG (ORCPT ); Thu, 2 Jun 2016 02:33:06 -0400 Date: Wed, 1 Jun 2016 23:32:07 -0700 From: tip-bot for Wang Nan Message-ID: Cc: hpa@zytor.com, mhiramat@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, lizefan@huawei.com, hekuang@huawei.com, namhyung@kernel.org Reply-To: tglx@linutronix.de, jolsa@kernel.org, wangnan0@huawei.com, lizefan@huawei.com, hekuang@huawei.com, namhyung@kernel.org, hpa@zytor.com, mhiramat@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, mingo@kernel.org In-Reply-To: <1464056944-166978-3-git-send-email-wangnan0@huawei.com> References: <1464056944-166978-3-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Robustify perf_event__synth_time_conv() Git-Commit-ID: c45628b0a3f90c4ffeca5f72f227008ceedc21c5 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: c45628b0a3f90c4ffeca5f72f227008ceedc21c5 Gitweb: http://git.kernel.org/tip/c45628b0a3f90c4ffeca5f72f227008ceedc21c5 Author: Wang Nan AuthorDate: Tue, 24 May 2016 02:28:59 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 30 May 2016 12:41:44 -0300 perf record: Robustify perf_event__synth_time_conv() It is possible that all events in an evlist are overwritable. perf_event__synth_time_conv() should not crash in this case. record__pick_pc() is used to check avaliability. Signed-off-by: Wang Nan Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1464056944-166978-3-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang [ Split from a larger patch ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/x86/util/tsc.c | 2 ++ tools/perf/builtin-record.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/perf/arch/x86/util/tsc.c b/tools/perf/arch/x86/util/tsc.c index 357f1b1..2e5567c 100644 --- a/tools/perf/arch/x86/util/tsc.c +++ b/tools/perf/arch/x86/util/tsc.c @@ -62,6 +62,8 @@ int perf_event__synth_time_conv(const struct perf_event_mmap_page *pc, struct perf_tsc_conversion tc; int err; + if (!pc) + return 0; err = perf_read_tsc_conversion(pc, &tc); if (err == -EOPNOTSUPP) return 0; diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index dc3fcb5..d4cf1b0 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -655,6 +655,13 @@ perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused return 0; } +static const struct perf_event_mmap_page *record__pick_pc(struct record *rec) +{ + if (rec->evlist && rec->evlist->mmap && rec->evlist->mmap[0].base) + return rec->evlist->mmap[0].base; + return NULL; +} + static int record__synthesize(struct record *rec) { struct perf_session *session = rec->session; @@ -692,7 +699,7 @@ static int record__synthesize(struct record *rec) } } - err = perf_event__synth_time_conv(rec->evlist->mmap[0].base, tool, + err = perf_event__synth_time_conv(record__pick_pc(rec), tool, process_synthesized_event, machine); if (err) goto out;