On 4/29/26 2:12 AM, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <[email protected]>
> 
> 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.
> 
> Signed-off-by: Mike Rapoport (Microsoft) <[email protected]>

I ran the test with the -H flag before and after applying the patch.
Before the patch, the test bailed out with "mmap: Cannot allocate
memory". After the patch, it automatically detects and allocates
hugepages and the test passes successfully.

Tested-by: Sarthak Sharma <[email protected]>

> ---
>  tools/testing/selftests/mm/gup_test.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/tools/testing/selftests/mm/gup_test.c 
> b/tools/testing/selftests/mm/gup_test.c
> index fb8f9ae49efa..ddd239a69881 100644
> --- a/tools/testing/selftests/mm/gup_test.c
> +++ b/tools/testing/selftests/mm/gup_test.c
> @@ -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,15 @@ int main(int argc, char **argv)
>       }
>  
>       ksft_print_header();
> +
> +     if (hugetlb) {
> +             unsigned long hp_size = default_huge_page_size();
> +
> +             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);


Reply via email to