lib: extend .request_hugepages to guarantee enough pages
RFC PATCH 1/3 lib: extend .request_hugepages to guarantee enough pages
This is to satisfy some tests which need to reserved hugepage precisely for using, with eliminating other process side effects at the same time.
For example, if there are 'N' (N > 1) hpages reserved but all occupying. New '.request_hugepage = 1' in another test will only save the N and do echo 1 into hugetlbfs. That obviously may cause problems during test run.
Here, we introduce two policies to make hugepage reserve work fit for more requirements but no need to care about details.
--- doc/c-test-api.txt | 33 +++++++++++++++++++-------- include/tst_hugepage.h | 12 +++++++++- include/tst_test.h | 27 +++++++++++++++------- lib/newlib_tests/test20.c | 13 +++++++---- lib/newlib_tests/test_zero_hugepage.c | 8 +++++-- lib/tst_hugepage.c | 22 ++++++++++++++---- 6 files changed, 86 insertions(+), 29 deletions(-)
doc/c-test-api.txt +23 -10
@@ -1976,15 +1976,25 @@ For full documentation see the comments in 'include/tst_fuzzy_sync.h'. ~~~~~~~~~~~~~~~~~~~~~~~~ Many of the LTP tests need to use hugepage in their testing, this allows the -test can reserve hugepages from system only via '.request_hugepages = xx'. +test can reserve hugepages from system only via '.request_hugepages'. -If set non-zero number of 'request_hugepages', test will try to reserve the -expected number of hugepage for testing in setup phase. If system does not -have enough hpage for using, it will try the best to reserve 80% available -number of hpages. With success test stores the reserved hugepage number in -'tst_hugepages'. For the system without hugetlb supporting, variable -'tst_hugepages' will be set to 0. If the hugepage number needs to be set to 0 -on supported hugetlb system, please use '.request_hugepages = TST_NO_HUGEPAGES'. +We simply achieved two policies for hugepage reserving: + +TST_FLEXIBLE: + If set non-zero number in .request_hugepages, ltp will try to reserve the + expected number of hugepage for testing in setup phase. If system does not + have enough memory for that, it will try the best to reserve 80% available + huge pages. + +TST_ENFORCED: + This is an enforced requirement for huge page reserve, ltp should strictly do + hpages applying and guarantee the 'HugePages_Free' no less than specified pages + which gives that test can use these specified numbers correctly. + +With success test stores the reserved hugepage number in 'tst_hugepages'. For +system without hugetlb supporting, variable 'tst_hugepages' will be set to 0. +If the hugepage number needs to be set to 0 on supported hugetlb system, please +use '.request_hugepages = TST_NO_HUGEPAGES'. Also, we do cleanup and restore work for the hpages resetting automatically.
@@ -1996,7 +2006,7 @@ static void run(void) { ... - if (tst_hugepages == test.request_hugepages) + if (tst_hugepages == test.request_hugepages->number) TEST(do_hpage_test); else ...
@@ -2005,7 +2015,10 @@ static void run(void) struct tst_test test = { .test_all = run, - .request_hugepages = 2, + .request_hugepages = (struct tst_hugepage []){ + {2, TST_FLEXIBLE}, + {} + }, ... }; -------------------------------------------------------------------------------
include/tst_hugepage.h +11 -1
@@ -12,6 +12,16 @@extern char *nr_opt;/* -s num Set the number of the been allocated hugepages */ extern char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */ +enum tst_hp_policy { +TST_ENFORCED , +TST_FLEXIBLE , +}; + +struct tst_hugepage { +const unsigned long number; +enum tst_hp_policy policy; +}; +/* * Get the default hugepage size. Returns 0 if hugepages are not supported. */
@@ -23,7 +33,7 @@ size_t tst_get_hugepage_size(void);* * Note: this depend on the status of system memory fragmentation. */ -unsigned long tst_request_hugepages (unsigned long hpages); +unsigned long tst_request_hugepages (struct tst_hugepage *hp);/* * This variable is used for recording the number of hugepages which system can
include/tst_test.h +19 -8
@@ -189,17 +189,28 @@ struct tst_test {unsigned long min_mem_avail;/* -* If set non-zero number of request_hugepages, test will try to reserve the -* expected number of hugepage for testing in setup phase. If system does not -* have enough hpage for using, it will try the best to reserve 80% available -* number of hpages. With success test stores the reserved hugepage number in -* 'tst_hugepages. For the system without hugetlb supporting, variable -* 'tst_hugepages' will be set to 0. If the hugepage number needs to be set to -* 0 on supported hugetlb system, please use '.request_hugepages = TST_NO_HUGEPAGES'. +* Two policies for hugepage reserving: +* +* TST_FLEXIBLE: +* If set non-zero number in .request_hugepages, ltp will try to reserve the +* expected number of hugepage for testing in setup phase. If system does not +* have enough memory for that, it will try the best to reserve 80% available +* huge pages. +* +* TST_ENFORCED: +* This is an enforced requirement for huge page reserve, ltp should strictly do +* hpages applying and guarantee the 'HugePages_Free' no less than specified pages +* which gives that test can use these specified numbers correctly. +* +* +* With success test stores the reserved hugepage number in 'tst_hugepages. For +* the system without hugetlb supporting, variable 'tst_hugepages' will be set to 0. +* If the hugepage number needs to be set to 0 on supported hugetlb system, please +* use '.request_hugepages = TST_NO_HUGEPAGES'. * * Also, we do cleanup and restore work for the hpages resetting automatically. */ -unsigned long request_hugepages; +struct tst_hugepage *request_hugepages;/* * If set to non-zero, call tst_taint_init(taint_check) during setup
lib/newlib_tests/test20.c +9 -4
@@ -18,14 +18,16 @@ static void do_test(void) {tst_res (TINFO ,"tst_hugepages = %lu" , tst_hugepages);SAFE_FILE_PRINTF ("/proc/sys/kernel/numa_balancing" ,"1" ); - hpages = test.request_hugepages; + hpages = test.request_hugepages->number;SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);else -tst_res (TPASS ,"test .needs_hugepges" ); +tst_res (TPASS ,"test .request_hugepges" ); + +struct tst_hugepage hp = {1000000000000 ,TST_FLEXIBLE }; + hpages =tst_request_hugepages (&hp); - hpages =tst_request_hugepages (3 );SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);
@@ -35,7 +37,10 @@ static void do_test(void) {static struct tst_test test = { .test_all = do_test, - .request_hugepages =2 , + .request_hugepages = (struct tst_hugepage []){ + {2 ,TST_ENFORCED }, + {} + }, .save_restore = (const struct tst_path_val []) { {"!/proc/sys/kernel/numa_balancing" ,"0" }, {}
lib/newlib_tests/test_zero_hugepage.c +6 -2
@@ -21,7 +21,8 @@ static void do_test(void)else tst_res (TPASS ,"test .request_hugepages = TST_NO_HUGEPAGES" ); - hpages =tst_request_hugepages (3 ); +struct tst_hugepage hp = {3 ,TST_FLEXIBLE }; + hpages =tst_request_hugepages (&hp);SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);
@@ -31,5 +32,8 @@ static void do_test(void)static struct tst_test test = { .test_all = do_test, - .request_hugepages =TST_NO_HUGEPAGES , + .request_hugepages = (struct tst_hugepage []){ + {TST_NO_HUGEPAGES ,TST_FLEXIBLE }, + {} + }, };
lib/tst_hugepage.c +18 -4
@@ -20,11 +20,13 @@ size_t tst_get_hugepage_size(void)return SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; } -unsigned long tst_request_hugepages (unsigned long hpages) +unsigned long tst_request_hugepages (struct tst_hugepage *hp) {unsigned long val, max_hpages;if (access (PATH_HUGEPAGES ,F_OK )) { +if (hp->policy ==TST_ENFORCED ) +tst_brk (TCONF ,"hugetlbfs is not supported" ); tst_hugepages =0 ; goto out; }
@@ -32,16 +34,20 @@ unsigned long tst_request_hugepages(unsigned long hpages)if (nr_opt) tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX );else - tst_hugepages = hpages; + tst_hugepages = hp->number; -if (hpages ==TST_NO_HUGEPAGES ) { +if (hp->number ==TST_NO_HUGEPAGES ) { tst_hugepages =0 ; goto set_hugepages; }SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); - max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" ); +if (hp->policy ==TST_ENFORCED ) { + tst_hugepages +=SAFE_READ_MEMINFO ("HugePages_Total:" ); + goto set_hugepages; + } + max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" );if (tst_hugepages > max_hpages) { tst_res(TINFO, "Requested number(%lu) of hugepages is too large, " "limiting to 80%% of the max hugepage count %lu",
@@ -61,6 +67,14 @@ set_hugepages:"Not enough hugepages for testing." , val, tst_hugepages); +if (hp->policy ==TST_ENFORCED ) { +unsigned long free_hpages =SAFE_READ_MEMINFO ("HugePages_Free:" ); +if (hp->number > free_hpages) +tst_brk (TCONF ,"free_hpages = %lu, but expect %lu. " +"Not enough hugepages for testing." , + free_hpages, hp->number); + } +tst_res (TINFO ,"%lu hugepage(s) reserved" , tst_hugepages); out:return tst_hugepages;
Signature · 5 lines
2.35.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
RFC PATCH 2/3 memfd_create03: make use of new .request_hugepages
To get rid of some failures like:
memfd_create03.c:179: TINFO: --TESTING PAGE SIZE OF CREATED FILE-- memfd_create03.c:184: TINFO: memfd_create() succeeded memfd_create03.c:47: TBROK: mmap((nil),1048576,2,2,3,0) failed: ENOMEM (12)
--- .../syscalls/memfd_create/memfd_create03.c | 77 ++----------------- 1 file changed, 7 insertions(+), 70 deletions(-)
testcases/kernel/syscalls/memfd_create/memfd_create03.c +7 -70
@@ -32,14 +32,6 @@#include <stdio.h> #include <errno.h> -#define TOTAL_HP_PATH "/proc/sys/vm/nr_hugepages" -#define MEMINFO_PATH "/proc/meminfo" -#define FREE_HP "HugePages_Free:\t%ld" -#define DEFAULT_HPS "Hugepagesize:\t%ld kB" - -static int hugepages_allocated; -static long og_total_pages; -static void *check_huge_mmapable (int fd,unsigned long size) {void *mem;
@@ -88,7 +80,7 @@ static void test_def_pagesize(int fd)long hps;void *mem; -SAFE_FILE_LINES_SCANF (MEMINFO_PATH ,DEFAULT_HPS , &hps); + hps =SAFE_READ_MEMINFO ("Hugepagesize:" ); hps = hps <<10 ; unmap_size = hps /4 ; mem =check_huge_mmapable (fd, hps);
@@ -128,8 +120,8 @@ static void test_max_hugepages(int fd)void *mem;void *new_mem; -SAFE_FILE_LINES_SCANF (MEMINFO_PATH ,FREE_HP , &free_pages); -SAFE_FILE_LINES_SCANF (MEMINFO_PATH ,DEFAULT_HPS , &hps); + free_pages =SAFE_READ_MEMINFO ("HugePages_Free:" ); + hps =SAFE_READ_MEMINFO ("Hugepagesize:" ); hps = hps <<10 ; mem =check_huge_mmapable (fd, free_pages * hps);
@@ -188,68 +180,13 @@ static void memfd_huge_controller(unsigned int n)SAFE_CLOSE (fd); } -static void setup (void ) -{ -char buf[8 ]; -int fd; -long free_pages; -long total_pages; - -if (access (MEMINFO_PATH ,F_OK ) || -access ("/sys/kernel/mm/hugepages" ,F_OK ) || -access (TOTAL_HP_PATH ,F_OK )) -tst_brk (TCONF ,"Huge page is not supported" ); - -SAFE_FILE_LINES_SCANF (MEMINFO_PATH ,FREE_HP , &free_pages); -if (free_pages >0 ) -return ; - -SAFE_FILE_LINES_SCANF (TOTAL_HP_PATH ,"%ld" , &og_total_pages); -sprintf (buf,"%ld" , og_total_pages +1 ); - - fd =SAFE_OPEN (TOTAL_HP_PATH ,O_RDWR |O_TRUNC ); - -if (write (fd, buf,strlen (buf)) ==-1 ) -tst_brk (TCONF |TERRNO , -"write() fail: Hugepage allocation failed" ); - -SAFE_CLOSE (fd); - -SAFE_FILE_LINES_SCANF (TOTAL_HP_PATH ,"%ld" , &total_pages); -if (total_pages != (og_total_pages +1 )) -tst_brk (TCONF ,"Hugepage allocation failed" ); - - hugepages_allocated =1 ; -} - -static void cleanup (void ) -{ -char buf[8 ]; -int fd; -long total_pages; - -if (hugepages_allocated ==0 ) -return ; - -sprintf (buf,"%ld" , og_total_pages); - - fd =SAFE_OPEN (TOTAL_HP_PATH ,O_RDWR |O_TRUNC ); - -if (write (fd, buf,strlen (buf)) ==-1 ) -tst_brk (TCONF |TERRNO ,"Clean-up failed: write() failed" ); - -SAFE_CLOSE (fd); - -SAFE_FILE_LINES_SCANF (TOTAL_HP_PATH ,"%ld" , &total_pages); -if (og_total_pages != total_pages) -tst_brk (TCONF ,"Clean-up failed" ); -} -static struct tst_test test = { - .setup = setup, .test = memfd_huge_controller, .tcnt =ARRAY_SIZE (tcases), .needs_root =1 , .min_kver ="4.14" , - .cleanup = cleanup, + .request_hugepages = (struct tst_hugepage []){ + {1 ,TST_ENFORCED }, + {} + }, };
Signature · 5 lines
2.35.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
RFC PATCH 3/3 hugetlb: make use of new .request_hugepages
In reply to Li Wang--- testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c | 5 ++++- testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c | 5 ++++- testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c | 5 ++++- testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c | 8 ++++---- testcases/kernel/mem/hugetlb/hugemmap/hugemmap06.c | 7 ++++--- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c | 5 ++++- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 5 ++++- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 5 ++++- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c | 12 ++++++------ testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat05.c | 8 ++++---- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 5 ++++- testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 5 ++++- .../kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 5 ++++- testcases/kernel/syscalls/futex/futex_wake04.c | 8 ++++---- testcases/kernel/syscalls/ipc/shmget/shmget02.c | 5 ++++- testcases/kernel/syscalls/pkeys/pkey01.c | 7 +++++-- 21 files changed, 87 insertions(+), 38 deletions(-)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +4 -1
@@ -98,5 +98,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugemmap, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +4 -1
@@ -145,5 +145,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugemmap, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +4 -1
@@ -116,5 +116,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugemmap, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +4 -4
@@ -185,9 +185,6 @@ static void setup(void) {unsigned long hpages; -if (tst_hugepages !=NR_HPAGES ) -tst_brk (TCONF ,"Not enough hugepages for testing!" ); - hugepagesize =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;init_sys_sz_paths ();
@@ -307,5 +304,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_overcommit, - .request_hugepages = NR_HPAGES, + .request_hugepages = (struct tst_hugepage []){ + {NR_HPAGES ,TST_ENFORCED }, + {} + }, };
testcases/kernel/mem/hugetlb/hugemmap/hugemmap06.c +4 -3
@@ -39,8 +39,6 @@ struct mp {static void setup (void ) { -if (tst_hugepages != test.request_hugepages) -tst_brk (TCONF ,"System RAM is not enough to test." ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; }
@@ -122,7 +120,10 @@ static struct tst_test test = { .needs_tmpdir = 1, .test = do_mmap, .setup = setup, - .request_hugepages = (ARSZ + 1) * LOOP, + .request_hugepages = (struct tst_hugepage []){ + {(ARSZ +1 ) *LOOP ,TST_ENFORCED }, + {} + }, .tags = (const struct tst_tag []) { {"linux-git" ,"f522c3ac00a4" }, {"linux-git" ,"9119a41e9091" },
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +4 -1
@@ -180,5 +180,8 @@ static struct tst_test test = { .test = verify_hugeshmat, .setup = setup, .cleanup = cleanup, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +4 -1
@@ -107,5 +107,8 @@ static struct tst_test test = { .test = verify_hugeshmat, .setup = setup, .cleanup = cleanup, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +4 -1
@@ -101,5 +101,8 @@ static struct tst_test test = { .test_all = verify_hugeshmat, .setup = setup, .cleanup = cleanup, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +6 -6
@@ -83,9 +83,6 @@ static void setup(void) {long hpage_size, orig_hugepages; -if (tst_hugepages ==0 ) -tst_brk (TCONF ,"Not enough hugepages for testing." ); - orig_hugepages =get_sys_tune ("nr_hugepages" );SAFE_FILE_SCANF (PATH_SHMMAX ,"%ld" , &orig_shmmax);SAFE_FILE_PRINTF (PATH_SHMMAX ,"%ld" , (long )SIZE );
@@ -96,8 +93,8 @@ static void setup(void) hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; - hugepages = orig_hugepages +SIZE / hpage_size; -tst_request_hugepages (hugepages); +struct tst_hugepage hp = { orig_hugepages +SIZE / hpage_size,TST_FLEXIBLE }; +tst_request_hugepages (&hp);if (tst_hugepages != (unsigned long )hugepages)tst_brk (TCONF ,"No enough hugepages for testing." ); }
@@ -121,5 +118,8 @@ static struct tst_test test = { .min_mem_avail = 2048, .setup = setup, .cleanup = cleanup, - .request_hugepages = 1, + .request_hugepages = (struct tst_hugepage []){ + {1 ,TST_ENFORCED }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat05.c +4 -4
@@ -35,9 +35,6 @@ static long hpage_size;void setup (void ) { -if (tst_hugepages != test.request_hugepages) -tst_brk (TCONF ,"Not enough hugepages for testing." ); - page_size =getpagesize (); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; }
@@ -91,7 +88,10 @@ static struct tst_test test = { .needs_tmpdir = 1, .test_all = test_hugeshmat, .setup = setup, - .request_hugepages = N + 1, + .request_hugepages = (struct tst_hugepage []){ + {N +1 ,TST_ENFORCED }, + {} + }, .tags = (const struct tst_tag []) { {"linux-git" ,"091d0d55b286" }, {"linux-git" ,"af73e4d9506d" },
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +4 -1
@@ -310,5 +310,8 @@ static struct tst_test test = { .cleanup = cleanup, .test = test_hugeshmctl, .needs_checkpoints = 1, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +4 -1
@@ -110,5 +110,8 @@ static struct tst_test test = { }, .setup = setup, .cleanup = cleanup, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +4 -1
@@ -134,5 +134,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugeshmctl, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +4 -1
@@ -152,5 +152,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = hugeshmdt_test, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +4 -1
@@ -78,5 +78,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugeshmget, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +4 -1
@@ -98,5 +98,8 @@ static struct tst_test test = { .cleanup = cleanup, .test = test_hugeshmget, .tcnt = ARRAY_SIZE(tcases), - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +4 -1
@@ -96,5 +96,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugeshmget, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +4 -1
@@ -92,5 +92,8 @@ static struct tst_test test = { .setup = setup, .cleanup = cleanup, .test_all = test_hugeshmget, - .request_hugepages = 128, + .request_hugepages = (struct tst_hugepage []){ + {128 ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/syscalls/futex/futex_wake04.c +4 -4
@@ -48,9 +48,6 @@ static struct futex_test_variants variants[] = {static void setup (void ) { -if (tst_hugepages ==0 ) -tst_brk (TCONF ,"No enough hugepages for testing." ); -struct futex_test_variants *tv = &variants[tst_variant];tst_res (TINFO ,"Testing variant: %s" , tv->desc);
@@ -135,5 +132,8 @@ static struct tst_test test = { .needs_root = 1, .min_kver = "2.6.32", .needs_tmpdir = 1, - .request_hugepages = 1, + .request_hugepages = (struct tst_hugepage []){ + {1 ,TST_ENFORCED }, + {} + }, };
testcases/kernel/syscalls/ipc/shmget/shmget02.c +4 -1
@@ -148,5 +148,8 @@ static struct tst_test test = { .cleanup = cleanup, .test = do_test, .tcnt = ARRAY_SIZE(tcases), - .request_hugepages = TST_NO_HUGEPAGES, + .request_hugepages = (struct tst_hugepage []){ + {TST_NO_HUGEPAGES ,TST_FLEXIBLE }, + {} + }, };
testcases/kernel/syscalls/pkeys/pkey01.c +5 -2
@@ -52,7 +52,7 @@ static void setup(void)check_pkey_support (); -if (tst_hugepages == test.request_hugepages) +if (tst_hugepages == test.request_hugepages->number) size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;else size =getpagesize ();
@@ -221,5 +221,8 @@ static struct tst_test test = { .forks_child = 1, .test = verify_pkey, .setup = setup, - .request_hugepages = 1, + .request_hugepages = (struct tst_hugepage []){ + {1 ,TST_FLEXIBLE }, + {} + }, };
Signature · 5 lines
2.35.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Quoted 40 lines
This is to satisfy some tests which need to reserved hugepage precisely for using, with eliminating other process side effects at the same time.
For example, if there are 'N' (N > 1) hpages reserved but all occupying. New '.request_hugepage = 1' in another test will only save the N and do echo 1 into hugetlbfs. That obviously may cause problems during test run.
Here, we introduce two policies to make hugepage reserve work fit for more requirements but no need to care about details.
Signed-off-by Li Wang <[email protected]>--- doc/c-test-api.txt | 33 +++++++++++++++++++-------- include/tst_hugepage.h | 12 +++++++++- include/tst_test.h | 27 +++++++++++++++------- lib/newlib_tests/test20.c | 13 +++++++---- lib/newlib_tests/test_zero_hugepage.c | 8 +++++-- lib/tst_hugepage.c | 22 ++++++++++++++---- 6 files changed, 86 insertions(+), 29 deletions(-)doc/c-test-api.txt +3
-8@@ -1976,15 +1976,25 @@ For full documentation see the comments in 'include/tst_fuzzy_sync.h'. ~~~~~~~~~~~~~~~~~~~~~~~~ Many of the LTP tests need to use hugepage in their testing, this allows the -test can reserve hugepages from system only via '.request_hugepages = xx'. +test can reserve hugepages from system only via '.request_hugepages'. -If set non-zero number of 'request_hugepages', test will try to reserve the -expected number of hugepage for testing in setup phase. If system does not -have enough hpage for using, it will try the best to reserve 80% available -number of hpages. With success test stores the reserved hugepage number in -'tst_hugepages'. For the system without hugetlb supporting, variable -'tst_hugepages' will be set to 0. If the hugepage number needs to be set to 0 -on supported hugetlb system, please use '.request_hugepages = TST_NO_HUGEPAGES'. +We simply achieved two policies for hugepage reserving: +
doc/c-test-api.txt For full documentation see the comments in 'include/tst_fuzzy_sync.h'. · line 1992
Quoted 10 lines
doc/c-test-api.txt +10
-0+TST_FLEXIBLE: + If set non-zero number in .request_hugepages, ltp will try to reserve the + expected number of hugepage for testing in setup phase. If system does not + have enough memory for that, it will try the best to reserve 80% available + huge pages. + +TST_ENFORCED: + This is an enforced requirement for huge page reserve, ltp should strictly do + hpages applying and guarantee the 'HugePages_Free' no less than specified pages + which gives that test can use these specified numbers correctly.
As for the naming I would probably go for TST_NEEDS and TST_REQUEST. We use the word 'needs' in the tst_test to describe something that is required for the test. And 'request' sounds better to me than flexible in a sense that you can request a lot but get less than what was requested.
Quoted 86 lines
doc/c-test-api.txt +9
-2+With success test stores the reserved hugepage number in 'tst_hugepages'. For +system without hugetlb supporting, variable 'tst_hugepages' will be set to 0. +If the hugepage number needs to be set to 0 on supported hugetlb system, please +use '.request_hugepages = TST_NO_HUGEPAGES'. Also, we do cleanup and restore work for the hpages resetting automatically.@@ -1996,7 +2006,7 @@ static void run(void) { - if (tst_hugepages == test.request_hugepages) + if (tst_hugepages == test.request_hugepages->number) TEST(do_hpage_test); else@@ -2005,7 +2015,10 @@ static void run(void) struct tst_test test = { .test_all = run, - .request_hugepages = 2, + .request_hugepages = (struct tst_hugepage []){ + {2, TST_FLEXIBLE}, + {} + }, }; -------------------------------------------------------------------------------include/tst_hugepage.h +11
-1@@ -12,6 +12,16 @@extern char *nr_opt;/* -s num Set the number of the been allocated hugepages */ extern char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */ +enum tst_hp_policy { +TST_ENFORCED , +TST_FLEXIBLE , +}; + +struct tst_hugepage { +const unsigned long number; +enum tst_hp_policy policy; +}; +/* * Get the default hugepage size. Returns 0 if hugepages are not supported. */ @@ -23,7 +33,7 @@ size_t tst_get_hugepage_size(void);* * Note: this depend on the status of system memory fragmentation. */ -unsigned long tst_request_hugepages (unsigned long hpages); +unsigned long tst_request_hugepages (struct tst_hugepage *hp);/* * This variable is used for recording the number of hugepages which system can include/tst_test.h +13
-7@@ -189,17 +189,28 @@ struct tst_test {unsigned long min_mem_avail;/* -* If set non-zero number of request_hugepages, test will try to reserve the -* expected number of hugepage for testing in setup phase. If system does not -* have enough hpage for using, it will try the best to reserve 80% available -* number of hpages. With success test stores the reserved hugepage number in -* 'tst_hugepages. For the system without hugetlb supporting, variable -* 'tst_hugepages' will be set to 0. If the hugepage number needs to be set to -* 0 on supported hugetlb system, please use '.request_hugepages = TST_NO_HUGEPAGES'. +* Two policies for hugepage reserving: +* +* TST_FLEXIBLE: +* If set non-zero number in .request_hugepages, ltp will try to reserve the +* expected number of hugepage for testing in setup phase. If system does not +* have enough memory for that, it will try the best to reserve 80% available +* huge pages. +* +* TST_ENFORCED: +* This is an enforced requirement for huge page reserve, ltp should strictly do +* hpages applying and guarantee the 'HugePages_Free' no less than specified pages +* which gives that test can use these specified numbers correctly. +*
include/tst_test.h struct tst_test { · line 213
Quoted 10 lines
include/tst_test.h +6
-1+* +* With success test stores the reserved hugepage number in 'tst_hugepages. For +* the system without hugetlb supporting, variable 'tst_hugepages' will be set to 0. +* If the hugepage number needs to be set to 0 on supported hugetlb system, please +* use '.request_hugepages = TST_NO_HUGEPAGES'. * * Also, we do cleanup and restore work for the hpages resetting automatically. */ -unsigned long request_hugepages; +struct tst_hugepage *request_hugepages;
Why is this treated as an array even though we work with only single struct tst_hugepage instance?
I guess that it should rather be just:
'struct tst_hugepage request_hugepages;'
And that it should be initialized as:
.request_hugepages = {2, ...},Quoted 126 lines
include/tst_test.h +0
-0/* * If set to non-zero, call tst_taint_init(taint_check) during setup lib/newlib_tests/test20.c +9
-4@@ -18,14 +18,16 @@ static void do_test(void) {tst_res (TINFO ,"tst_hugepages = %lu" , tst_hugepages);SAFE_FILE_PRINTF ("/proc/sys/kernel/numa_balancing" ,"1" ); - hpages = test.request_hugepages; + hpages = test.request_hugepages->number;SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);else -tst_res (TPASS ,"test .needs_hugepges" ); +tst_res (TPASS ,"test .request_hugepges" ); + +struct tst_hugepage hp = {1000000000000 ,TST_FLEXIBLE }; + hpages =tst_request_hugepages (&hp); - hpages =tst_request_hugepages (3 );SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);@@ -35,7 +37,10 @@ static void do_test(void) {static struct tst_test test = { .test_all = do_test, - .request_hugepages =2 , + .request_hugepages = (struct tst_hugepage []){ + {2 ,TST_ENFORCED }, + {} + }, .save_restore = (const struct tst_path_val []) { {"!/proc/sys/kernel/numa_balancing" ,"0" }, {}lib/newlib_tests/test_zero_hugepage.c +6
-2@@ -21,7 +21,8 @@ static void do_test(void)else tst_res (TPASS ,"test .request_hugepages = TST_NO_HUGEPAGES" ); - hpages =tst_request_hugepages (3 ); +struct tst_hugepage hp = {3 ,TST_FLEXIBLE }; + hpages =tst_request_hugepages (&hp);SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%lu" , &val);if (val != hpages)tst_brk (TBROK ,"nr_hugepages = %lu, but expect %lu" , val, hpages);@@ -31,5 +32,8 @@ static void do_test(void)static struct tst_test test = { .test_all = do_test, - .request_hugepages =TST_NO_HUGEPAGES , + .request_hugepages = (struct tst_hugepage []){ + {TST_NO_HUGEPAGES ,TST_FLEXIBLE }, + {} + }, };lib/tst_hugepage.c +18
-4@@ -20,11 +20,13 @@ size_t tst_get_hugepage_size(void)return SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; } -unsigned long tst_request_hugepages (unsigned long hpages) +unsigned long tst_request_hugepages (struct tst_hugepage *hp) {unsigned long val, max_hpages;if (access (PATH_HUGEPAGES ,F_OK )) { +if (hp->policy ==TST_ENFORCED ) +tst_brk (TCONF ,"hugetlbfs is not supported" ); tst_hugepages =0 ; goto out; }@@ -32,16 +34,20 @@ unsigned long tst_request_hugepages(unsigned long hpages)if (nr_opt) tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX );else - tst_hugepages = hpages; + tst_hugepages = hp->number; -if (hpages ==TST_NO_HUGEPAGES ) { +if (hp->number ==TST_NO_HUGEPAGES ) { tst_hugepages =0 ; goto set_hugepages; }SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); - max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" ); +if (hp->policy ==TST_ENFORCED ) { + tst_hugepages +=SAFE_READ_MEMINFO ("HugePages_Total:" ); + goto set_hugepages; + } + max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" );if (tst_hugepages > max_hpages) { tst_res(TINFO, "Requested number(%lu) of hugepages is too large, " "limiting to 80%% of the max hugepage count %lu",@@ -61,6 +67,14 @@ set_hugepages:"Not enough hugepages for testing." , val, tst_hugepages); +if (hp->policy ==TST_ENFORCED ) { +unsigned long free_hpages =SAFE_READ_MEMINFO ("HugePages_Free:" ); +if (hp->number > free_hpages) +tst_brk (TCONF ,"free_hpages = %lu, but expect %lu. " +"Not enough hugepages for testing." , + free_hpages, hp->number); + } +tst_res (TINFO ,"%lu hugepage(s) reserved" , tst_hugepages); out:return tst_hugepages;Signature · 5 lines
2.35.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 13 lines · Cyril Hrubis
+TST_FLEXIBLE:
Quoted 1 line
+ If set non-zero number in .request_hugepages, ltp will try to reserve
the
Quoted 1 line
+ expected number of hugepage for testing in setup phase. If system
does not
Quoted 1 line
+ have enough memory for that, it will try the best to reserve 80%
available
doc/c-test-api.txt For full documentation see the comments in 'include/tst_fuzzy_sync.h'.
Quoted 4 lines
doc/c-test-api.txt +4
-0+ huge pages. + +TST_ENFORCED: + This is an enforced requirement for huge page reserve, ltp shouldstrictly do
Quoted 1 line
+ hpages applying and guarantee the '
HugePages_Free' no less than
Quoted 9 lines
specified pages
Quoted 1 line
+ which gives that test can use these specified numbers correctly.
As for the naming I would probably go for
TST_NEEDSandTST_REQUEST. We use the word 'needs' in thetst_testto describe something that is required for the test. And 'request' sounds better to me than flexible in a sense that you can request a lot but get less than what was requested.
Sounds better, if so, I'd also rename '.request_hugepages' to '.hugepages' in tst_test because there have been overlaps in the tst_policy words.
struct tst_test test = {
.test_all = run,
- .request_hugepages = 2,
+ .hugepages = {2, TST_REQUEST},
...
};
No hugepage change to:
.hugepages = {TST_NO_HUGEPAGES, TST_REQUEST},
API in header file change to:
-unsigned long tst_request_hugepages(unsigned long hpages); +unsigned long tst_reserve_hugepages(struct tst_hugepage *hp);
Quoted 6 lines
- unsigned long
request_hugepages;Quoted 1 line
+ struct
tst_hugepage*request_hugepages;Why is this treated as an array even though we work with only single struct
tst_hugepageinstance?
Right, it no needs an array in that case.
Signature · 2 lines
Regards, Li Wang
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp