| Message ID | 20220428132949.11719-1-liwang@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RFC,1/3] lib: extend .request_hugepages to guarantee enough pages | expand |
Hi! > 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 <liwang@redhat.com> > --- > 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(-) > > diff --git a/doc/c-test-api.txt b/doc/c-test-api.txt > index 9f104ecd7..1eabdf7ca 100644 > --- a/doc/c-test-api.txt > +++ b/doc/c-test-api.txt > @@ -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. 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. > +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}, > + {} > + }, > ... > }; > ------------------------------------------------------------------------------- > diff --git a/include/tst_hugepage.h b/include/tst_hugepage.h > index e08a2daa2..17bd4e9da 100644 > --- a/include/tst_hugepage.h > +++ b/include/tst_hugepage.h > @@ -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 > diff --git a/include/tst_test.h b/include/tst_test.h > index dbe303bc8..d50d213ef 100644 > --- a/include/tst_test.h > +++ b/include/tst_test.h > @@ -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; 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, ...}, > /* > * If set to non-zero, call tst_taint_init(taint_check) during setup > diff --git a/lib/newlib_tests/test20.c b/lib/newlib_tests/test20.c > index 5c24770a1..e8e81f8f4 100644 > --- a/lib/newlib_tests/test20.c > +++ b/lib/newlib_tests/test20.c > @@ -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"}, > {} > diff --git a/lib/newlib_tests/test_zero_hugepage.c b/lib/newlib_tests/test_zero_hugepage.c > index 0d85ce866..27cd196da 100644 > --- a/lib/newlib_tests/test_zero_hugepage.c > +++ b/lib/newlib_tests/test_zero_hugepage.c > @@ -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}, > + {} > + }, > }; > diff --git a/lib/tst_hugepage.c b/lib/tst_hugepage.c > index a7585bc3d..06e9fb7a1 100644 > --- a/lib/tst_hugepage.c > +++ b/lib/tst_hugepage.c > @@ -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; > -- > 2.35.1 > > > -- > Mailing list info: https://lists.linux.it/listinfo/ltp
Cyril Hrubis <chrubis@suse.cz> wrote: > +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. > 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); > - 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? > Right, it no needs an array in that case.
diff --git a/doc/c-test-api.txt b/doc/c-test-api.txt index 9f104ecd7..1eabdf7ca 100644 --- a/doc/c-test-api.txt +++ b/doc/c-test-api.txt @@ -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}, + {} + }, ... }; ------------------------------------------------------------------------------- diff --git a/include/tst_hugepage.h b/include/tst_hugepage.h index e08a2daa2..17bd4e9da 100644 --- a/include/tst_hugepage.h +++ b/include/tst_hugepage.h @@ -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 diff --git a/include/tst_test.h b/include/tst_test.h index dbe303bc8..d50d213ef 100644 --- a/include/tst_test.h +++ b/include/tst_test.h @@ -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 diff --git a/lib/newlib_tests/test20.c b/lib/newlib_tests/test20.c index 5c24770a1..e8e81f8f4 100644 --- a/lib/newlib_tests/test20.c +++ b/lib/newlib_tests/test20.c @@ -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"}, {} diff --git a/lib/newlib_tests/test_zero_hugepage.c b/lib/newlib_tests/test_zero_hugepage.c index 0d85ce866..27cd196da 100644 --- a/lib/newlib_tests/test_zero_hugepage.c +++ b/lib/newlib_tests/test_zero_hugepage.c @@ -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}, + {} + }, }; diff --git a/lib/tst_hugepage.c b/lib/tst_hugepage.c index a7585bc3d..06e9fb7a1 100644 --- a/lib/tst_hugepage.c +++ b/lib/tst_hugepage.c @@ -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;
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 <liwang@redhat.com> --- 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(-)