From nobody Fri May 3 05:58:49 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1D9BC6FA82 for ; Wed, 28 Sep 2022 18:44:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230486AbiI1So0 (ORCPT ); Wed, 28 Sep 2022 14:44:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233775AbiI1SoW (ORCPT ); Wed, 28 Sep 2022 14:44:22 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FD8BA3D52 for ; Wed, 28 Sep 2022 11:44:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664390659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=SbtPQhX9I84OROKbhbdRw5uccBlUUiAh7Z+QGzKyldg=; b=cQh4UdgkvRXE0R3uHhtp6S7VuK2AXUGo32NUO1u6pFpoSECdqzAaok0pvvKH/CFIhpomNb I/GUP86jjMtiHMhBXVXpknwbwZ/KLlYAtVOPGw8KUaD8/r5UyISxuWNw3Yyc6SVuEsWY2C aMez8kUYvDKU+QAWpzNwdO6UkeZD9Eo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-237-bjLl8cFAM5uc8tFFsHq22w-1; Wed, 28 Sep 2022 14:44:16 -0400 X-MC-Unique: bjLl8cFAM5uc8tFFsHq22w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C629329AB401; Wed, 28 Sep 2022 18:44:15 +0000 (UTC) Received: from jsavitz-csb.redhat.com (unknown [10.22.11.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27169492B04; Wed, 28 Sep 2022 18:44:14 +0000 (UTC) From: Joel Savitz To: linux-kernel@vger.kernel.org Cc: Joel Savitz , Andrew Morton , Shuah Khan , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-next@vger.kernel.org, Nico Pache Subject: [PATCH linux-next v5] selftests/vm: enable running select groups of tests Date: Wed, 28 Sep 2022 21:44:07 +0300 Message-Id: <20220928184407.628486-1-jsavitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Our memory management kernel CI testing at Red Hat uses the VM selftests and we have run into two problems: First, our LTP tests overlap with the VM selftests. We want to avoid unhelpful redundancy in our testing practices. Second, we have observed the current run_vmtests.sh to report overall failure/ambiguous results in the case that a machine lacks the necessary hardware to perform one or more of the tests. E.g. ksm tests that require more than one numa node. We want to be able to run the vm selftests suitable to particular hardware. Add the ability to run one or more groups of vm tests via run_vmtests.sh instead of simply all-or-none in order to solve these problems. Preserve existing default behavior of running all tests when the script is invoked with no arguments. Documentation of test groups is included in the patch as follows: # ./run_vmtests.sh [ -h || --help ] usage: ./tools/testing/selftests/vm/run_vmtests.sh [ -h | -t ""] -t: specify specific categories to tests to run -h: display this message The default behavior is to run all tests. Alternatively, specific groups tests can be run by passing a string to the -t argument containing one or more of the following categories separated by spaces: - mmap tests for mmap(2) - gup_test tests for gup using gup_test interface - userfaultfd tests for userfaultfd(2) - compaction a test for the patch "Allow compaction of unevictable pages" - mlock tests for mlock(2) - mremap tests for mremap(2) - hugevm tests for very large virtual address space - vmalloc vmalloc smoke tests - hmm hmm smoke tests - madv_populate test memadvise(2) MADV_POPULATE_{READ,WRITE} options - memfd_secret test memfd_secret(2) - process_mrelease test process_mrelease(2) - ksm ksm tests that do not require >=3D2 NUMA nodes - ksm_numa ksm tests that require >=3D2 NUMA nodes - pkey memory protection key tests example: ./run_vmtests.sh -t "hmm mmap ksm" Changes from v4: - fix imprecise checking in test_selected - drop conditional setup/cleanup of hugetlb Changes from v3: - rename variable TEST_ITEMS as VM_TEST_ITEMS Changes from v2: - rebase onto the mm-everyting branch in https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git - integrate this functionality with new the tests Changes from v1: - use a command line argument to pass the test categories to the script instead of an environmet variable - remove novel prints to avoid messing with extant parsers of this script - update the usage text Signed-off-by: Joel Savitz --- tools/testing/selftests/vm/run_vmtests.sh | 232 +++++++++++++++------- 1 file changed, 155 insertions(+), 77 deletions(-) diff --git a/tools/testing/selftests/vm/run_vmtests.sh b/tools/testing/self= tests/vm/run_vmtests.sh index 249295a10f56..f115e9a6d3a1 100755 --- a/tools/testing/selftests/vm/run_vmtests.sh +++ b/tools/testing/selftests/vm/run_vmtests.sh @@ -1,6 +1,6 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 -#please run as root +# Please run as root =20 # Kselftest framework requirement - SKIP code is 4. ksft_skip=3D4 @@ -8,15 +8,76 @@ ksft_skip=3D4 mnt=3D./huge exitcode=3D0 =20 -#get huge pagesize and freepages from /proc/meminfo -while read -r name size unit; do - if [ "$name" =3D "HugePages_Free:" ]; then - freepgs=3D"$size" +usage() { + cat <"] + -t: specify specific categories to tests to run + -h: display this message + +The default behavior is to run all tests. + +Alternatively, specific groups tests can be run by passing a string +to the -t argument containing one or more of the following categories +separated by spaces: +- mmap + tests for mmap(2) +- gup_test + tests for gup using gup_test interface +- userfaultfd + tests for userfaultfd(2) +- compaction + a test for the patch "Allow compaction of unevictable pages" +- mlock + tests for mlock(2) +- mremap + tests for mremap(2) +- hugevm + tests for very large virtual address space +- vmalloc + vmalloc smoke tests +- hmm + hmm smoke tests +- madv_populate + test memadvise(2) MADV_POPULATE_{READ,WRITE} options +- memfd_secret + test memfd_secret(2) +- process_mrelease + test process_mrelease(2) +- ksm + ksm tests that do not require >=3D2 NUMA nodes +- ksm_numa + ksm tests that require >=3D2 NUMA nodes +- pkey + memory protection key tests +example: ./run_vmtests.sh -t "hmm mmap ksm" +EOF + exit 0 +} + + +while getopts "ht:" OPT; do + case ${OPT} in + "h") usage ;; + "t") VM_SELFTEST_ITEMS=3D${OPTARG} ;; + esac +done +shift $((OPTIND -1)) + +# default behavior: run all tests +VM_SELFTEST_ITEMS=3D${VM_SELFTEST_ITEMS:-default} + +test_selected() { + if [ "$VM_SELFTEST_ITEMS" =3D=3D "default" ]; then + # If no VM_SELFTEST_ITEMS are specified, run all tests + return 0 fi - if [ "$name" =3D "Hugepagesize:" ]; then - hpgsize_KB=3D"$size" + # If test selected argument is one of the test items + if [[ " ${VM_SELFTEST_ITEMS[*]} " =3D~ " ${1} " ]]; then + return 0 + else + return 1 fi -done < /proc/meminfo +} =20 # Simple hugetlbfs tests have a hardcoded minimum requirement of # huge pages totaling 256MB (262144KB) in size. The userfaultfd @@ -28,7 +89,17 @@ hpgsize_MB=3D$((hpgsize_KB / 1024)) half_ufd_size_MB=3D$((((nr_cpus * hpgsize_MB + 127) / 128) * 128)) needmem_KB=3D$((half_ufd_size_MB * 2 * 1024)) =20 -#set proper nr_hugepages +# get huge pagesize and freepages from /proc/meminfo +while read -r name size unit; do + if [ "$name" =3D "HugePages_Free:" ]; then + freepgs=3D"$size" + fi + if [ "$name" =3D "Hugepagesize:" ]; then + hpgsize_KB=3D"$size" + fi +done < /proc/meminfo + +# set proper nr_hugepages if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then nr_hugepgs=3D$(cat /proc/sys/vm/nr_hugepages) needpgs=3D$((needmem_KB / hpgsize_KB)) @@ -57,140 +128,147 @@ else exit 1 fi =20 -#filter 64bit architectures +# filter 64bit architectures ARCH64STR=3D"arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 s= parc64 x86_64" if [ -z "$ARCH" ]; then ARCH=3D$(uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/') fi VADDR64=3D0 -echo "$ARCH64STR" | grep "$ARCH" && VADDR64=3D1 +echo "$ARCH64STR" | grep "$ARCH" &>/dev/null && VADDR64=3D1 =20 # Usage: run_test [test binary] [arbitrary test arguments...] run_test() { - local title=3D"running $*" - local sep=3D$(echo -n "$title" | tr "[:graph:][:space:]" -) - printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" - - "$@" - local ret=3D$? - if [ $ret -eq 0 ]; then - echo "[PASS]" - elif [ $ret -eq $ksft_skip ]; then - echo "[SKIP]" - exitcode=3D$ksft_skip - else - echo "[FAIL]" - exitcode=3D1 - fi + if test_selected ${CATEGORY}; then + echo "running: $1" + local title=3D"running $*" + local sep=3D$(echo -n "$title" | tr "[:graph:][:space:]" -) + printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" + + "$@" + local ret=3D$? + if [ $ret -eq 0 ]; then + echo "[PASS]" + elif [ $ret -eq $ksft_skip ]; then + echo "[SKIP]" + exitcode=3D$ksft_skip + else + echo "[FAIL]" + exitcode=3D1 + fi + fi # test_selected } =20 mkdir "$mnt" mount -t hugetlbfs none "$mnt" =20 -run_test ./hugepage-mmap +CATEGORY=3D"hugetlb" run_test ./hugepage-mmap =20 shmmax=3D$(cat /proc/sys/kernel/shmmax) shmall=3D$(cat /proc/sys/kernel/shmall) echo 268435456 > /proc/sys/kernel/shmmax echo 4194304 > /proc/sys/kernel/shmall -run_test ./hugepage-shm +CATEGORY=3D"hugetlb" run_test ./hugepage-shm echo "$shmmax" > /proc/sys/kernel/shmmax echo "$shmall" > /proc/sys/kernel/shmall =20 -run_test ./map_hugetlb +CATEGORY=3D"hugetlb" run_test ./map_hugetlb =20 -run_test ./hugepage-mremap "$mnt"/huge_mremap -rm -f "$mnt"/huge_mremap +CATEGORY=3D"hugetlb" run_test ./hugepage-mremap "$mnt"/huge_mremap +test_selected "hugetlb" && rm -f "$mnt"/huge_mremap =20 -run_test ./hugepage-vmemmap +CATEGORY=3D"hugetlb" run_test ./hugepage-vmemmap =20 -run_test ./hugetlb-madvise "$mnt"/madvise-test -rm -f "$mnt"/madvise-test +CATEGORY=3D"hugetlb" run_test ./hugetlb-madvise "$mnt"/madvise-test +test_selected "hugetlb" && rm -f "$mnt"/madvise-test =20 -echo "NOTE: The above hugetlb tests provide minimal coverage. Use" -echo " https://github.com/libhugetlbfs/libhugetlbfs.git for" -echo " hugetlb regression testing." +if test_selected "hugetlb"; then + echo "NOTE: These hugetlb tests provide minimal coverage. Use" + echo " https://github.com/libhugetlbfs/libhugetlbfs.git for" + echo " hugetlb regression testing." +fi =20 -run_test ./map_fixed_noreplace +CATEGORY=3D"mmap" run_test ./map_fixed_noreplace =20 # get_user_pages_fast() benchmark -run_test ./gup_test -u +CATEGORY=3D"gup_test" run_test ./gup_test -u # pin_user_pages_fast() benchmark -run_test ./gup_test -a +CATEGORY=3D"gup_test" run_test ./gup_test -a # Dump pages 0, 19, and 4096, using pin_user_pages: -run_test ./gup_test -ct -F 0x1 0 19 0x1000 +CATEGORY=3D"gup_test" run_test ./gup_test -ct -F 0x1 0 19 0x1000 =20 -run_test ./userfaultfd anon 20 16 -run_test ./userfaultfd anon:dev 20 16 +CATEGORY=3D"userfaultfd" run_test ./userfaultfd anon 20 16 +CATEGORY=3D"userfaultfd" run_test ./userfaultfd anon:dev 20 16 # Hugetlb tests require source and destination huge pages. Pass in half the # size ($half_ufd_size_MB), which is used for *each*. -run_test ./userfaultfd hugetlb "$half_ufd_size_MB" 32 -run_test ./userfaultfd hugetlb:dev "$half_ufd_size_MB" 32 -run_test ./userfaultfd hugetlb_shared "$half_ufd_size_MB" 32 "$mnt"/uffd-t= est +CATEGORY=3D"userfaultfd" run_test ./userfaultfd hugetlb "$half_ufd_size_MB= " 32 +CATEGORY=3D"userfaultfd" run_test ./userfaultfd hugetlb:dev "$half_ufd_siz= e_MB" 32 +CATEGORY=3D"userfaultfd" run_test ./userfaultfd hugetlb_shared "$half_ufd_= size_MB" 32 "$mnt"/uffd-test rm -f "$mnt"/uffd-test -run_test ./userfaultfd hugetlb_shared:dev "$half_ufd_size_MB" 32 "$mnt"/uf= fd-test +CATEGORY=3D"userfaultfd" run_test ./userfaultfd hugetlb_shared:dev "$half_= ufd_size_MB" 32 "$mnt"/uffd-test rm -f "$mnt"/uffd-test -run_test ./userfaultfd shmem 20 16 -run_test ./userfaultfd shmem:dev 20 16 - -#cleanup -umount "$mnt" -rm -rf "$mnt" -echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages +CATEGORY=3D"userfaultfd" run_test ./userfaultfd shmem 20 16 +CATEGORY=3D"userfaultfd" run_test ./userfaultfd shmem:dev 20 16 + +# cleanup (only needed when running hugetlb tests) +if test_selected "hugetlb"; then + umount "$mnt" + rm -rf "$mnt" + echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages +fi =20 -run_test ./compaction_test +CATEGORY=3D"compaction" run_test ./compaction_test =20 -run_test sudo -u nobody ./on-fault-limit +CATEGORY=3D"mlock" run_test sudo -u nobody ./on-fault-limit =20 -run_test ./map_populate +CATEGORY=3D"mmap" run_test ./map_populate =20 -run_test ./mlock-random-test +CATEGORY=3D"mlock" run_test ./mlock-random-test =20 -run_test ./mlock2-tests +CATEGORY=3D"mlock" run_test ./mlock2-tests =20 -run_test ./mrelease_test +CATEGORY=3D"process_mrelease" run_test ./mrelease_test =20 -run_test ./mremap_test +CATEGORY=3D"mremap" run_test ./mremap_test =20 -run_test ./thuge-gen +CATEGORY=3D"hugetlb" run_test ./thuge-gen =20 if [ $VADDR64 -ne 0 ]; then - run_test ./virtual_address_range + CATEGORY=3D"hugevm" run_test ./virtual_address_range =20 # virtual address 128TB switch test - run_test ./va_128TBswitch.sh + CATEGORY=3D"hugevm" run_test ./va_128TBswitch.sh fi # VADDR64 =20 # vmalloc stability smoke test -run_test ./test_vmalloc.sh smoke +CATEGORY=3D"vmalloc" run_test ./test_vmalloc.sh smoke =20 -run_test ./mremap_dontunmap +CATEGORY=3D"mremap" run_test ./mremap_dontunmap =20 -run_test ./test_hmm.sh smoke +CATEGORY=3D"hmm" run_test ./test_hmm.sh smoke =20 # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests -run_test ./madv_populate +CATEGORY=3D"madv_populate" run_test ./madv_populate =20 -run_test ./memfd_secret +CATEGORY=3D"memfd_secret" run_test ./memfd_secret =20 # KSM MADV_MERGEABLE test with 10 identical pages -run_test ./ksm_tests -M -p 10 +CATEGORY=3D"ksm" run_test ./ksm_tests -M -p 10 # KSM unmerge test -run_test ./ksm_tests -U +CATEGORY=3D"ksm" run_test ./ksm_tests -U # KSM test with 10 zero pages and use_zero_pages =3D 0 -run_test ./ksm_tests -Z -p 10 -z 0 +CATEGORY=3D"ksm" run_test ./ksm_tests -Z -p 10 -z 0 # KSM test with 10 zero pages and use_zero_pages =3D 1 -run_test ./ksm_tests -Z -p 10 -z 1 +CATEGORY=3D"ksm" run_test ./ksm_tests -Z -p 10 -z 1 # KSM test with 2 NUMA nodes and merge_across_nodes =3D 1 -run_test ./ksm_tests -N -m 1 +CATEGORY=3D"ksm_numa" run_test ./ksm_tests -N -m 1 # KSM test with 2 NUMA nodes and merge_across_nodes =3D 0 -run_test ./ksm_tests -N -m 0 +CATEGORY=3D"ksm_numa" run_test ./ksm_tests -N -m 0 =20 # protection_keys tests if [ $VADDR64 -eq 0 ]; then - run_test ./protection_keys_32 + CATEGORY=3D"pkey" run_test ./protection_keys_32 else - run_test ./protection_keys_64 + CATEGORY=3D"pkey" run_test ./protection_keys_64 fi =20 exit $exitcode --=20 2.31.1