From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org,
wangnan0@huawei.com, mingo@kernel.org, lizefan@huawei.com,
nilayvaish@gmail.com, hpa@zytor.com, acme@redhat.com,
hekuang@huawei.com, houpengyang@huawei.com
Subject: [tip:perf/core] perf record: Mark MAP_HUGETLB when synthesizing mmap events
Date: Thu, 8 Sep 2016 22:52:38 -0700 [thread overview]
Message-ID: <tip-d7e404af115bb4996afa4a0236020969ab007554@git.kernel.org> (raw)
In-Reply-To: <1473137909-142064-4-git-send-email-wangnan0@huawei.com>
Commit-ID: d7e404af115bb4996afa4a0236020969ab007554
Gitweb: http://git.kernel.org/tip/d7e404af115bb4996afa4a0236020969ab007554
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Tue, 6 Sep 2016 04:58:29 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 8 Sep 2016 12:36:01 -0300
perf record: Mark MAP_HUGETLB when synthesizing mmap events
When synthesizing mmap events, add MAP_HUGETLB map flag if the source of
mapping is file in hugetlbfs.
After this patch, perf can identify hugetlb mapping even if perf is
started after the mapping of huge pages (like with 'perf top').
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Reviewed-by: Nilay Vaish <nilayvaish@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Hou Pengyang <houpengyang@huawei.com>
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/r/1473137909-142064-4-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/event.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 9ad7d32..6c30171 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -1,5 +1,6 @@
#include <linux/types.h>
#include <sys/mman.h>
+#include <api/fs/fs.h>
#include "event.h"
#include "debug.h"
#include "hist.h"
@@ -248,6 +249,10 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
bool truncation = false;
unsigned long long timeout = proc_map_timeout * 1000000ULL;
int rc = 0;
+#ifdef MAP_HUGETLB
+ const char *hugetlbfs_mnt = hugetlbfs__mountpoint();
+ int hugetlbfs_mnt_len = hugetlbfs_mnt ? strlen(hugetlbfs_mnt) : 0;
+#endif
if (machine__is_default_guest(machine))
return 0;
@@ -342,6 +347,12 @@ out:
if (!strcmp(execname, ""))
strcpy(execname, anonstr);
+#ifdef MAP_HUGETLB
+ if (!strncmp(execname, hugetlbfs_mnt, hugetlbfs_mnt_len)) {
+ strcpy(execname, anonstr);
+ event->mmap2.flags |= MAP_HUGETLB;
+ }
+#endif
size = strlen(execname) + 1;
memcpy(event->mmap2.filename, execname, size);
prev parent reply other threads:[~2016-09-09 5:52 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: Recognize hugetlb mapping as anon mapping Wang Nan
2016-09-06 4:58 ` [PATCH v2 1/3] perf tools: " Wang Nan
2016-09-09 5:51 ` [tip:perf/core] " 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-bot for Wang Nan [this message]
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=tip-d7e404af115bb4996afa4a0236020969ab007554@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=hekuang@huawei.com \
--cc=houpengyang@huawei.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mingo@kernel.org \
--cc=nilayvaish@gmail.com \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.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;
as well as URLs for NNTP newsgroup(s).