Skip to content

Commit ab00ddd

Browse files
Feng Tangakpm00
authored andcommitted
selftests/mm: compaction_test: support platform with huge mount of memory
When running mm selftest to verify mm patches, 'compaction_test' case failed on an x86 server with 1TB memory. And the root cause is that it has too much free memory than what the test supports. The test case tries to allocate 100000 huge pages, which is about 200 GB for that x86 server, and when it succeeds, it expects it's large than 1/3 of 80% of the free memory in system. This logic only works for platform with 750 GB ( 200 / (1/3) / 80% ) or less free memory, and may raise false alarm for others. Fix it by changing the fixed page number to self-adjustable number according to the real number of free memory. Link: https://lkml.kernel.org/r/20250423103645.2758-1-feng.tang@linux.alibaba.com Fixes: bd67d5c ("Test compaction of mlocked memory") Signed-off-by: Feng Tang <feng.tang@linux.alibaba.com> Acked-by: Dev Jain <dev.jain@arm.com> Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com> Tested-by: Baolin Wang <baolin.wang@inux.alibaba.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Sri Jayaramappa <sjayaram@akamai.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent a47694e commit ab00ddd

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

tools/testing/selftests/mm/compaction_test.c

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size,
9090
int compaction_index = 0;
9191
char nr_hugepages[20] = {0};
9292
char init_nr_hugepages[24] = {0};
93+
char target_nr_hugepages[24] = {0};
94+
int slen;
9395

9496
snprintf(init_nr_hugepages, sizeof(init_nr_hugepages),
9597
"%lu", initial_nr_hugepages);
@@ -106,11 +108,18 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size,
106108
goto out;
107109
}
108110

109-
/* Request a large number of huge pages. The Kernel will allocate
110-
as much as it can */
111-
if (write(fd, "100000", (6*sizeof(char))) != (6*sizeof(char))) {
112-
ksft_print_msg("Failed to write 100000 to /proc/sys/vm/nr_hugepages: %s\n",
113-
strerror(errno));
111+
/*
112+
* Request huge pages for about half of the free memory. The Kernel
113+
* will allocate as much as it can, and we expect it will get at least 1/3
114+
*/
115+
nr_hugepages_ul = mem_free / hugepage_size / 2;
116+
snprintf(target_nr_hugepages, sizeof(target_nr_hugepages),
117+
"%lu", nr_hugepages_ul);
118+
119+
slen = strlen(target_nr_hugepages);
120+
if (write(fd, target_nr_hugepages, slen) != slen) {
121+
ksft_print_msg("Failed to write %lu to /proc/sys/vm/nr_hugepages: %s\n",
122+
nr_hugepages_ul, strerror(errno));
114123
goto close_fd;
115124
}
116125

0 commit comments

Comments
 (0)