Skip to content

L
linux
Commit e4a4ba41 authored by Dev Jain's avatar Dev Jain Committed by Andrew Morton
Browse files
Options

selftests/mm: va_high_addr_switch: dynamically initialize testcases to enable LPA2 testing 

Post FEAT_LPA2, the Aarch64 Linux kernel extends higher address support to
4K and 16K translation granules.  To support testing this out, we need to
do away with static initialization of page size, while still maintaining
the nice array of testcases; this can be achieved by initializing and
populating the array as a stack variable, and filling in the page size and
hugepage size at runtime.

Link: https://lkml.kernel.org/r/20240522070435.773918-3-dev.jain@arm.comSigned-off-by: default avatarDev Jain <dev.jain@arm.com>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 85e8bcb4
Show whitespace changes
Inline Side-by-side
Showing with 232 additions and 222 deletions
tools/testing/selftests/mm/va_high_addr_switch.c
View file @ e4a4ba41
...@@ -9,26 +9,9 @@ ...@@ -9,26 +9,9 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <string.h> #include <string.h>
#include "vm_util.h"
#include "../kselftest.h" #include "../kselftest.h"
#ifdef __powerpc64__
#define PAGE_SIZE (64 << 10)
/*
* This will work with 16M and 2M hugepage size
*/
#define HUGETLB_SIZE (16 << 20)
#elif __aarch64__
/*
* The default hugepage size for 64k base pagesize
* is 512MB.
*/
#define PAGE_SIZE (64 << 10)
#define HUGETLB_SIZE (512 << 20)
#else
#define PAGE_SIZE (4 << 10)
#define HUGETLB_SIZE (2 << 20)
#endif
/* /*
* The hint addr value is used to allocate addresses * The hint addr value is used to allocate addresses
* beyond the high address switch boundary. * beyond the high address switch boundary.
...@@ -37,18 +20,8 @@ ...@@ -37,18 +20,8 @@
#define ADDR_MARK_128TB (1UL << 47) #define ADDR_MARK_128TB (1UL << 47)
#define ADDR_MARK_256TB (1UL << 48) #define ADDR_MARK_256TB (1UL << 48)
#define HIGH_ADDR_128TB ((void *) (1UL << 48)) #define HIGH_ADDR_128TB (1UL << 48)
#define HIGH_ADDR_256TB ((void *) (1UL << 49)) #define HIGH_ADDR_256TB (1UL << 49)
#define LOW_ADDR ((void *) (1UL << 30))
#ifdef __aarch64__
#define ADDR_SWITCH_HINT ADDR_MARK_256TB
#define HIGH_ADDR HIGH_ADDR_256TB
#else
#define ADDR_SWITCH_HINT ADDR_MARK_128TB
#define HIGH_ADDR HIGH_ADDR_128TB
#endif
struct testcase { struct testcase {
void *addr; void *addr;
...@@ -59,16 +32,39 @@ struct testcase { ...@@ -59,16 +32,39 @@ struct testcase {
unsigned int keep_mapped:1; unsigned int keep_mapped:1;
}; };
static struct testcase testcases[] = { static struct testcase *testcases;
static struct testcase *hugetlb_testcases;
static int sz_testcases, sz_hugetlb_testcases;
static unsigned long switch_hint;
/* Initialize testcases inside a function to compute parameters at runtime */
void testcases_init(void)
{
unsigned long pagesize = getpagesize();
unsigned long hugepagesize = default_huge_page_size();
unsigned long low_addr = (1UL << 30);
unsigned long addr_switch_hint = ADDR_MARK_128TB;
unsigned long high_addr = HIGH_ADDR_128TB;
#ifdef __aarch64__
/* Post LPA2, the lower userspace VA on a 16K pagesize is 47 bits. */
if (pagesize != (16UL << 10)) {
addr_switch_hint = ADDR_MARK_256TB;
high_addr = HIGH_ADDR_256TB;
}
#endif
struct testcase t[] = {
{ {
/* /*
* If stack is moved, we could possibly allocate * If stack is moved, we could possibly allocate
* this at the requested address. * this at the requested address.
*/ */
.addr = ((void *)(ADDR_SWITCH_HINT - PAGE_SIZE)), .addr = ((void *)(addr_switch_hint - pagesize)),
.size = PAGE_SIZE, .size = pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE, PAGE_SIZE)", .msg = "mmap(addr_switch_hint - pagesize, pagesize)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
...@@ -78,10 +74,10 @@ static struct testcase testcases[] = { ...@@ -78,10 +74,10 @@ static struct testcase testcases[] = {
* beyond high address switch boundary in this case. Instead, * beyond high address switch boundary in this case. Instead,
* a suitable allocation is found in lower address space. * a suitable allocation is found in lower address space.
*/ */
.addr = ((void *)(ADDR_SWITCH_HINT - PAGE_SIZE)), .addr = ((void *)(addr_switch_hint - pagesize)),
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE, (2 * PAGE_SIZE))", .msg = "mmap(addr_switch_hint - pagesize, (2 * pagesize))",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
...@@ -89,165 +85,177 @@ static struct testcase testcases[] = { ...@@ -89,165 +85,177 @@ static struct testcase testcases[] = {
* Exact mapping at high address switch boundary, should * Exact mapping at high address switch boundary, should
* be obtained even without MAP_FIXED as area is free. * be obtained even without MAP_FIXED as area is free.
*/ */
.addr = ((void *)(ADDR_SWITCH_HINT)), .addr = ((void *)(addr_switch_hint)),
.size = PAGE_SIZE, .size = pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT, PAGE_SIZE)", .msg = "mmap(addr_switch_hint, pagesize)",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT), .addr = (void *)(addr_switch_hint),
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, .flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
.msg = "mmap(ADDR_SWITCH_HINT, 2 * PAGE_SIZE, MAP_FIXED)", .msg = "mmap(addr_switch_hint, 2 * pagesize, MAP_FIXED)",
}, },
{ {
.addr = NULL, .addr = NULL,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(NULL)", .msg = "mmap(NULL)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
.addr = LOW_ADDR, .addr = (void *)low_addr,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(LOW_ADDR)", .msg = "mmap(low_addr)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(HIGH_ADDR)", .msg = "mmap(high_addr)",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(HIGH_ADDR) again", .msg = "mmap(high_addr) again",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, .flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
.msg = "mmap(HIGH_ADDR, MAP_FIXED)", .msg = "mmap(high_addr, MAP_FIXED)",
}, },
{ {
.addr = (void *) -1, .addr = (void *) -1,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(-1)", .msg = "mmap(-1)",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = (void *) -1, .addr = (void *) -1,
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(-1) again", .msg = "mmap(-1) again",
}, },
{ {
.addr = ((void *)(ADDR_SWITCH_HINT - PAGE_SIZE)), .addr = ((void *)(addr_switch_hint - pagesize)),
.size = PAGE_SIZE, .size = pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE, PAGE_SIZE)", .msg = "mmap(addr_switch_hint - pagesize, pagesize)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT - PAGE_SIZE), .addr = (void *)(addr_switch_hint - pagesize),
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE, 2 * PAGE_SIZE)", .msg = "mmap(addr_switch_hint - pagesize, 2 * pagesize)",
.low_addr_required = 1, .low_addr_required = 1,
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT - PAGE_SIZE / 2), .addr = (void *)(addr_switch_hint - pagesize / 2),
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE/2 , 2 * PAGE_SIZE)", .msg = "mmap(addr_switch_hint - pagesize/2 , 2 * pagesize)",
.low_addr_required = 1, .low_addr_required = 1,
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = ((void *)(ADDR_SWITCH_HINT)), .addr = ((void *)(addr_switch_hint)),
.size = PAGE_SIZE, .size = pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT, PAGE_SIZE)", .msg = "mmap(addr_switch_hint, pagesize)",
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT), .addr = (void *)(addr_switch_hint),
.size = 2 * PAGE_SIZE, .size = 2 * pagesize,
.flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, .flags = MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
.msg = "mmap(ADDR_SWITCH_HINT, 2 * PAGE_SIZE, MAP_FIXED)", .msg = "mmap(addr_switch_hint, 2 * pagesize, MAP_FIXED)",
}, },
}; };
static struct testcase hugetlb_testcases[] = { struct testcase ht[] = {
{ {
.addr = NULL, .addr = NULL,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(NULL, MAP_HUGETLB)", .msg = "mmap(NULL, MAP_HUGETLB)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
.addr = LOW_ADDR, .addr = (void *)low_addr,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(LOW_ADDR, MAP_HUGETLB)", .msg = "mmap(low_addr, MAP_HUGETLB)",
.low_addr_required = 1, .low_addr_required = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(HIGH_ADDR, MAP_HUGETLB)", .msg = "mmap(high_addr, MAP_HUGETLB)",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(HIGH_ADDR, MAP_HUGETLB) again", .msg = "mmap(high_addr, MAP_HUGETLB) again",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = HIGH_ADDR, .addr = (void *)high_addr,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
.msg = "mmap(HIGH_ADDR, MAP_FIXED | MAP_HUGETLB)", .msg = "mmap(high_addr, MAP_FIXED | MAP_HUGETLB)",
}, },
{ {
.addr = (void *) -1, .addr = (void *) -1,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(-1, MAP_HUGETLB)", .msg = "mmap(-1, MAP_HUGETLB)",
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = (void *) -1, .addr = (void *) -1,
.size = HUGETLB_SIZE, .size = hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(-1, MAP_HUGETLB) again", .msg = "mmap(-1, MAP_HUGETLB) again",
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT - PAGE_SIZE), .addr = (void *)(addr_switch_hint - pagesize),
.size = 2 * HUGETLB_SIZE, .size = 2 * hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS,
.msg = "mmap(ADDR_SWITCH_HINT - PAGE_SIZE, 2*HUGETLB_SIZE, MAP_HUGETLB)", .msg = "mmap(addr_switch_hint - pagesize, 2*hugepagesize, MAP_HUGETLB)",
.low_addr_required = 1, .low_addr_required = 1,
.keep_mapped = 1, .keep_mapped = 1,
}, },
{ {
.addr = (void *)(ADDR_SWITCH_HINT), .addr = (void *)(addr_switch_hint),
.size = 2 * HUGETLB_SIZE, .size = 2 * hugepagesize,
.flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, .flags = MAP_HUGETLB | MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED,
.msg = "mmap(ADDR_SWITCH_HINT , 2*HUGETLB_SIZE, MAP_FIXED | MAP_HUGETLB)", .msg = "mmap(addr_switch_hint , 2*hugepagesize, MAP_FIXED | MAP_HUGETLB)",
}, },
}; };
testcases = malloc(sizeof(t));
hugetlb_testcases = malloc(sizeof(ht));
/* Copy into global arrays */
memcpy(testcases, t, sizeof(t));
memcpy(hugetlb_testcases, ht, sizeof(ht));
sz_testcases = ARRAY_SIZE(t);
sz_hugetlb_testcases = ARRAY_SIZE(ht);
switch_hint = addr_switch_hint;
}
static int run_test(struct testcase *test, int count) static int run_test(struct testcase *test, int count)
{ {
...@@ -267,7 +275,7 @@ static int run_test(struct testcase *test, int count) ...@@ -267,7 +275,7 @@ static int run_test(struct testcase *test, int count)
continue; continue;
} }
if (t->low_addr_required && p >= (void *)(ADDR_SWITCH_HINT)) { if (t->low_addr_required && p >= (void *)(switch_hint)) {
printf("FAILED\n"); printf("FAILED\n");
ret = KSFT_FAIL; ret = KSFT_FAIL;
} else { } else {
...@@ -292,7 +300,7 @@ static int supported_arch(void) ...@@ -292,7 +300,7 @@ static int supported_arch(void)
#elif defined(__x86_64__) #elif defined(__x86_64__)
return 1; return 1;
#elif defined(__aarch64__) #elif defined(__aarch64__)
return getpagesize() == PAGE_SIZE; return 1;
#else #else
return 0; return 0;
#endif #endif
...@@ -305,8 +313,10 @@ int main(int argc, char **argv) ...@@ -305,8 +313,10 @@ int main(int argc, char **argv)
if (!supported_arch()) if (!supported_arch())
return KSFT_SKIP; return KSFT_SKIP;
ret = run_test(testcases, ARRAY_SIZE(testcases)); testcases_init();
ret = run_test(testcases, sz_testcases);
if (argc == 2 && !strcmp(argv[1], "--run-hugetlb")) if (argc == 2 && !strcmp(argv[1], "--run-hugetlb"))
ret = run_test(hugetlb_testcases, ARRAY_SIZE(hugetlb_testcases)); ret = run_test(hugetlb_testcases, sz_hugetlb_testcases);
return ret; return ret;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7