From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755536AbcBCKSO (ORCPT ); Wed, 3 Feb 2016 05:18:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54692 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752452AbcBCKSG (ORCPT ); Wed, 3 Feb 2016 05:18:06 -0500 Date: Wed, 3 Feb 2016 02:17:51 -0800 From: tip-bot for Wang Nan Message-ID: Cc: mingo@kernel.org, jolsa@redhat.com, acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, masami.hiramatsu.pt@hitachi.com, lizefan@huawei.com, wangnan0@huawei.com, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: namhyung@kernel.org, acme@redhat.com, jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org, lizefan@huawei.com, masami.hiramatsu.pt@hitachi.com, wangnan0@huawei.com, hpa@zytor.com, linux-kernel@vger.kernel.org In-Reply-To: <1454089251-203152-1-git-send-email-wangnan0@huawei.com> References: <1454089251-203152-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf buildid: Fix cpumode of buildid event Git-Commit-ID: fd786fac78affe4a005065bc2b6f90d8f8953961 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: fd786fac78affe4a005065bc2b6f90d8f8953961 Gitweb: http://git.kernel.org/tip/fd786fac78affe4a005065bc2b6f90d8f8953961 Author: Wang Nan AuthorDate: Fri, 29 Jan 2016 17:40:51 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 29 Jan 2016 17:16:25 -0300 perf buildid: Fix cpumode of buildid event There is a nasty confusion that, for kernel module, dso->kernel is not necessary to be DSO_TYPE_KERNEL or DSO_TYPE_GUEST_KERNEL. These two enums are for vmlinux. See thread [1]. We tried to fix this part but it is costy. Code machine__write_buildid_table() is another unfortunate function fall into this trap that, when issuing buildid event for a kernel module, cpumode it gives to the event is PERF_RECORD_MISC_USER, not PERF_RECORD_MISC_KERNEL. However, even with this bug, most of the time it doesn't causes real problem. I find this issue when trying to use a perf before commit 3d39ac538629 ("perf machine: No need to have two DSOs lists") to parse a perf.data generated by newest perf. [1] https://lkml.org/lkml/2015/9/21/908 Signed-off-by: Wang Nan Cc: Jiri Olsa Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1454089251-203152-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/build-id.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c index 6a7e273..b28100e 100644 --- a/tools/perf/util/build-id.c +++ b/tools/perf/util/build-id.c @@ -211,6 +211,7 @@ static int machine__write_buildid_table(struct machine *machine, int fd) dsos__for_each_with_build_id(pos, &machine->dsos.head) { const char *name; size_t name_len; + bool in_kernel = false; if (!pos->hit) continue; @@ -227,8 +228,11 @@ static int machine__write_buildid_table(struct machine *machine, int fd) name_len = pos->long_name_len + 1; } + in_kernel = pos->kernel || + is_kernel_module(name, + PERF_RECORD_MISC_CPUMODE_UNKNOWN); err = write_buildid(name, name_len, pos->build_id, machine->pid, - pos->kernel ? kmisc : umisc, fd); + in_kernel ? kmisc : umisc, fd); if (err) break; }