perf tools: Do hugetlb handling in more systems
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: fbef103fad5009827965b10aedbecb1786904f4d Gitweb: http://git.kernel.org/tip/fbef103fad5009827965b10aedbecb1786904f4d Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 12 Sep 2016 16:47:57 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 13 Sep 2016 15:26:30 -0300
perf tools: Do hugetlb handling in more systems
The csets:
0ac3348e5024 ("perf tools: Recognize hugetlb mapping as anon mapping") d7e404af115b ("perf record: Mark MAP_HUGETLB when synthesizing mmap events")
Added code conditional on MAP_HUGETLB, to make it build in older systems where that define wasn't available. Now that we grabbed copies of uapi/linux/mmap.h to have all those definitions in tools/, use it so that we can support building the tools for older systems (without the MAP_HUGETLB define in its libc headers) using new kernels that support such maps.
Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Cc Zefan Li <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/event.c | 7 ++----- tools/perf/util/map.c | 9 ++------- 2 files changed, 4 insertions(+), 12 deletions(-)
tools/perf/util/event.c +2 -5
@@ -1,5 +1,5 @@#include <linux/types.h> -#include <sys/mman.h> +#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */ #include <api/fs/fs.h> #include "event.h" #include "debug.h"
@@ -249,10 +249,8 @@ 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 ;
@@ -347,12 +345,11 @@ 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);
tools/perf/util/map.c +2 -7
@@ -6,7 +6,7 @@#include <string.h> #include <stdio.h> #include <unistd.h> -#include <sys/mman.h> +#include <uapi/linux/mman.h> /* To get things like MAP_HUGETLB even on older libc headers */ #include "map.h" #include "thread.h" #include "strlist.h"
@@ -27,12 +27,7 @@ const char *map_type__name[MAP__NR_TYPES] = {static inline int is_anon_memory (const char *filename,u32 flags) { -u32 anon_flags =0 ; - -#ifdef MAP_HUGETLB - anon_flags |=MAP_HUGETLB ; -#endif -return flags & anon_flags || +return flags &MAP_HUGETLB || !strcmp (filename,"//anon" ) || !strncmp (filename,"/dev/zero" ,sizeof ("/dev/zero" ) -1 ) || !strncmp (filename,"/anon_hugepage" ,sizeof ("/anon_hugepage" ) -1 );