]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/mm: gup_test: add setup of HugeTLB pages
authorMike Rapoport (Microsoft) <rppt@kernel.org>
Mon, 11 May 2026 16:28:18 +0000 (19:28 +0300)
committerAndrew Morton <akpm@linux-foundation.org>
Sun, 21 Jun 2026 18:37:26 +0000 (11:37 -0700)
gup_test fails to run HugeTLB tests if there are no free huge pages
prepared by a wrapper script.

Add setup of HugeTLB pages to the test and make sure that the original
settings are restored on the test exit.

Link: https://lore.kernel.org/20260511162840.375890-35-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Tested-by: Luiz Capitulino <luizcap@redhat.com>
Tested-by: Sarthak Sharma <sarthak.sharma@arm.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Donet Tom <donettom@linux.ibm.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Lance Yang <lance.yang@linux.dev>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Liam Howlett <liam@infradead.org>
Cc: Li Wang <li.wang@linux.dev>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Nico Pache <npache@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/testing/selftests/mm/gup_test.c

index fb8f9ae49efa457d37274fff5dbacc9835fca3af..3f841a96f87068e874aeae56059b2597190e084c 100644 (file)
@@ -14,6 +14,7 @@
 #include <mm/gup_test.h>
 #include "kselftest.h"
 #include "vm_util.h"
+#include "hugepage_settings.h"
 
 #define MB (1UL << 20)
 
@@ -94,6 +95,7 @@ int main(int argc, char **argv)
        int filed, i, opt, nr_pages = 1, thp = -1, write = 1, nthreads = 1, ret;
        int flags = MAP_PRIVATE;
        char *file = "/dev/zero";
+       bool hugetlb = false;
        pthread_t *tid;
        char *p;
 
@@ -168,6 +170,7 @@ int main(int argc, char **argv)
                        break;
                case 'H':
                        flags |= (MAP_HUGETLB | MAP_ANONYMOUS);
+                       hugetlb = true;
                        break;
                default:
                        ksft_exit_fail_msg("Wrong argument\n");
@@ -199,6 +202,18 @@ int main(int argc, char **argv)
        }
 
        ksft_print_header();
+
+       if (hugetlb) {
+               unsigned long hp_size = default_huge_page_size();
+
+               if (!hp_size)
+                       ksft_exit_skip("HugeTLB is unavailable\n");
+
+               size = (size + hp_size - 1) & ~(hp_size - 1);
+               if (!hugetlb_setup_default(size / hp_size))
+                       ksft_exit_skip("Not enough huge pages\n");
+       }
+
        ksft_set_plan(nthreads);
 
        filed = open(file, O_RDWR|O_CREAT, 0664);