perf tools: Fix LIBNUMA build with glibc 2.12 and older.
PATCH 1/1 perf tools: Fix LIBNUMA build with glibc 2.12 and older.
The tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE are not available with glibc 2.12 and older. Define these tokens if they are not already defined.
This patch fixes these build errors with older versions of glibc.
CC bench/numa.obench/numa.c: In function ‘alloc_data’:bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function) bench/numa.c:334: error: (Each undeclared identifier is reported only once bench/numa.c:334: error: for each function it appears in.) bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)
make: *** [bench/numa.o] Error 1
--- tools/perf/bench/bench.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
tools/perf/bench/bench.h +7 -0
@@ -1,6 +1,13 @@#ifndef BENCH_H #define BENCH_H +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 15 +#endif +extern int bench_numa (int argc,const char **argv,const char *prefix);extern int bench_sched_messaging (int argc,const char **argv,const char *prefix);extern int bench_sched_pipe (int argc,const char **argv,const char *prefix);
Signature · 1 line
1.7.0.4
Quoted 31 lines · Vinson Lee
The tokens
MADV_HUGEPAGEandMADV_NOHUGEPAGEare not available with glibc 2.12 and older. Define these tokens if they are not already defined.This patch fixes these build errors with older versions of glibc.
CC
bench/numa.obench/numa.c: In function ???alloc_data???:bench/numa.c:334: error: ???MADV_HUGEPAGE??? undeclared (first use in this function)bench/numa.c:334: error: (Each undeclared identifier is reported only oncebench/numa.c:334: error: for each function it appears in.)bench/numa.c:341: error: ???MADV_NOHUGEPAGE??? undeclared (first use in this function)
make: *** [bench/numa.o] Error 1Signed-off-by Vinson Lee <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Ingo Molnar <[email protected]>Cc Irina Tirdea <[email protected]>Cc Paul Mackerras <[email protected]>Cc Pekka Enberg <[email protected]>Cc Peter Zijlstra <[email protected]>--- tools/perf/bench/bench.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)tools/perf/bench/bench.h +0
-0
tools/perf/bench/bench.h line 9
Quoted 9 lines
tools/perf/bench/bench.h +6
-0@@ -1,6 +1,13 @@#ifndef BENCH_H #define BENCH_H +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 15 +#endif
Can we ignore Parisc which goes outside the asm-generic values of 14/15 and defines these as 67/68?
On Parisc 14 is MADV_16K_PAGES, 15 is unused.
Could we include <uapi/asm/mman.h> instead?
Thanks,
Ingo
Quoted 47 lines · Ingo Molnar
Quoted 31 lines · Vinson Lee
The tokens
MADV_HUGEPAGEandMADV_NOHUGEPAGEare not available with glibc 2.12 and older. Define these tokens if they are not already defined.This patch fixes these build errors with older versions of glibc.
CC
bench/numa.obench/numa.c: In function ???alloc_data???:bench/numa.c:334: error: ???MADV_HUGEPAGE??? undeclared (first use in this function)bench/numa.c:334: error: (Each undeclared identifier is reported only oncebench/numa.c:334: error: for each function it appears in.)bench/numa.c:341: error: ???MADV_NOHUGEPAGE??? undeclared (first use in this function)
make: *** [bench/numa.o] Error 1Signed-off-by Vinson Lee <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Ingo Molnar <[email protected]>Cc Irina Tirdea <[email protected]>Cc Paul Mackerras <[email protected]>Cc Pekka Enberg <[email protected]>Cc Peter Zijlstra <[email protected]>--- tools/perf/bench/bench.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)tools/perf/bench/bench.h +0
-0tools/perf/bench/bench.h line 9
Quoted 9 lines
tools/perf/bench/bench.h +6
-0@@ -1,6 +1,13 @@#ifndef BENCH_H #define BENCH_H +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 15 +#endif Can we ignore Parisc which goes outside the asm-generic values of 14/15 and defines these as 67/68?
Quoted 7 lines
On Parisc 14 is
MADV_16K_PAGES, 15 is unused.Could we include <
uapi/asm/mman.h> instead?Thanks,
Ingo
Including <uapi/asm/mman.h> in bench/numa.c also fixes the LIBNUMA build for me only with WERROR=0. It adds many redefined warnings of symbols from <sys/mman.h> such as MAP_GROWSDOWN, MAP_DENYWRITE, MAP_EXECUTABLE. The header <sys/mman.h> cannot be removed as it is needed for mmap.
PATCH v2 1/1 perf tools: Fix LIBNUMA build with glibc 2.12 and older.
This follow-up patch adds tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE for Parisc, which has different values from other architectures.
Vinson Lee (1):
perf tools: Fix LIBNUMA build with glibc 2.12 and older.
tools/perf/bench/bench.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
PATCH v2 1/1 perf tools: Fix LIBNUMA build with glibc 2.12 and older.
The tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE are not available with glibc 2.12 and older. Define these tokens if they are not already defined.
This patch fixes these build errors with older versions of glibc.
CC bench/numa.obench/numa.c: In function ‘alloc_data’:bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function) bench/numa.c:334: error: (Each undeclared identifier is reported only once bench/numa.c:334: error: for each function it appears in.) bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)
make: *** [bench/numa.o] Error 1
--- tools/perf/bench/bench.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
tools/perf/bench/bench.h +16 -0
@@ -1,6 +1,22 @@#ifndef BENCH_H #define BENCH_H +#ifdef __hppa__ +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 67 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 68 +#endif +#else +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 15 +#endif +#endif +extern int bench_numa (int argc,const char **argv,const char *prefix);extern int bench_sched_messaging (int argc,const char **argv,const char *prefix);extern int bench_sched_pipe (int argc,const char **argv,const char *prefix);
Signature · 1 line
1.7.0.4
Quoted 38 lines · Vinson Lee
The tokens
MADV_HUGEPAGEandMADV_NOHUGEPAGEare not available with glibc 2.12 and older. Define these tokens if they are not already defined.This patch fixes these build errors with older versions of glibc.
CC
bench/numa.obench/numa.c: In function ???alloc_data???:bench/numa.c:334: error: ???MADV_HUGEPAGE??? undeclared (first use in this function)bench/numa.c:334: error: (Each undeclared identifier is reported only oncebench/numa.c:334: error: for each function it appears in.)bench/numa.c:341: error: ???MADV_NOHUGEPAGE??? undeclared (first use in this function)
make: *** [bench/numa.o] Error 1Signed-off-by Vinson Lee <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Ingo Molnar <[email protected]>Cc Irina Tirdea <[email protected]>Cc Paul Mackerras <[email protected]>Cc Pekka Enberg <[email protected]>Cc Peter Zijlstra <[email protected]>--- tools/perf/bench/bench.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)tools/perf/bench/bench.h +5
-0@@ -1,6 +1,22 @@#ifndef BENCH_H #define BENCH_H +#ifdef __hppa__ +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 67 +#endif +#ifndef MADV_NOHUGEPAGE
tools/perf/bench/bench.h line 18
Quoted 10 lines
tools/perf/bench/bench.h +10
-0+#define MADV_NOHUGEPAGE 68 +#endif +#else +#ifndef MADV_HUGEPAGE +#define MADV_HUGEPAGE 14 +#endif +#ifndef MADV_NOHUGEPAGE +#define MADV_NOHUGEPAGE 15 +#endif +#endif
This looks good to me. Two minor stylistic nits:
- I think we want a short comment explaining what it's about, that this is for old glibc and that hppa messed up its madvise() constants and needs a non-generic kludge.
- for such multi-level #ifdef blocks we generally prefer this more readable form:
#ifdef __hppa__
# ifndef MADV_HUGEPAGE # define MADV_HUGEPAGE 67 # endif # ifndef MADV_NOHUGEPAGE # define MADV_NOHUGEPAGE 68 # endif #else # ifndef MADV_HUGEPAGE # define MADV_HUGEPAGE 14 # endif # ifndef MADV_NOHUGEPAGE # define MADV_NOHUGEPAGE 15 # endif #endif
Thanks,
Ingo
PATCH v3 1/1 perf tools: Fix LIBNUMA build with glibc 2.12 and older.
Updated patch after Ingo Molnar's feedback.
- Added comments about glibc compatibility and PA-RISC special case.
- Made #ifdef blocks multi-level.
Vinson Lee (1):
perf tools: Fix LIBNUMA build with glibc 2.12 and older.
tools/perf/bench/bench.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
PATCH v3 1/1 perf tools: Fix LIBNUMA build with glibc 2.12 and older.
The tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE are not available with glibc 2.12 and older. Define these tokens if they are not already defined.
This patch fixes these build errors with older versions of glibc.
CC bench/numa.obench/numa.c: In function ‘alloc_data’:bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function) bench/numa.c:334: error: (Each undeclared identifier is reported only once bench/numa.c:334: error: for each function it appears in.) bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)
make: *** [bench/numa.o] Error 1
--- tools/perf/bench/bench.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)
tools/perf/bench/bench.h +24 -0
@@ -1,6 +1,30 @@#ifndef BENCH_H #define BENCH_H +/* +* The madvise transparent hugepage constants were added in glibc +* 2.13. For compatibility with older versions of glibc, define these +* tokens if they are not already defined. +* +* PA-RISC uses different madvise values from other architectures and +* needs to be special-cased. +*/ +#ifdef __hppa__ +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 67 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 68 +# endif +#else +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 14 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 15 +# endif +#endif +extern int bench_numa (int argc,const char **argv,const char *prefix);extern int bench_sched_messaging (int argc,const char **argv,const char *prefix);extern int bench_sched_pipe (int argc,const char **argv,const char *prefix);
Signature · 1 line
1.7.0.4
Quoted 46 lines · Vinson Lee
The tokens
MADV_HUGEPAGEandMADV_NOHUGEPAGEare not available with glibc 2.12 and older. Define these tokens if they are not already defined.This patch fixes these build errors with older versions of glibc.
CC
bench/numa.obench/numa.c: In function ???alloc_data???:bench/numa.c:334: error: ???MADV_HUGEPAGE??? undeclared (first use in this function)bench/numa.c:334: error: (Each undeclared identifier is reported only oncebench/numa.c:334: error: for each function it appears in.)bench/numa.c:341: error: ???MADV_NOHUGEPAGE??? undeclared (first use in this function)
make: *** [bench/numa.o] Error 1Signed-off-by Vinson Lee <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Ingo Molnar <[email protected]>Cc Irina Tirdea <[email protected]>Cc Paul Mackerras <[email protected]>Cc Pekka Enberg <[email protected]>Cc Peter Zijlstra <[email protected]>--- tools/perf/bench/bench.h | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-)tools/perf/bench/bench.h +13
-0@@ -1,6 +1,30 @@#ifndef BENCH_H #define BENCH_H +/* +* The madvise transparent hugepage constants were added in glibc +* 2.13. For compatibility with older versions of glibc, define these +* tokens if they are not already defined. +* +* PA-RISC uses different madvise values from other architectures and +* needs to be special-cased. +*/ +#ifdef __hppa__ +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 67 +# endif +# ifndef MADV_NOHUGEPAGE
tools/perf/bench/bench.h line 26
Quoted 10 lines
tools/perf/bench/bench.h +10
-0+# define MADV_NOHUGEPAGE 68 +# endif +#else +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 14 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 15 +# endif +#endif
Thanks!
Arnaldo, will you be picking this up for perf/urgent, or should I?
Thanks,
Ingo
tip-bot for Vinson Lee
merge botperf tools: Fix LIBNUMA build with glibc 2.12 and older.
Commit-ID: d1398ccfec56e54010476efd6a316427d29045a6 Gitweb: http://git.kernel.org/tip/d1398ccfec56e54010476efd6a316427d29045a6 Author: Vinson Lee <[email protected]> AuthorDate: Wed, 13 Mar 2013 15:34:24 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 14 Mar 2013 08:06:21 -0300
perf tools: Fix LIBNUMA build with glibc 2.12 and older.
The tokens MADV_HUGEPAGE and MADV_NOHUGEPAGE are not available with glibc 2.12 and older. Define these tokens if they are not already defined.
This patch fixes these build errors with older versions of glibc.
CC bench/numa.obench/numa.c: In function ‘alloc_data’:bench/numa.c:334: error: ‘MADV_HUGEPAGE’ undeclared (first use in this function) bench/numa.c:334: error: (Each undeclared identifier is reported only once bench/numa.c:334: error: for each function it appears in.) bench/numa.c:341: error: ‘MADV_NOHUGEPAGE’ undeclared (first use in this function)
make: *** [bench/numa.o] Error 1
--- tools/perf/bench/bench.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
tools/perf/bench/bench.h +24 -0
@@ -1,6 +1,30 @@#ifndef BENCH_H #define BENCH_H +/* +* The madvise transparent hugepage constants were added in glibc +* 2.13. For compatibility with older versions of glibc, define these +* tokens if they are not already defined. +* +* PA-RISC uses different madvise values from other architectures and +* needs to be special-cased. +*/ +#ifdef __hppa__ +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 67 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 68 +# endif +#else +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 14 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 15 +# endif +#endif +extern int bench_numa (int argc,const char **argv,const char *prefix);extern int bench_sched_messaging (int argc,const char **argv,const char *prefix);extern int bench_sched_pipe (int argc,const char **argv,const char *prefix);