Commit b665eed2 authored by Dev Jain's avatar Dev Jain Committed by Andrew Morton
Browse files

selftests/mm: hugetlb_madv_vs_map: avoid test skipping by querying hugepage size at runtime 

Currently, the size used in mmap() is statically defined, leading to
skipping of the test on a hugepage size other than 2 MB, since munmap()
won't free the hugepage for a size greater than 2 MB.  Hence, query the
size at runtime.

Also, there is no reason why a hugepage allocation should fail, since we
are using a simple mmap() using MAP_HUGETLB; hence, instead of skipping
the test, make it fail.

Link: https://lkml.kernel.org/r/20240509095447.3791573-1-dev.jain@arm.com


Signed-off-by: default avatarDev Jain <dev.jain@arm.com>
Reviewed-by: default avatarMuhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 88e4f525

tools/testing/selftests/mm/hugetlb_madv_vs_map.c

+9 −7
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include "vm_util.h"

#include "../kselftest.h"



#define MMAP_SIZE (1 << 21)

#define INLOOP_ITER 100



size_t mmap_size;

char *huge_ptr;



/* Touch the memory while it is being madvised() */
@@ -44,7 +44,7 @@ void *touch(void *unused) 
void *madv(void *unused)

{

	for (int i = 0; i < INLOOP_ITER; i++)

		madvise(huge_ptr, MMAP_SIZE, MADV_DONTNEED);

		madvise(huge_ptr, mmap_size, MADV_DONTNEED);



	return NULL;

}
@@ -59,7 +59,7 @@ void *map_extra(void *unused) 
	void *ptr;



	for (int i = 0; i < INLOOP_ITER; i++) {

		ptr = mmap(NULL, MMAP_SIZE, PROT_READ | PROT_WRITE,

		ptr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,

			   MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,

			   -1, 0);
@@ -93,14 +93,16 @@ int main(void) 
			       free_hugepages);

	}



	mmap_size = default_huge_page_size();



	while (max--) {

		huge_ptr = mmap(NULL, MMAP_SIZE, PROT_READ | PROT_WRITE,

		huge_ptr = mmap(NULL, mmap_size, PROT_READ | PROT_WRITE,

				MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,

				-1, 0);



		if ((unsigned long)huge_ptr == -1) {

			ksft_exit_skip("Failed to allocated huge page\n");

			return KSFT_SKIP;

			ksft_test_result_fail("Failed to allocate huge page\n");

			return KSFT_FAIL;

		}



		pthread_create(&thread1, NULL, madv, NULL);
@@ -117,7 +119,7 @@ int main(void) 
		}



		/* Unmap and restart */

		munmap(huge_ptr, MMAP_SIZE);

		munmap(huge_ptr, mmap_size);

	}



	return KSFT_PASS;