Skip to contentSkip to conversation

selftests-mm-skip-the-hugetlb-madvise-tests-on-unmet-hugepage-requirements.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 12, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests/mm: skip the hugetlb-madvise tests on unmet hugepage requirements
has been removed from the -mm tree. Its filename was
selftests-mm-skip-the-hugetlb-madvise-tests-on-unmet-hugepage-requirements.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Nico Pache <[email protected]>
Subject: selftests/mm: skip the hugetlb-madvise tests on unmet hugepage requirements
Date: Wed, 6 Mar 2024 15:37:14 -0700

Now that run_vmtests.sh does not guarantee that the correct hugepage count is available, skip the hugetlb-madvise test if the requirements are not met rather than failing.

---

 tools/testing/selftests/mm/hugetlb-madvise.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/mm/hugetlb-madvise.c renamed from tools/testing/selftests/mm/hugetlb-madvise.c~selftests-mm-skip-the-hugetlb-madvise-tests-on-unmet-hugepage-requirements +2 -1
@@ -19,6 +19,7 @@
 #include <sys/mman.h>
 #include <fcntl.h>
 #include "vm_util.h"
+#include "../kselftest.h"
 
 #define MIN_FREE_PAGES	20
 #define NR_HUGE_PAGES	10	/* common number of pages to map/allocate */
@@ -78,7 +79,7 @@ int main(int argc, char **argv)
 	free_hugepages = get_free_hugepages();
 	if (free_hugepages < MIN_FREE_PAGES) {
 		printf("Not enough free huge pages to test, exiting!\n");
-		exit(1);
+		exit(KSFT_SKIP);
 	}
 
 	fd = memfd_create(argv[0], MFD_HUGETLB);

_

Patches currently in -mm which might be from [email protected] are