From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>
Cc: <nilayvaish@gmail.com>, <linux-kernel@vger.kernel.org>,
<lizefan@huawei.com>, Wang Nan <wangnan0@huawei.com>,
Hou Pengyang <houpengyang@huawei.com>,
He Kuang <hekuang@huawei.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>
Subject: [PATCH v2 1/3] perf tools: Recognize hugetlb mapping as anon mapping
Date: Tue, 6 Sep 2016 04:58:27 +0000 [thread overview]
Message-ID: <1473137909-142064-2-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1473137909-142064-1-git-send-email-wangnan0@huawei.com>
Hugetlbfs mapping should be recognized as anon mapping so user has
a chance to create /tmp/perf-<pid>.map file for symbol resolving. This
patch utilizes MAP_HUGETLB to identify hugetlb mapping.
After this patch, if perf is started before the 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 <wangnan0@huawei.com>
Signed-off-by: Hou Pengyang <houpengyang@huawei.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Nilay Vaish <nilayvaish@gmail.com>
---
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 728129a..f52d460 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -6,6 +6,7 @@
#include <string.h>
#include <stdio.h>
#include <unistd.h>
+#include <sys/mman.h>
#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);
--
1.8.3.4
next prev parent reply other threads:[~2016-09-06 4:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 4:58 [PATCH v2 0/3] perf report: " Wang Nan
2016-09-06 4:58 ` Wang Nan [this message]
2016-09-09 5:51 ` [tip:perf/core] perf tools: " tip-bot for Wang Nan
2016-09-06 4:58 ` [PATCH v2 2/3] tools lib api fs: Add hugetlbfs filesystem detector Wang Nan
2016-09-09 5:52 ` [tip:perf/core] " tip-bot for Wang Nan
2016-09-06 4:58 ` [PATCH v2 3/3] perf record: Mark MAP_HUGETLB during synthesizing mmap events Wang Nan
2016-09-09 5:52 ` [tip:perf/core] perf record: Mark MAP_HUGETLB when " tip-bot for Wang Nan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473137909-142064-2-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=houpengyang@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=nilayvaish@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®