Add HUGETLBFS to the selftest configuration. Amend the vmtest script to pass hugetlb_cma=1G and hugetlb_cma_only=1. In order for hugepages to be available, ask qemu for 3G of memory so the CMA reservation succeeds.
Signed-off-by: Eric Chanudet <[email protected]> --- tools/testing/selftests/cgroup/config | 1 + tools/testing/selftests/cgroup/vmtest-memcg.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/config b/tools/testing/selftests/cgroup/config index c4f7df4f1b24..1c9034017682 100644 --- a/tools/testing/selftests/cgroup/config +++ b/tools/testing/selftests/cgroup/config @@ -8,3 +8,4 @@ CONFIG_CMA=y CONFIG_DMA_CMA=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_HEAPS_CMA=y +CONFIG_HUGETLBFS=y diff --git a/tools/testing/selftests/cgroup/vmtest-memcg.sh b/tools/testing/selftests/cgroup/vmtest-memcg.sh index b19b96731784..534a95ef5e07 100755 --- a/tools/testing/selftests/cgroup/vmtest-memcg.sh +++ b/tools/testing/selftests/cgroup/vmtest-memcg.sh @@ -116,7 +116,8 @@ vm_start() { --qemu="$(command -v "$QEMU")" \ --user root \ --ssh "$SSH_GUEST_PORT" \ - --append "cma=64M" \ + --memory 3G \ + --append "cma=64M hugetlb_cma=1G hugetlb_cma_only=1" \ --rw &>"$logfile" & local vng_pid=$! -- 2.53.0
