Skip to contentSkip to conversation

hugetlb: dynamically change default hugepages

PATCH New Xiao Liang 2 participants 2 messages Apr 4, 2019

lore
Share & tools
lore

Xiao Liang

author
#0 lore raw

PATCH v2 1/1 hugetlb: dynamically change default hugepages

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 use 128 as default hugepages, but it checks the memory available and Hugepagesize registered. If default 128 is larger than available count, then use the small one.

With this patch:
tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s hugemmap01.c:99: INFO: max page available count is 54 mem.c:814: INFO: set nr_hugepages to 54 hugemmap01.c:73: PASS: call succeeded mem.c:814: INFO: set nr_hugepages to 0

Without this patch:
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

---
 .../kernel/mem/hugetlb/hugemmap/hugemmap01.c     |  5 ++++-
 .../kernel/mem/hugetlb/hugemmap/hugemmap02.c     |  5 ++++-
 .../kernel/mem/hugetlb/hugemmap/hugemmap04.c     |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat01.c   |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat02.c   |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmat/hugeshmat03.c   |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c |  5 ++++-
 .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c |  5 ++++-
 .../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/mem/hugetlb/lib/hugetlb.c       | 16 ++++++++++++++++
 testcases/kernel/mem/hugetlb/lib/hugetlb.h       |  1 +
 16 files changed, 73 insertions(+), 14 deletions(-)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +4 -1
index 4dc330dc0..11ebe05c9 100644
@@ -95,8 +95,11 @@ void setup(void)
 		Hopt = tst_get_tmpdir();
 	SAFE_MOUNT("none", Hopt, "hugetlbfs", 0, NULL);
 
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 	set_sys_tune("nr_hugepages", hugepages, 1);
 
 	snprintf(TEMPFILE, sizeof(TEMPFILE), "%s/mmapfile%d", Hopt, getpid());
testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +4 -1
index 9b0ab4e37..8fc3f0c7e 100644
@@ -142,8 +142,11 @@ static void setup(void)
 		Hopt = tst_get_tmpdir();
 	SAFE_MOUNT("none", Hopt, "hugetlbfs", 0, NULL);
 
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 	set_sys_tune("nr_hugepages", hugepages, 1);
 
 	snprintf(TEMPFILE, sizeof(TEMPFILE), "%s/mmapfile%d", Hopt, getpid());
testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +4 -1
index 55a3a24f4..d797d73a9 100644
@@ -113,8 +113,11 @@ void setup(void)
 		Hopt = tst_get_tmpdir();
 	SAFE_MOUNT("none", Hopt, "hugetlbfs", 0, NULL);
 
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 	set_sys_tune("nr_hugepages", hugepages, 1);
 
 	snprintf(TEMPFILE, sizeof(TEMPFILE), "%s/mmapfile%d", Hopt, getpid());
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +4 -1
index 942f99e76..80d0738a7 100644
@@ -168,8 +168,11 @@ static void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +4 -1
index 1cba867e5..77f1e0093 100644
@@ -93,8 +93,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +4 -1
index 13221b1a8..32331feca 100644
@@ -88,8 +88,11 @@ static void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +4 -1
index c639c8e5f..024560529 100644
@@ -312,8 +312,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +4 -1
index 4009fd804..9bd28f46b 100644
@@ -93,8 +93,11 @@ static void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +4 -1
index 00872e9d6..1584659d0 100644
@@ -118,8 +118,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +4 -1
index d706d33b9..75be6a914 100644
@@ -133,8 +133,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +4 -1
index 70fb13185..ebe7f0e9b 100644
@@ -68,8 +68,11 @@ static void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +4 -1
index d1c0e64b8..2dfc36abc 100644
@@ -86,8 +86,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +4 -1
index 733a25cdb..1c3b775be 100644
@@ -65,8 +65,11 @@ static void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	SAFE_FILE_SCANF(PATH_SHMMNI, "%ld", &orig_shmmni);
 
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +4 -1
index 841f527b7..998bee717 100644
@@ -79,8 +79,11 @@ void setup(void)
 	long hpage_size;
 
 	save_nr_hugepages();
-	if (nr_opt)
+	if (nr_opt) {
 		hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+	} else {
+		hugepages = get_available_hugepages();
+	}
 
 	set_sys_tune("nr_hugepages", hugepages, 1);
 	hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/lib/hugetlb.c +16 -0
index 1ea47ebb5..dacbe4918 100644
@@ -56,6 +56,22 @@ void restore_nr_hugepages(void)
 		set_sys_tune("nr_hugepages", orig_hugepages, 0);
 }
 
+long get_available_hugepages(void)
+{
+	long page_sz = 0;
+	long mem_avail = 0;
+	long max_pages = 0;
+	long hugepages = 128;
+
+	page_sz = SAFE_READ_MEMINFO("Hugepagesize:");
+	mem_avail = SAFE_READ_MEMINFO("MemAvailable:");
+	max_pages = mem_avail/page_sz;
+	tst_res(TINFO, "max page available count is %ld", max_pages);
+	hugepages=(page_sz*hugepages>mem_avail)?max_pages:hugepages;
+
+	return hugepages;
+}
+
 /*
  * 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
index 2843f0a8e..48a8d08f3 100644
@@ -58,5 +58,6 @@ char *Hopt;
 void check_hugepage(void);
 long save_nr_hugepages(void);
 void restore_nr_hugepages(void);
+long get_available_hugepages(void);
 
 #endif /* hugetlb.h */
Signature · 1 line
2.17.2
#1 lore raw

PATCH v2 1/1 hugetlb: dynamically change default hugepages

Quoted 28 lines · Xiao Liang

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 use 128 as default hugepages, but it checks the memory available and Hugepagesize registered. If default 128 is larger than available count, then use the small one.

With this patch:
tst_test.c:1096: INFO: Timeout per run is 0h 05m 00s hugemmap01.c:99: INFO: max page available count is 54 mem.c:814: INFO: set nr_hugepages to 54 hugemmap01.c:73: PASS: call succeeded mem.c:814: INFO: set nr_hugepages to 0

Without this patch:
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

[...snip...]

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +0 -0
index 841f527b7..998bee717 100644

testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c void setup(void) · line 87

Quoted 10 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +4 -1
@@ -79,8 +79,11 @@ void setup(void)
        long hpage_size;
 
        save_nr_hugepages();
-       if (nr_opt)
+       if (nr_opt) {
                hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);
+       } else {
+               hugepages = get_available_hugepages();
+       }
 

There are still have two disadvantages if code change like these above.

1. No ganrantee for each hugepage test to initialize their default hugepages to 128. Suppose that if a new hugemmap07 is created with 'hugepages == 100' (or anything else but not 128), then this patch is make no sense to it. What we can do maybe just to create a simple function get_max_hugepages() in libarary.

2. if someone pass an improper value to hugepages via '-s #big_number#', that would still break this test as what you hit before.

So a wiser method is probably to compare a decided(no matter setting by ltp user or using default 128) huagepages with the max avaliable hugepages which system can provides. If the default value is larger than system max_hugepages, just use the proper one.

Something I'm thinking maybe like:

In hugemmap01.c:
---------------

void setup(void)
{
...

if (nr_opt)
hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);

if (hugepages > get_max_hugepages()) { tst_res(TINFO, "The hugepages beyond system available, here " "reset to 80%% of the max page count %ld", get_max_hugepages());
hugepages = get_max_hugepages() * 0.8;
}

...
}

In hugetlb libarary:
---------------
long get_max_hugepages(void)
{
return SAFE_READ_MEMINFO("MemFree:") / SAFE_READ_MEMINFO("Hugepagesize:"); }

More declaration:
I found that some old platforms(e.g. rhel6 i686) has no "MemAvailable:" in their /proc/meminfo, so I'd take use of "MemFree:" as an replacement. About to set hugepages only as 80% of the max pages count, is becuase of memory fragment issue, we cann't always get sequential meory to all reserve as huage pages, so this is to avoid the nr_hugepages setting failure in next step.

And what do you think? comment?

Quoted 8 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +0 -0
        set_sys_tune("nr_hugepages", hugepages, 1);
        hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;
testcases/kernel/mem/hugetlb/lib/hugetlb.c +0 -0
index 1ea47ebb5..dacbe4918 100644

testcases/kernel/mem/hugetlb/lib/hugetlb.c void restore_nr_hugepages(void) · line 61

Quoted 6 lines
testcases/kernel/mem/hugetlb/lib/hugetlb.c +3 -0
@@ -56,6 +56,22 @@ void restore_nr_hugepages(void)
                set_sys_tune("nr_hugepages", orig_hugepages, 0);
 }
 
+long get_available_hugepages(void)
+{
+       long page_sz = 0;

maybe declare as hpage_sz ?

testcases/kernel/mem/hugetlb/lib/hugetlb.c void restore_nr_hugepages(void)

Quoted 3 lines
testcases/kernel/mem/hugetlb/lib/hugetlb.c +2 -0
+       long mem_avail = 0;
+       long max_pages = 0;
 

max_hpages?

testcases/kernel/mem/hugetlb/lib/hugetlb.c void restore_nr_hugepages(void) · line 66

Quoted 2 lines
testcases/kernel/mem/hugetlb/lib/hugetlb.c +1 -0
+       long hugepages = 128;
 

Or, these local variable are redundant to the function.

testcases/kernel/mem/hugetlb/lib/hugetlb.c void restore_nr_hugepages(void)

Quoted 7 lines
testcases/kernel/mem/hugetlb/lib/hugetlb.c +6 -0
+
+       page_sz = SAFE_READ_MEMINFO("Hugepagesize:");
+       mem_avail = SAFE_READ_MEMINFO("MemAvailable:");
+       max_pages = mem_avail/page_sz;
+       tst_res(TINFO, "max page available count is %ld", max_pages);
+       hugepages=(page_sz*hugepages>mem_avail)?max_pages:hugepages;
 

Spaces are required between the operation expression.

Quoted 26 lines
testcases/kernel/mem/hugetlb/lib/hugetlb.c +4 -0
+
+       return hugepages;
+}
+

/*
* 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 -1
index 2843f0a8e..48a8d08f3 100644
@@ -58,5 +58,6 @@ char *Hopt;
 void check_hugepage(void);
 long save_nr_hugepages(void);
 void restore_nr_hugepages(void);
+long get_available_hugepages(void);
 
 #endif /* hugetlb.h */
--

2.17.2

--
Mailing list info: https://lists.linux.it/listinfo/ltp

Signature · 5 lines
Regards,
Li Wang
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190404/b09364d0/attachment.html>