hugetlb: reset hugepages according to free memory
PATCH v3 1/1 hugetlb: reset hugepages according to free memory
From: Xiao Liang <[email protected]>
When the system's Hugepagesize is large(eg. 512MiB), the test may break as cannot set nr_hugepages to default 128.
This patch continue to set 128 as default hugepages, but it checks the memory free and hugepagesize registered. If default 128 is larger than max available count, then reset the hugepages to 80% of the max page count.
Without this patch:
# ./hugemmap01 tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s mem.c:814: INFO: set nr_hugepages to 128 mem.c:823: BROK: nr_hugepages = 54, but expect 128 mem.c:814: INFO: set nr_hugepages to 0
With this patch:
# ./hugemmap01 -s 100000000 tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s hugetlb.c:67: INFO: The hugepages beyond system available, here reset to 80% of the max page count 14502 mem.c:814: INFO: set nr_hugepages to 11601 hugemmap01.c:73: PASS: call succeeded mem.c:814: INFO: set nr_hugepages to 0
Signed-off-by Xiao Liang <[email protected]>
Signed-off-by Li Wang <[email protected]>
--- testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c | 2 ++ testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c | 2 ++ testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c | 2 ++ .../kernel/mem/hugetlb/hugeshmat/hugeshmat01.c | 1 + .../kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 1 + .../kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 1 + .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 1 + .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 1 + .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 1 + .../kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 1 + .../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 1 + .../kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 1 + .../kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 1 + .../kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 1 + testcases/kernel/mem/hugetlb/lib/hugetlb.c | 13 +++++++++++++ testcases/kernel/mem/hugetlb/lib/hugetlb.h | 1 + 16 files changed, 31 insertions(+)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +2 -0
@@ -97,6 +97,8 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); + +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 );snprintf (TEMPFILE ,sizeof (TEMPFILE ),"%s/mmapfile%d" , Hopt,getpid ());
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +2 -0
@@ -144,6 +144,8 @@ static void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); + +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 );snprintf (TEMPFILE ,sizeof (TEMPFILE ),"%s/mmapfile%d" , Hopt,getpid ());
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +2 -0
@@ -115,6 +115,8 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); + +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 );snprintf (TEMPFILE ,sizeof (TEMPFILE ),"%s/mmapfile%d" , Hopt,getpid ());
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +1 -0
@@ -171,6 +171,7 @@ static void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +1 -0
@@ -96,6 +96,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +1 -0
@@ -91,6 +91,7 @@ static void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +1 -0
@@ -315,6 +315,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +1 -0
@@ -96,6 +96,7 @@ static void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +1 -0
@@ -121,6 +121,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +1 -0
@@ -136,6 +136,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +1 -0
@@ -71,6 +71,7 @@ static void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +1 -0
@@ -89,6 +89,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +1 -0
@@ -70,6 +70,7 @@ static void setup(void)SAFE_FILE_SCANF (PATH_SHMMNI ,"%ld" , &orig_shmmni); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 );SAFE_FILE_PRINTF (PATH_SHMMNI ,"%ld" , hugepages /2 );
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +1 -0
@@ -82,6 +82,7 @@ void setup(void)if (nr_opt) hugepages =SAFE_STRTOL (nr_opt,0 ,LONG_MAX ); +reset_hugepages (&hugepages);set_sys_tune ("nr_hugepages" , hugepages,1 ); hpage_size =SAFE_READ_MEMINFO ("Hugepagesize:" ) *1024 ;
testcases/kernel/mem/hugetlb/lib/hugetlb.c +13 -0
@@ -56,6 +56,19 @@ void restore_nr_hugepages(void)set_sys_tune ("nr_hugepages" , orig_hugepages,0 ); } +void reset_hugepages (long *hpages) +{ +long max_hpages =SAFE_READ_MEMINFO ("MemFree:" ) / +SAFE_READ_MEMINFO ("Hugepagesize:" ); + +if (*hpages > max_hpages) { +tst_res (TINFO ,"The hugepages beyond system available, here " +"reset to 80%% of the max page count %ld" , + max_hpages); + *hpages = max_hpages *0.8 ; + } +} +/* * getipckey() - generates and returns a message key used by the "get" * calls to create an IPC resource.
testcases/kernel/mem/hugetlb/lib/hugetlb.h +1 -0
@@ -58,5 +58,6 @@ char *Hopt;void check_hugepage (void );long save_nr_hugepages (void );void restore_nr_hugepages (void ); +void reset_hugepages (long *hpages);#endif /* hugetlb.h */
Signature · 1 line
2.20.1