Skip to contentSkip to conversation

hugemmap32: guarantee enough memory for gigantic hugepage

PATCH In review Li Wang 3 participants 4 messages May 8, 2023 – May 11, 2023

lore
Share & tools
lore

Li Wang

author
#0 lore raw

PATCH 1/1 hugemmap32: guarantee enough memory for gigantic hugepage

To get rid of warning on ppc64le:

hugemmap32.c:34: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages'
hugemmap32.c:35: TCONF: Can't update the gigantic hugepages. hugemmap32.c:69: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages': EINVAL (22)

  # ll /sys/kernel/mm/hugepages/
  total 0
  drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16384kB
  drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16777216kB
  # cat /proc/meminfo | grep -i Hugepagesize
  Hugepagesize:      16384 kB
  # free -h
                 total        used        free      shared  buff/cache   available
  Mem:           7.4Gi       1.1Gi       992Mi        13Mi       5.9Gi       6.3Gi
  Swap:          4.0Gi          0B       4.0Gi
---
 testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c | 6 ++++++
 1 file changed, 6 insertions(+)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +6 -0
index 34b322bfa..7ff23b236 100644
@@ -60,6 +60,12 @@ static void setup(void)
 		tst_brk(TCONF, "Gigantic hugepages not supported");
 
 	SAFE_CLOSEDIR(dir);
+
+	if (tst_available_mem() < (long long)hpage_size) {
+		g_hpage_path[0] = '\0';
+		tst_brk(TCONF, "No enough memory for gigantic hugepage reserving");
+	}
+
 	SAFE_FILE_LINES_SCANF(g_hpage_path, "%d", &org_g_hpages);
 }
 
Signature · 5 lines
2.40.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Reviewed-by on v1 1/1
#1 lore raw

Hi!

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c static void setup(void) · line 66

Quoted 12 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +4 -0
index 34b322bfa..7ff23b236 100644
@@ -60,6 +60,12 @@ static void setup(void)
 		tst_brk(TCONF, "Gigantic hugepages not supported");
 
 	SAFE_CLOSEDIR(dir);
+
+	if (tst_available_mem() < (long long)hpage_size) {
+		g_hpage_path[0] = '\0';
+		tst_brk(TCONF, "No enough memory for gigantic hugepage reserving");
                                                                       ^
								       reservation

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c static void setup(void) · line 70

Quoted 4 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +2 -0
+	}
+
 	SAFE_FILE_LINES_SCANF(g_hpage_path, "%d", &org_g_hpages);
 }

Otherwise it looks good:

Signature · 5 lines
Cyril Hrubis
[email protected]

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
In reply to Li Wang

Hi,

Quoted 32 lines · Li Wang

To get rid of warning on ppc64le:

hugemmap32.c:34: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages'
hugemmap32.c:35: TCONF: Can't update the gigantic hugepages. hugemmap32.c:69: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages': EINVAL (22)

   # ll /sys/kernel/mm/hugepages/
   total 0
   drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16384kB
   drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16777216kB
   # cat /proc/meminfo | grep -i Hugepagesize
   Hugepagesize:      16384 kB
   # free -h
                  total        used        free      shared  buff/cache   available
   Mem:           7.4Gi       1.1Gi       992Mi        13Mi       5.9Gi       6.3Gi
   Swap:          4.0Gi          0B       4.0Gi
---
  testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c | 6 ++++++
  1 file changed, 6 insertions(+)
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +0 -0
index 34b322bfa..7ff23b236 100644
@@ -60,6 +60,12 @@ static void setup(void)
  		tst_brk(TCONF, "Gigantic hugepages not supported");

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c static void setup(void) · line 70

Quoted 10 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +6 -0
 
  	SAFE_CLOSEDIR(dir);
+
+	if (tst_available_mem() < (long long)hpage_size) {
+		g_hpage_path[0] = '\0';
+		tst_brk(TCONF, "No enough memory for gigantic hugepage reserving");
+	}
+
  	SAFE_FILE_LINES_SCANF(g_hpage_path, "%d", &org_g_hpages);
  }

I also recommend calling SAFE_FILE_PRINTF("/proc/sys/vm/drop_caches", "3");

It doesn't whether you do it before or after tst_available_mem() since caches count as available.

Signature · 11 lines
Martin Doucha   [email protected]
QA Engineer for Software Maintenance
SUSE LINUX, s.r.o.
CORSO IIa
Krizikova 148/34
186 00 Prague 8
Czech Republic


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
author
#3 lore raw
Quoted 51 lines · Martin Doucha

Hi,

Quoted 7 lines · Li Wang

To get rid of warning on ppc64le:

hugemmap32.c:34: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages'
hugemmap32.c:35: TCONF: Can't update the gigantic hugepages. hugemmap32.c:69: TWARN: Failed to close FILE
'/sys/kernel/mm/hugepages/hugepages-16777216kB/nr_hugepages':

EINVAL (22)

Quoted 11 lines
   # ll /sys/kernel/mm/hugepages/
   total 0
   drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16384kB
   drwxr-xr-x. 2 root root 0 May  4 02:02 hugepages-16777216kB
   # cat /proc/meminfo | grep -i Hugepagesize
   Hugepagesize:      16384 kB
   # free -h
                  total        used        free      shared  buff/cache

available

Quoted 1 line

Mem: 7.4Gi 1.1Gi 992Mi 13Mi 5.9Gi

     6.3Gi

Review

Quoted 8 lines

Swap: 4.0Gi 0B 4.0Gi

---
  testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c | 6 ++++++
  1 file changed, 6 insertions(+)
(quoted diff) +0 -0

b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c static void setup(void) · line 66

Quoted 11 lines

index 34b322bfa..7ff23b236 100644

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +4 -0
@@ -60,6 +60,12 @@ static void setup(void)
              tst_brk(TCONF, "Gigantic hugepages not supported");
 
      SAFE_CLOSEDIR(dir);
+
+     if (tst_available_mem() < (long long)hpage_size) {
+             g_hpage_path[0] = '\0';
+             tst_brk(TCONF, "No enough memory for gigantic hugepage

reserving");

testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c static void setup(void) · line 70

Quoted 4 lines
testcases/kernel/mem/hugetlb/hugemmap/hugemmap32.c +2 -0
+     }
+
      SAFE_FILE_LINES_SCANF(g_hpage_path, "%d", &org_g_hpages);
  }
Quoted 6 lines

I also recommend calling SAFE_FILE_PRINTF("/proc/sys/vm/drop_caches", "3");

It doesn't whether you do it before or after tst_available_mem() since caches count as available.

Good point, could you send a patch or delay this work after release as well?

Quoted 11 lines

--
Martin Doucha [email protected]
QA Engineer for Software Maintenance
SUSE LINUX, s.r.o.
CORSO IIa
Krizikova 148/34
186 00 Prague 8
Czech Republic

Signature · 5 lines
Regards,
Li Wang

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