Update test script to also test HugeTLB support for guest_memfd. Signed-off-by: Ackerley Tng <ackerleytng@xxxxxxxxxx> Change-Id: I7c6cc25d6b86e1e0dc74018f46c7e2796fab6357 --- .../kvm/x86/private_mem_conversions_test.sh | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.sh b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.sh index 5dda6916e071..0d2c5fa729fd 100755 --- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.sh +++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.sh @@ -57,6 +57,17 @@ backing_src_types+=( shmem ) backing_src_types+=( shared_hugetlb ) || \ echo "skipping shared_hugetlb backing source type" +private_mem_backing_src_types=( private_mem_guest_mem ) +[ -n "$hugepage_default_enabled" ] && \ + private_mem_backing_src_types+=( private_mem_hugetlb ) || \ + echo "skipping private_mem_hugetlb backing source type" +[ -n "$hugepage_2mb_enabled" ] && \ + private_mem_backing_src_types+=( private_mem_hugetlb_2mb ) || \ + echo "skipping private_mem_hugetlb_2mb backing source type" +[ -n "$hugepage_1gb_enabled" ] && \ + private_mem_backing_src_types+=( private_mem_hugetlb_1gb ) || \ + echo "skipping private_mem_hugetlb_1gb backing source type" + set +e TEST_EXECUTABLE="$(dirname "$0")/private_mem_conversions_test" @@ -66,17 +77,21 @@ TEST_EXECUTABLE="$(dirname "$0")/private_mem_conversions_test" for src_type in "${backing_src_types[@]}"; do - set -x + for private_mem_src_type in "${private_mem_backing_src_types[@]}"; do - $TEST_EXECUTABLE -s "$src_type" -n $num_vcpus_to_test - $TEST_EXECUTABLE -s "$src_type" -n $num_vcpus_to_test -m $num_memslots_to_test + set -x - $TEST_EXECUTABLE -s "$src_type" -n $num_vcpus_to_test -g - $TEST_EXECUTABLE -s "$src_type" -n $num_vcpus_to_test -m $num_memslots_to_test -g + $TEST_EXECUTABLE -s "$src_type" -p "$private_mem_src_type" -n $num_vcpus_to_test + $TEST_EXECUTABLE -s "$src_type" -p "$private_mem_src_type" -n $num_vcpus_to_test -m $num_memslots_to_test - { set +x; } 2>/dev/null + $TEST_EXECUTABLE -s "$src_type" -p "$private_mem_src_type" -n $num_vcpus_to_test -g + $TEST_EXECUTABLE -s "$src_type" -p "$private_mem_src_type" -n $num_vcpus_to_test -m $num_memslots_to_test -g - echo + { set +x; } 2>/dev/null + + echo + + done done ) -- 2.49.0.1045.g170613ef41-goog