If number of CPUs is increased up to 2048, it will push available pages above 16Mb range and make smap/pku/pks tests fail with 'Could not reserve memory' error. Move pages used by tests to 32Mb to fix it. Signed-off-by: Igor Mammedov --- x86/pks.c | 2 +- x86/pku.c | 2 +- x86/smap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/x86/pks.c b/x86/pks.c index f4d6ac83..9b9519ba 100644 --- a/x86/pks.c +++ b/x86/pks.c @@ -6,7 +6,7 @@ #include "x86/msr.h" #define PTE_PKEY_BIT 59 -#define SUPER_BASE (1 << 23) +#define SUPER_BASE (2 << 24) #define SUPER_VAR(v) (*((__typeof__(&(v))) (((unsigned long)&v) + SUPER_BASE))) volatile int pf_count = 0; diff --git a/x86/pku.c b/x86/pku.c index 6c0d72cc..544c6f24 100644 --- a/x86/pku.c +++ b/x86/pku.c @@ -6,7 +6,7 @@ #include "x86/msr.h" #define PTE_PKEY_BIT 59 -#define USER_BASE (1 << 23) +#define USER_BASE (2 << 24) #define USER_VAR(v) (*((__typeof__(&(v))) (((unsigned long)&v) + USER_BASE))) volatile int pf_count = 0; diff --git a/x86/smap.c b/x86/smap.c index 9a823a55..53c9f4ce 100644 --- a/x86/smap.c +++ b/x86/smap.c @@ -45,7 +45,7 @@ asm ("pf_tss:\n" "jmp pf_tss\n\t"); -#define USER_BASE (1 << 23) +#define USER_BASE (2 << 24) #define USER_VAR(v) (*((__typeof__(&(v))) (((unsigned long)&v) + USER_BASE))) #define USER_ADDR(v) ((void *)((unsigned long)(&v) + USER_BASE)) -- 2.47.1