On Thu, Sep 24, 2020 at 11:46:32PM +0900, Namhyung Kim wrote: > On Thu, Sep 24, 2020 at 03:44:44PM +0200, Jiri Olsa wrote: > > On Thu, Sep 24, 2020 at 10:20:51PM +0900, Namhyung Kim wrote: > > > On Thu, Sep 24, 2020 at 10:09 PM Jiri Olsa <jo...@redhat.com> wrote: > > > > > > > > On Wed, Sep 23, 2020 at 05:05:34PM +0900, Namhyung Kim wrote: > > > > > > > > SNIP > > > > > > > > > -static inline int is_no_dso_memory(const char *filename) > > > > > -{ > > > > > - return !strncmp(filename, "[stack", 6) || > > > > > - !strncmp(filename, "/SYSV",5) || > > > > > - !strcmp(filename, "[heap]"); > > > > > -} > > > > > - > > > > > static inline int is_android_lib(const char *filename) > > > > > { > > > > > return strstarts(filename, "/data/app-lib/") || > > > > > @@ -158,7 +143,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, flags); > > > > > + anon = is_anon_memory(filename) || flags & MAP_HUGETLB; > > > > > > > > what's the reason to take 'flags & MAP_HUGETLB' out of is_anon_memory? > > > > > > The MAP_HUGETLB is defined in uapi/linux/mman.h and I had trouble > > > when including the header in the map.h file. > > > > could you share the error? it might be corner case, but it > > could bite us in future > > Sure. > > CC util/session.o > In file included from > /home/namhyung/project/linux/tools/include/uapi/asm-generic/mman-common-tools.h:5, > from > /home/namhyung/project/linux/tools/include/uapi/asm-generic/mman.h:5, > from > /home/namhyung/project/linux/tools/arch/x86/include/uapi/asm/mman.h:5, > from > /home/namhyung/project/linux/tools/include/uapi/linux/mman.h:5, > from util/map.h:13, > from util/session.c:21: > /home/namhyung/project/linux/tools/include/uapi/asm-generic/mman-common.h:26: > error: "MAP_POPULATE" redefined [-Werror] > 26 | #define MAP_POPULATE 0x008000 /* populate (prefault) pagetables */ > | > In file included from /usr/include/x86_64-linux-gnu/bits/mman.h:31, > from /usr/include/x86_64-linux-gnu/sys/mman.h:41, > from util/session.c:12: > /usr/include/x86_64-linux-gnu/bits/mman-map-flags-generic.h:34: note: this is > the location of the previous definition > 34 | # define MAP_POPULATE 0x08000 /* Populate (prefault) pagetables. */ > | > > This is repeated for each macro definitions..
hm, some black magic happened in the past and it looks like now we can't have <sys/mman.h> and <linux/mman.h> includes together it looks related to this commit: be709d48329a tools headers uapi: Sync asm-generic/mman-common.h and linux/mman.h I'm not sure I understand the purpose of asm-generic/mman-common-tools.h file Arnaldo, any chance you might have some quick solution before I dive in? you can reproduce the issue with change below thanks, jirka --- diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index b1c0686db1b7..a0b0281d8eab 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -10,6 +10,7 @@ #include <string.h> #include <stdbool.h> #include <linux/types.h> +#include <sys/mman.h>