Commit 6e16f513 authored by Ryan Roberts's avatar Ryan Roberts Committed by Andrew Morton

selftests/mm: fix thuge-gen test bugs

thuge-gen was previously only munmapping part of the mmapped buffer, which
caused us to run out of 1G huge pages for a later part of the test.  Fix
this by munmapping the whole buffer.  Based on the code, it looks like a
typo rather than an intention to keep some of the buffer mapped.

thuge-gen was also calling mmap with SHM_HUGETLB flag (bit 11 set), which
is actually MAP_DENYWRITE in mmap context.  The man page says this flag is
ignored in modern kernels.  I'm pretty sure from the context that the
author intended to pass the MAP_HUGETLB flag so I've fixed that up too.

Link: https://lkml.kernel.org/r/20230724082522.1202616-5-ryan.roberts@arm.comSigned-off-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Florent Revest <revest@chromium.org>
Cc: Jérôme Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Peter Xu <peterx@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e515bce9
...@@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags) ...@@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags)
before, after, before - after, size); before, after, before - after, size);
assert(size == getpagesize() || (before - after) == NUM_PAGES); assert(size == getpagesize() || (before - after) == NUM_PAGES);
show(size); show(size);
err = munmap(map, size); err = munmap(map, size * NUM_PAGES);
assert(!err); assert(!err);
} }
...@@ -222,7 +222,7 @@ int main(void) ...@@ -222,7 +222,7 @@ int main(void)
test_mmap(ps, MAP_HUGETLB | arg); test_mmap(ps, MAP_HUGETLB | arg);
} }
printf("Testing default huge mmap\n"); printf("Testing default huge mmap\n");
test_mmap(default_hps, SHM_HUGETLB); test_mmap(default_hps, MAP_HUGETLB);
puts("Testing non-huge shmget"); puts("Testing non-huge shmget");
test_shmget(getpagesize(), 0); test_shmget(getpagesize(), 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment