From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752398AbcIIFvx (ORCPT ); Fri, 9 Sep 2016 01:51:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37320 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750831AbcIIFvu (ORCPT ); Fri, 9 Sep 2016 01:51:50 -0400 Date: Thu, 8 Sep 2016 22:51:40 -0700 From: tip-bot for Wang Nan Message-ID: Cc: nilayvaish@gmail.com, hpa@zytor.com, lizefan@huawei.com, houpengyang@huawei.com, mingo@kernel.org, hekuang@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com, wangnan0@huawei.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, hekuang@huawei.com, acme@redhat.com, tglx@linutronix.de, wangnan0@huawei.com, houpengyang@huawei.com, nilayvaish@gmail.com, hpa@zytor.com, lizefan@huawei.com, mingo@kernel.org In-Reply-To: <1473137909-142064-2-git-send-email-wangnan0@huawei.com> References: <1473137909-142064-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Recognize hugetlb mapping as anon mapping Git-Commit-ID: 0ac3348e502423cf2fe86beca83b8835a2e6d289 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: 0ac3348e502423cf2fe86beca83b8835a2e6d289 Gitweb: http://git.kernel.org/tip/0ac3348e502423cf2fe86beca83b8835a2e6d289 Author: Wang Nan AuthorDate: Tue, 6 Sep 2016 04:58:27 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Sep 2016 12:28:06 -0300 perf tools: Recognize hugetlb mapping as anon mapping Hugetlbfs mapping should be recognized as anon mapping so user has a chance to create /tmp/perf-.map file for symbol resolving. This patch utilizes MAP_HUGETLB to identify hugetlb mapping. After this patch, if perf is started before a program starts using huge pages (so perf gets MMAP2 events from kernel), perf is able to recognize hugetlb mapping as anon mapping. Signed-off-by: Wang Nan Cc: He Kuang Cc: Nilay Vaish Cc: Zefan Li Link: http://lkml.kernel.org/r/1473137909-142064-2-git-send-email-wangnan0@huawei.com Signed-off-by: Hou Pengyang Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 0c54adb..d51a125 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "map.h" #include "thread.h" #include "strlist.h" @@ -24,9 +25,15 @@ const char *map_type__name[MAP__NR_TYPES] = { [MAP__VARIABLE] = "Variables", }; -static inline int is_anon_memory(const char *filename) +static inline int is_anon_memory(const char *filename, u32 flags) { - return !strcmp(filename, "//anon") || + u32 anon_flags = 0; + +#ifdef MAP_HUGETLB + anon_flags |= MAP_HUGETLB; +#endif + return flags & anon_flags || + !strcmp(filename, "//anon") || !strncmp(filename, "/dev/zero", sizeof("/dev/zero") - 1) || !strncmp(filename, "/anon_hugepage", sizeof("/anon_hugepage") - 1); } @@ -155,7 +162,7 @@ struct map *map__new(struct machine *machine, u64 start, u64 len, int anon, no_dso, vdso, android; android = is_android_lib(filename); - anon = is_anon_memory(filename); + anon = is_anon_memory(filename, flags); vdso = is_vdso_map(filename); no_dso = is_no_dso_memory(filename);