lib: add .needs_hugepages to reserve hugepage
PATCH v2 1/2 lib: add .needs_hugepages to reserve hugepage
Many of the ltp tests need to use hugepage in their testing, this makes the test can reserve hpages from system only via .needs_hugepages = xx.
If set non-zero number of needs_hugepages, the test will try to reserve an expected number huge page for testing in setup phase. If system does not support hugetlb or failed to get the expected number, test will set the global variable 'tst_no_hugepage' to 1.
--- doc/test-writing-guidelines.txt | 38 +++++++++++++++++++++++- include/tst_hugepage.h | 27 +++++++++++++++++ include/tst_test.h | 11 +++++++ lib/newlib_tests/.gitignore | 1 + lib/newlib_tests/test20.c | 45 ++++++++++++++++++++++++++++ lib/tst_hugepage.c | 52 +++++++++++++++++++++++++++++++++ lib/tst_test.c | 8 ++++- 7 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 include/tst_hugepage.h create mode 100644 lib/newlib_tests/test20.c create mode 100644 lib/tst_hugepage.c
doc/test-writing-guidelines.txt +37 -1
@@ -1854,7 +1854,43 @@ However a lot of problems can be solved by using 'tst_cap_action(struct tst_cap *cap)' directly which can be called at any time. This also helps if you wish to drop a capability at the begining of setup. -2.2.33 Reproducing race-conditions +2.2.33 Reserving hugepages +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Many of the ltp tests need to use hugepage in their testing, this makes the +test can reserve hugepages from system only via .needs_hugepages = xx. + +If set non-zero number of needs_hugepages, the test will try to reserve +an expected number hugepage for testing. If system does not support hugetlb +or failed to get the expected numbers, test will set the global variable +'tst_no_hugepage' to 1. + +Also, we do cleanup and restore work for the hpages resetting automatically. + +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +static void run(void) +{ + ... + + if (tst_no_hugepage) + ... + else + TEST(do_hpage_test); + ... +} + +struct tst_test test = { + ... + .test_all = run, + .needs_hugepages = 2, + ... +}; +------------------------------------------------------------------------------- + +2.2.34 Reproducing race-conditions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ If a bug is caused by two tasks in the kernel racing and you wish to create a
include/tst_hugepage.h new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Red Hat, Inc. +*/ + +#ifndef TST_HUGEPAGE__ +#define TST_HUGEPAGE__ + +#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" +#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" + +/* +* Try to request the specified number of huge pages from system. +* +* Note: this depend on the status of system memory fragmentation. +* -1 - reserve fail +* hpages - reserve success +*/ +int tst_request_hugepages (int hpages); + +/* +* If system does not support hugetlb or failed to reserve the expected +* number of hugepage, then this value will be set to 1. +*/ +extern unsigned int tst_no_hugepage; + +#endif /* TST_HUGEPAGE_H */
include/tst_test.h +11 -0
@@ -37,6 +37,7 @@#include "tst_coredump.h" #include "tst_buffers.h" #include "tst_capability.h" +#include "tst_hugepage.h" /* * Reports testcase result.
@@ -148,6 +149,16 @@ struct tst_test {*/ int all_filesystems:1; +/* +* If set non-zero number of needs_hugepages, the test will try to reserve +* an expected number huge page for testing in setup phase. If system does +* not support hugetlb or failed to get the expected number, test will set +* the global variable 'tst_no_hugepage' to 1. +* +* Also, we do cleanup and restore work for the hpages resetting automatically. +*/ +unsigned int needs_hugepages; +/* * If set non-zero denotes number of test variant, the test is executed * variants times each time with tst_variant set to different number.
lib/newlib_tests/.gitignore +1 -0
@@ -23,6 +23,7 @@ tst_strstatus test17 test18 test19 +test20 tst_expiration_timer test_exec test_exec_child
lib/newlib_tests/test20.c new file +45 -0
45 lines not on this page · raw message
lib/tst_hugepage.c new file +52 -0
52 lines not on this page · raw message
lib/tst_test.c +7 -1
@@ -890,6 +890,11 @@ static void do_setup(int argc, char *argv[])if (tst_test->all_filesystems) tst_test->needs_device =1 ; +if (tst_test->needs_hugepages) { +tst_sys_conf_save ("?/proc/sys/vm/nr_hugepages" ); +tst_request_hugepages (tst_test->needs_hugepages); + } +setup_ipc ();if (tst_test->bufs)
@@ -1006,7 +1011,8 @@ static void do_cleanup(void)tst_rmdir (); } -if (tst_test->save_restore) +if (tst_test->save_restore || + (tst_test->needs_hugepages && !tst_no_hugepage))tst_sys_conf_restore (0 );if (tst_test->restore_wallclock)
Signature · 1 line
2.20.1
PATCH v2 2/2 pkey01: disable hugetlb test if failed to reserve hugepage
To handle the false positive:
pkey01.c:69: BROK: nr_hugepages = 0, but expect 1
--- testcases/kernel/syscalls/pkeys/pkey01.c | 27 ++++++------------------ 1 file changed, 6 insertions(+), 21 deletions(-)
testcases/kernel/syscalls/pkeys/pkey01.c +6 -21
@@ -36,12 +36,6 @@#define PATH_VM_NRHPS "/proc/sys/vm/nr_hugepages"static int size; -static int no_hugepage; - -static const char *const save_restore[] = { -"?/proc/sys/vm/nr_hugepages" , -NULL , -}; static struct tcase { unsigned long flags;
@@ -56,21 +50,12 @@ static void setup(void) {int i, fd; -if (access ("/sys/kernel/mm/hugepages/" ,F_OK )) { -tst_res (TINFO ,"Huge page is not supported" ); +check_pkey_support (); + +if (tst_no_hugepage) size =getpagesize (); - no_hugepage =1 ; - }else { -int val; -SAFE_FILE_PRINTF (PATH_VM_NRHPS ,"%d" ,1 ); -SAFE_FILE_SCANF (PATH_VM_NRHPS ,"%d" , &val); -if (val !=1 ) -tst_brk (TBROK ,"nr_hugepages = %d, but expect %d" , - val,1 ); +else size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ; - } - -check_pkey_support (); fd =SAFE_OPEN (TEST_FILE ,O_RDWR |O_CREAT ,0664 );for (i =0 ; i <128 ; i++)
@@ -147,7 +132,7 @@ static void pkey_test(struct tcase *tc, struct mmap_param *mpa)int pkey, status;int fd = mpa->fd; -if (no_hugepage && (mpa->flags &MAP_HUGETLB )) { +if (tst_no_hugepage && (mpa->flags &MAP_HUGETLB )) {tst_res (TINFO ,"Skip test on (%s) buffer" ,flag_to_str (mpa->flags));return ; }
@@ -236,5 +221,5 @@ static struct tst_test test = { .forks_child = 1, .test = verify_pkey, .setup = setup, - .save_restore = save_restore, + .needs_hugepages = 1, };
Signature · 1 line
2.20.1
PATCH v2 1/2 lib: add .needs_hugepages to reserve hugepage
In reply to Li WangHi!
Quoted 59 lines
Many of the ltp tests need to use hugepage in their testing, this makes the test can reserve hpages from system only via .needs_hugepages = xx.
If set non-zero number of
needs_hugepages, the test will try to reserve an expected number huge page for testing in setup phase. If system does not support hugetlb or failed to get the expected number, test will set the global variable 'tst_no_hugepage' to 1.Signed-off-by Li Wang <[email protected]>--- doc/test-writing-guidelines.txt | 38 +++++++++++++++++++++++- include/tst_hugepage.h | 27 +++++++++++++++++ include/tst_test.h | 11 +++++++ lib/newlib_tests/.gitignore | 1 + lib/newlib_tests/test20.c | 45 ++++++++++++++++++++++++++++ lib/tst_hugepage.c | 52 +++++++++++++++++++++++++++++++++ lib/tst_test.c | 8 ++++- 7 files changed, 180 insertions(+), 2 deletions(-) create mode 100644 include/tst_hugepage.h create mode 100644 lib/newlib_tests/test20.c create mode 100644 lib/tst_hugepage.cdoc/test-writing-guidelines.txt +28
-1@@ -1854,7 +1854,43 @@ However a lot of problems can be solved by using 'tst_cap_action(struct tst_cap *cap)' directly which can be called at any time. This also helps if you wish to drop a capability at the begining of setup. -2.2.33 Reproducing race-conditions +2.2.33 Reserving hugepages +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Many of the ltp tests need to use hugepage in their testing, this makes the +test can reserve hugepages from system only via .needs_hugepages = xx. + +If set non-zero number of needs_hugepages, the test will try to reserve +an expected number hugepage for testing. If system does not support hugetlb +or failed to get the expected numbers, test will set the global variable +'tst_no_hugepage' to 1. + +Also, we do cleanup and restore work for the hpages resetting automatically. + +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +static void run(void) +{ + ... + + if (tst_no_hugepage) + ... + else + TEST(do_hpage_test); + ... +} +
doc/test-writing-guidelines.txt However a lot of problems can be solved by using 'tst_cap_action(struct · line 1894
Quoted 10 lines
doc/test-writing-guidelines.txt +9
-0+struct tst_test test = { + ... + .test_all = run, + .needs_hugepages = 2, + ... +}; +------------------------------------------------------------------------------- + +2.2.34 Reproducing race-conditions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Can we please avoid renumbering the paragraphs, i.e. can you add the hugepages docs after this?
Quoted 22 lines
doc/test-writing-guidelines.txt +0
-0If a bug is caused by two tasks in the kernel racing and you wish to create ainclude/tst_hugepage.h new file +15
-0@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Red Hat, Inc. +*/ + +#ifndef TST_HUGEPAGE__ +#define TST_HUGEPAGE__ + +#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" +#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" + +/* +* Try to request the specified number of huge pages from system. +* +* Note: this depend on the status of system memory fragmentation.
include/tst_hugepage.h line 25
Quoted 10 lines
include/tst_hugepage.h new file +10
-0+* -1 - reserve fail +* hpages - reserve success +*/ +int tst_request_hugepages (int hpages); + +/* +* If system does not support hugetlb or failed to reserve the expected +* number of hugepage, then this value will be set to 1. +*/ +extern unsigned int tst_no_hugepage;
Hmm, this needs a bit more thoughts.
So far all the needs_foo flags require the foo to be present on the system, i.e. are hard requirements. In this case hugepages are soft requirement, i.e. only part of the test will need that.
We probably need a better name for this than needs_hugepages in tst_test. We may as well need a generic way how to describe that some of the requirements are hard and some of them are soft. I will give it some thoughts.
At least we should just call it request_hugepages in the tst_test structure instead.
Quoted 109 lines
include/tst_hugepage.h new file +1
-0+#endif /* TST_HUGEPAGE_H */ include/tst_test.h +11
-0@@ -37,6 +37,7 @@#include "tst_coredump.h" #include "tst_buffers.h" #include "tst_capability.h" +#include "tst_hugepage.h" /* * Reports testcase result. @@ -148,6 +149,16 @@ struct tst_test {*/ int all_filesystems:1; +/* +* If set non-zero number of needs_hugepages, the test will try to reserve +* an expected number huge page for testing in setup phase. If system does +* not support hugetlb or failed to get the expected number, test will set +* the global variable 'tst_no_hugepage' to 1. +* +* Also, we do cleanup and restore work for the hpages resetting automatically. +*/ +unsigned int needs_hugepages; +/* * If set non-zero denotes number of test variant, the test is executed * variants times each time with tst_variant set to different number. lib/newlib_tests/.gitignore +1
-0@@ -23,6 +23,7 @@ tst_strstatus test17 test18 test19 +test20 tst_expiration_timer test_exec test_exec_childlib/newlib_tests/test20.c new file +45
-0@@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Li Wang <[email protected]> +*/ + +/* +* Tests .needs_hugepages + .save_restore +*/ + +#include "tst_test.h" +#include "tst_hugepage.h" +#include "tst_sys_conf.h" + +static const char *const save_restore[] = { +"!/proc/sys/kernel/numa_balancing" , +NULL , +}; + +static void do_test (void ) { + +int val, hpages; + +tst_res (TINFO ,"tst_no_hugepage = %u" , tst_no_hugepage); +SAFE_FILE_PRINTF ("/proc/sys/kernel/numa_balancing" ,"1" ); + + hpages = test.needs_hugepages; +SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%d" , &val); +if (val != hpages) +tst_brk (TBROK ,"nr_hugepages = %d, but expect %d" , val, hpages); +else +tst_res (TPASS ,"test .needs_hugepges" ); + + hpages =tst_request_hugepages (3 ); +SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%d" , &val); +if (val != hpages) +tst_brk (TBROK ,"nr_hugepages = %d, but expect %d" , val, hpages); +else +tst_res (TPASS ,"tst_request_hugepages" ); +} + +static struct tst_test test = { + .test_all = do_test, + .needs_hugepages =2 , + .save_restore = save_restore, +};lib/tst_hugepage.c new file +10
-0@@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Red Hat, Inc. +*/ + +#define TST_NO_DEFAULT_MAIN + +#include "tst_test.h" +#include "tst_hugepage.h" +
lib/tst_hugepage.c line 20
Quoted 10 lines
lib/tst_hugepage.c new file +10
-0+unsigned int tst_no_hugepage; + +int tst_request_hugepages (int hpages) +{ +int val; +long mem_avail, max_hpages; + +if (access (PATH_HUGEPAGES ,F_OK )) { +tst_res (TCONF ,"Huge page is not supported." ); + tst_no_hugepage =1 ;
I guess that it will make more sense to call it tst_hugepages and set it to a number of hugepages that we were able to reserve. I.e. set it to 0 here and to hpages at the end.
That way we can do if (tst_hugepages) or if (!tst_hugepages) in testcases as well.
Quoted 37 lines
lib/tst_hugepage.c new file +32
-0+return -1 ; + } + +if (FILE_LINES_SCANF ("/proc/meminfo" , +"MemAvailable: %ld" , &mem_avail)) { +/* +* Dropping caches and using "MemFree:" on kernel +* that doesn't have "MemAvailable:" in Meminfo +*/ +tst_res (TINFO ,"MemAvailable: not found in /proc/meminfo" ); + +SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); + mem_avail =SAFE_READ_MEMINFO ("MemFree:" ); + } + + max_hpages = mem_avail /SAFE_READ_MEMINFO ("Hugepagesize:" ); + +if (hpages > max_hpages) { +tst_res (TINFO ,"Request %d hugepages failed, memory too fragmented? " +"The max hugepage available count %ld" , + hpages, max_hpages); + tst_no_hugepage =1 ; +return -1 ; + } + +SAFE_FILE_PRINTF (PATH_NR_HPAGES ,"%d" , hpages); +SAFE_FILE_SCANF (PATH_NR_HPAGES ,"%d" , &val); +if (val != hpages) +tst_brk (TBROK ,"nr_hugepages = %d, but expect %d" , val, hpages); + +return hpages; +}lib/tst_test.c +0
-0
lib/tst_test.c static void do_setup(int argc, char *argv[]) · line 894
Quoted 5 lines
lib/tst_test.c +2
-0@@ -890,6 +890,11 @@ static void do_setup(int argc, char *argv[])if (tst_test->all_filesystems) tst_test->needs_device =1 ; +if (tst_test->needs_hugepages) { +tst_sys_conf_save ("?/proc/sys/vm/nr_hugepages" );
Can we call this from the tst_hugepage.c instead and only if we actually written to that file?
Quoted 7 lines
lib/tst_test.c +3
-0+tst_request_hugepages (tst_test->needs_hugepages); + } +setup_ipc ();if (tst_test->bufs)
lib/tst_test.c static void do_cleanup(void) · line 1016
Quoted 7 lines
lib/tst_test.c +2
-1@@ -1006,7 +1011,8 @@ static void do_cleanup(void)tst_rmdir (); } -if (tst_test->save_restore) +if (tst_test->save_restore || + (tst_test->needs_hugepages && !tst_no_hugepage))tst_sys_conf_restore (0 );
We can call the tst_sys_conf_restore() unconditionally here, if nothing has been saved it's no-op.
lib/tst_test.c static void do_cleanup(void) · line 1018
Quoted 1 line
lib/tst_test.c +0
-0if (tst_test->restore_wallclock)
Otherwise it looks good.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/2 lib: add .needs_hugepages to reserve hugepage
Quoted 8 lines · Cyril Hrubis
Hi!
...Quoted 2 lines
+2.2.34 Reproducing race-conditions
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^Can we please avoid renumbering the paragraphs, i.e. can you add the hugepages docs after this?
Yes, sure.
Quoted 9 lines
...
include/tst_hugepage.h line 25
Quoted 5 lines
include/tst_hugepage.h new file +5
-0+/* +* If system does not support hugetlb or failed to reserve the expected +* number of hugepage, then this value will be set to 1. +*/ +extern unsigned int tst_no_hugepage;Hmm, this needs a bit more thoughts.
Quoted 9 lines
So far all the
needs_fooflags require the foo to be present on the system, i.e. are hard requirements. In this case hugepages are soft requirement, i.e. only part of the test will need that.We probably need a better name for this than
needs_hugepagesintst_test. We may as well need a generic way how to describe that some of the requirements are hard and some of them are soft. I will give it some thoughts.
Your consideration is valuable. '.needs_hugepages' might fail to reserve the expected page numbers on any kind of platform which with fragmental memory, we'd better give an elegant way to handle that situation to make our test can work well on the remaining part.
Quoted 4 lines
At least we should just call it
request_hugepagesin thetst_teststructure instead.
Ok, it's fine. Unless we can come up with a better.
Quoted 15 lines
...
lib/tst_hugepage.c line 20
Quoted 9 lines
lib/tst_hugepage.c new file +9
-0+ +int tst_request_hugepages (int hpages) +{ +int val; +long mem_avail, max_hpages; + +if (access (PATH_HUGEPAGES ,F_OK )) { +tst_res (TCONF ,"Huge page is not supported." ); + tst_no_hugepage =1 ;I guess that it will make more sense to call it
tst_hugepagesand set it to a number of hugepages that we were able to reserve. I.e. set it to 0 here and to hpages at the end.
Agree, that sounds more useful in many situations.
Quoted 7 lines
...
lib/tst_test.c static void do_setup(int argc, char *argv[]) · line 894
Quoted 2 lines
lib/tst_test.c +2
-0+if (tst_test->needs_hugepages) { +tst_sys_conf_save ("?/proc/sys/vm/nr_hugepages" );Can we call this from the
tst_hugepage.cinstead and only if we actually written to that file?
I will have a try then.
Quoted 10 lines
Quoted 10 lines
lib/tst_test.c +3
-0+tst_request_hugepages (tst_test->needs_hugepages); + } +setup_ipc ();if (tst_test->bufs)@@ -1006,7 +1011,8 @@ static void do_cleanup(void)tst_rmdir (); }
Quoted 8 lines
lib/tst_test.c static void do_cleanup(void) · line 1016
Quoted 4 lines
lib/tst_test.c +2
-1-if (tst_test->save_restore) +if (tst_test->save_restore || + (tst_test->needs_hugepages && !tst_no_hugepage))tst_sys_conf_restore (0 );We can call the
tst_sys_conf_restore()unconditionally here, if nothing has been saved it's no-op.
Right!
Quoted 5 lines
lib/tst_test.c static void do_cleanup(void) · line 1018
Quoted 2 lines
lib/tst_test.c +0
-0if (tst_test->restore_wallclock)Otherwise it looks good.
Thanks for these useful advises.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20191211/d92c3b59/attachment.htm>