hugetlb: move nr_opt to tst_hugepage.h
PATCH 1/1 hugetlb: move nr_opt to tst_hugepage.h
This is to get rid of the following error:
# ./hugemmap01 -s 2
tst_hugepage.c:29: INFO: Requested number(128) of hugepages is too large,
limiting to 80% of the max hugepage count 28
tst_hugepage.c:40: BROK: nr_hugepages = 5, but expect 22The root cause is that hugetlb test hits TBROK if the system can't satisfy 80% of .request_hugepages(default: 128), it doesn't get a chance to set nr_hugepages with specified page number via '-s xxx'.
Signed-off-by Li Wang <[email protected]>
Cc Yang Xu <[email protected]>
--- include/tst_hugepage.h | 3 +++ lib/tst_hugepage.c | 10 +++++++--- 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/hugeshmat/hugeshmat01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 5 ----- testcases/kernel/mem/hugetlb/lib/hugetlb.h | 3 --- 17 files changed, 10 insertions(+), 76 deletions(-)
include/tst_hugepage.h +3 -0
@@ -9,6 +9,9 @@#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/"#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" +char *nr_opt;/* -s num Set the number of the been allocated hugepages */ +char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */ +/* * Try the best to request a specified number of huge pages from system, * it will store the reserved hpage number in tst_hugepages.
lib/tst_hugepage.c +7 -3
@@ -19,14 +19,18 @@ unsigned long tst_request_hugepages(unsigned long hpages) goto out; } - tst_hugepages = hpages; +if (nr_opt) + tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX ); +else + tst_hugepages = hpages; +SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" ); -if (hpages > max_hpages) { +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" , - hpages, max_hpages); + tst_hugepages, max_hpages); tst_hugepages = max_hpages *0.8 ;if (tst_hugepages <1 )
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +0 -5
@@ -81,11 +81,6 @@ void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +0 -5
@@ -128,11 +128,6 @@ static void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +0 -5
@@ -99,11 +99,6 @@ void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing!" );
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +0 -5
@@ -154,11 +154,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +0 -5
@@ -79,11 +79,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +0 -5
@@ -74,11 +74,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +0 -5
@@ -288,11 +288,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +0 -5
@@ -77,11 +77,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +0 -5
@@ -106,11 +106,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +0 -5
@@ -119,11 +119,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +0 -5
@@ -54,11 +54,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +0 -5
@@ -72,11 +72,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0 -5
@@ -51,11 +51,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +0 -5
@@ -66,11 +66,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );
testcases/kernel/mem/hugetlb/lib/hugetlb.h +0 -3
@@ -40,7 +40,4 @@ int getipckey(void);int getuserid (char *user);void rm_shm (int shm_id); -char *nr_opt; -char *Hopt; -#endif /* hugetlb.h */
Signature · 1 line
2.21.1
PATCH 1/1 hugetlb: move nr_opt to tst_hugepage.h
Hi Li
Looks good to me,
Reviewed-by Yang Xu <[email protected]>
Best Regards
Yang Xu
Quoted 309 lines
This is to get rid of the following error:
# ./hugemmap01 -s 2 tst_hugepage.c:29: INFO: Requested number(128) of hugepages is too large, limiting to 80% of the max hugepage count 28 tst_hugepage.c:40: BROK: nr_hugepages = 5, but expect 22The root cause is that hugetlb test hits TBROK if the system can't satisfy 80% of .request_hugepages(default: 128), it doesn't get a chance to set
nr_hugepageswith specified page number via '-s xxx'.Signed-off-by Li Wang <[email protected]>Cc Yang Xu <[email protected]>--- include/tst_hugepage.h | 3 +++ lib/tst_hugepage.c | 10 +++++++--- 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/hugeshmat/hugeshmat01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 5 ----- testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 5 ----- testcases/kernel/mem/hugetlb/lib/hugetlb.h | 3 --- 17 files changed, 10 insertions(+), 76 deletions(-)include/tst_hugepage.h +3
-0@@ -9,6 +9,9 @@#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/"#define PATH_NR_HPAGES "/proc/sys/vm/nr_hugepages" +char *nr_opt;/* -s num Set the number of the been allocated hugepages */ +char *Hopt;/* -H /.. Location of hugetlbfs, i.e. -H /var/hugetlbfs */ +/* * Try the best to request a specified number of huge pages from system, * it will store the reserved hpage number in tst_hugepages. lib/tst_hugepage.c +7
-3@@ -19,14 +19,18 @@ unsigned long tst_request_hugepages(unsigned long hpages) goto out; } - tst_hugepages = hpages; +if (nr_opt) + tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX ); +else + tst_hugepages = hpages; +SAFE_FILE_PRINTF ("/proc/sys/vm/drop_caches" ,"3" ); max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) /SAFE_READ_MEMINFO ("Hugepagesize:" ); -if (hpages > max_hpages) { +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" , - hpages, max_hpages); + tst_hugepages, max_hpages); tst_hugepages = max_hpages *0.8 ;if (tst_hugepages <1 )testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +0
-5@@ -81,11 +81,6 @@ void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +0
-5@@ -128,11 +128,6 @@ static void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,1 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +0
-5@@ -99,11 +99,6 @@ void setup(void) Hopt =tst_get_tmpdir ();SAFE_MOUNT ("none" , Hopt,"hugetlbfs" ,0 ,NULL ); -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing!" );testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +0
-5@@ -154,11 +154,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +0
-5@@ -79,11 +79,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +0
-5@@ -74,11 +74,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +0
-5@@ -288,11 +288,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +0
-5@@ -77,11 +77,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +0
-5@@ -106,11 +106,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +0
-5@@ -119,11 +119,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +0
-5@@ -54,11 +54,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +0
-5@@ -72,11 +72,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +0
-5@@ -51,11 +51,6 @@ static void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +0
-5@@ -66,11 +66,6 @@ void setup(void) {long hpage_size; -if (nr_opt) { - tst_hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); -tst_request_hugepages (tst_hugepages); - } -if (tst_hugepages ==0 )tst_brk (TCONF ,"No enough hugepages for testing." );testcases/kernel/mem/hugetlb/lib/hugetlb.h +0
-3@@ -40,7 +40,4 @@ int getipckey(void);int getuserid (char *user);void rm_shm (int shm_id); -char *nr_opt; -char *Hopt; -#endif /* hugetlb.h */
PATCH 1/1 hugetlb: move nr_opt to tst_hugepage.h
Quoted 5 lines · Yang Xu
Hi Li
Looks good to me,
Reviewed-by Yang Xu <[email protected]>
Pushed. Thanks for the review.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20200409/bb058bea/attachment.htm>