From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD9F2C43334 for ; Sun, 19 Jun 2022 11:21:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E47526B0071; Sun, 19 Jun 2022 07:21:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD1F06B0073; Sun, 19 Jun 2022 07:21:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C49C16B0074; Sun, 19 Jun 2022 07:21:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id AF4BE6B0071 for ; Sun, 19 Jun 2022 07:21:07 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 797926DA for ; Sun, 19 Jun 2022 11:21:07 +0000 (UTC) X-FDA: 79594743774.10.0C9FA31 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id AD6F31400AD for ; Sun, 19 Jun 2022 11:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655637666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ua3Ce0UiwO9CYupYNLzjnGgQoqCOGhVi5u239CGdNHo=; b=SL25sXjccihY3cXqwAS9qzNTtSu9ivVRM0ttMj6JQ3ohTodlHv1hCu36QBlqNKRVTyLTqP /bPgR6GAQRnuFABUJRnZyQpYmYPAF4naFWfQDscy+txwaxts5ljVs+A2mX3xF+EOK05Ziw 2NZ3LCtds9+tzbe+C0DDlkU7uszMgWk= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-55-dI_rwc7DMZGjA21GR5h7Zw-1; Sun, 19 Jun 2022 07:21:04 -0400 X-MC-Unique: dI_rwc7DMZGjA21GR5h7Zw-1 Received: by mail-ed1-f70.google.com with SMTP id w14-20020a056402268e00b0043556edda4dso5837406edd.0 for ; Sun, 19 Jun 2022 04:21:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ua3Ce0UiwO9CYupYNLzjnGgQoqCOGhVi5u239CGdNHo=; b=fWKLa0l3MzJKRn8GJpZy9skQzzpKgdHbeIUXiMWk0MunFPXhxRayglJLHkx9ez0Rr1 ampv9Pewt8e9U8HYDHtfwFrwU3r3VS87BQkAVnPZemseaPNvnbHd8K0PHUhyFtiSQaE1 tqUy2zNxQ2yDyzk3woPcx5b9YkCO0B8ZqSA6bZId2ihySk8H6wxPbWATkiLyOhEcoPxv oGQKkpifKWutWuKn3mSswOdXh41PwTgs8SeQ+7w/gPnNiDX7iXpts8McP2srsTjHUel0 JzPc+jCSTSBFcJw0TJjfcYIxbcfN4FlG18OGu6Ejs32qzVfe8Ege37nzMCuNNqnndVTN 3ZtQ== X-Gm-Message-State: AJIora+2h3n/P6s9GUM98GuXkYYblAAlVazOS3p7MLijA1WvzMLCbAAP ihmfnYR3v9fyCaVoJilURcpz4JCRcnMG+eqX57FGmZh4Zaw4Jt9wonfTY/qBa1AWSSneNEOSroJ wQ9JS/2LK/NyUqw70p1k7QmZqVtY= X-Received: by 2002:a05:6402:1509:b0:435:6e97:2e51 with SMTP id f9-20020a056402150900b004356e972e51mr8012077edw.354.1655637663524; Sun, 19 Jun 2022 04:21:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uZpO8Q6GRS8ArTE9iT4l2vbajKofBwEp5gyt8gQ5Q2M8PEVKk/BWB7sWh4rwMyoE4L/P1P2XNGMw1FbSKm7tw= X-Received: by 2002:a05:6402:1509:b0:435:6e97:2e51 with SMTP id f9-20020a056402150900b004356e972e51mr8012048edw.354.1655637663234; Sun, 19 Jun 2022 04:21:03 -0700 (PDT) MIME-Version: 1.0 References: <20220610002046.3243874-1-jsavitz@redhat.com> In-Reply-To: <20220610002046.3243874-1-jsavitz@redhat.com> From: Nico Pache Date: Sun, 19 Jun 2022 07:20:36 -0400 Message-ID: Subject: Re: [RFC PATCH] selftests/vm: enable running select groups of tests To: Joel Savitz Cc: LKML , Andrew Morton , Shuah Khan , Linux MM , linux-kselftest@vger.kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655637667; a=rsa-sha256; cv=none; b=6gb9M6LCBFqYRZPF/T2t8zXbS4pRzfTo41T4k4idw9+Ciu7tkNHQHESf92rNKIRIndZh0P zDDsFUt/pdSxIpjD8uzArMrvhCHSx2fO3e3oco8PZigYKqiPSqnN6i9maEvvAkinzEXixf lP+FGZBMGVgn5B99BKJ4k8haXSsfH60= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SL25sXjc; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf09.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655637667; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ua3Ce0UiwO9CYupYNLzjnGgQoqCOGhVi5u239CGdNHo=; b=gDA4Ke7Mn583HZkZM2NV/lZRGTPO949HLac7AzmTa0ml+NOoU5x3p56ANnv8BR/hhc0FAB FmV3uRshcUGlvnUztNmMBTxCJSW3DYqmtJ1GT929ISnOOZc/SqeNBr5kLAyyc2FgQjJ3Ra wUGeVu/9nkgCbZ5efO/p+6UyxuxqyDg= X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: AD6F31400AD X-Stat-Signature: knokheq7jz1o13t377iqi5o4tu3y3kaq X-Rspam-User: Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=SL25sXjc; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf09.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=npache@redhat.com X-HE-Tag: 1655637666-973030 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hey Joel, good work on this! I dont see anything wrong with this and the added functionality is very nice. I reviewed the code changes and everything seems to be correct. I also ran the code with a few examples, including correct and incorrect examples, and was not able to break it. Cheers, -- Nico Tested-by: Nico Pache Acked-by: Nico Pache On Thu, Jun 9, 2022 at 8:20 PM Joel Savitz wrote: > > Add the ability to run one or more groups of vm tests (specified > by the environment variable TEST_ITEMS). Preserve existing default > behavior of running all tests when TEST_ITEMS is empty or "default". > > 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 ] > -h: display this message > > The default behavior is to run all tests. > > Alternatively, specific groups tests can be run by defining > the TEST_ITEMS shell variable with a space-separated string > of one or more of the following: > - 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 >=2 NUMA nodes > - ksm_numa > ksm tests that require >=2 NUMA nodes > example: TEST_ITEMS="hmm mmap ksm" ./run_vmtests.sh > > Signed-off-by: Joel Savitz > --- > tools/testing/selftests/vm/run_vmtests.sh | 224 +++++++++++++++------- > 1 file changed, 150 insertions(+), 74 deletions(-) > > diff --git a/tools/testing/selftests/vm/run_vmtests.sh b/tools/testing/selftests/vm/run_vmtests.sh > index 41fce8bea929..d31fc66205f8 100755 > --- a/tools/testing/selftests/vm/run_vmtests.sh > +++ b/tools/testing/selftests/vm/run_vmtests.sh > @@ -1,22 +1,74 @@ > #!/bin/bash > # SPDX-License-Identifier: GPL-2.0 > -#please run as root > +# Please run as root > > # Kselftest framework requirement - SKIP code is 4. > ksft_skip=4 > > mnt=./huge > exitcode=0 > - > -#get huge pagesize and freepages from /proc/meminfo > -while read -r name size unit; do > - if [ "$name" = "HugePages_Free:" ]; then > - freepgs="$size" > - fi > - if [ "$name" = "Hugepagesize:" ]; then > - hpgsize_KB="$size" > +nr_tests_ran=0 > + > +if [ ${1:-0} == "-h" ] || [ ${1:-0} == "--help" ] > +then > + cat < +usage: ${BASH_SOURCE[0]:-$0} [ -h ] > + -h: display this message > + > +The default behavior is to run all tests. > + > +Alternatively, specific groups tests can be run by defining > +the TEST_ITEMS shell variable with a space-separated string > +of one or more of the following: > +- 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 >=2 NUMA nodes > +- ksm_numa > + ksm tests that require >=2 NUMA nodes > +example: TEST_ITEMS="hmm mmap ksm" ./run_vmtests.sh > +EOF > + exit 0 > +fi # $1 == -h || $1 == --help > + > +# default behavior: run all tests > +TEST_ITEMS=${TEST_ITEMS:-default} > + > +echo "Selected test items: ${TEST_ITEMS}" > + > +test_selected() { > + if [ "$TEST_ITEMS" == "default" ]; then > + # If no TEST_ITEMS are specified, run all tests > + return 0 > fi > -done < /proc/meminfo > + echo ${TEST_ITEMS} | grep ${1} 2>&1 >/dev/null > + return ${?} > +} > + > +# Hugepage setup only needed for hugetlb tests > +if test_selected "hugetlb"; then > > # Simple hugetlbfs tests have a hardcoded minimum requirement of > # huge pages totaling 256MB (262144KB) in size. The userfaultfd > @@ -28,7 +80,17 @@ hpgsize_MB=$((hpgsize_KB / 1024)) > half_ufd_size_MB=$((((nr_cpus * hpgsize_MB + 127) / 128) * 128)) > needmem_KB=$((half_ufd_size_MB * 2 * 1024)) > > -#set proper nr_hugepages > +# get huge pagesize and freepages from /proc/meminfo > +while read -r name size unit; do > + if [ "$name" = "HugePages_Free:" ]; then > + freepgs="$size" > + fi > + if [ "$name" = "Hugepagesize:" ]; then > + hpgsize_KB="$size" > + fi > +done < /proc/meminfo > + > +# set proper nr_hugepages > if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then > nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) > needpgs=$((needmem_KB / hpgsize_KB)) > @@ -57,126 +119,140 @@ else > exit 1 > fi > > -#filter 64bit architectures > +fi # test_selected "hugetlb" > + > +# filter 64bit architectures > ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64" > if [ -z "$ARCH" ]; then > ARCH=$(uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/') > fi > VADDR64=0 > -echo "$ARCH64STR" | grep "$ARCH" && VADDR64=1 > +echo "$ARCH64STR" | grep "$ARCH" &>/dev/null && VADDR64=1 > > # Usage: run_test [test binary] [arbitrary test arguments...] > run_test() { > - local title="running $*" > - local sep=$(echo -n "$title" | tr "[:graph:][:space:]" -) > - printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" > - > - "$@" > - local ret=$? > - if [ $ret -eq 0 ]; then > - echo "[PASS]" > - elif [ $ret -eq $ksft_skip ]; then > - echo "[SKIP]" > - exitcode=$ksft_skip > - else > - echo "[FAIL]" > - exitcode=1 > - fi > + if test_selected ${CATEGORY}; then > + local title="running $*" > + local sep=$(echo -n "$title" | tr "[:graph:][:space:]" -) > + printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" > + > + "$@" > + local ret=$? > + if [ $ret -eq 0 ]; then > + echo "[PASS]" > + elif [ $ret -eq $ksft_skip ]; then > + echo "[SKIP]" > + exitcode=$ksft_skip > + else > + echo "[FAIL]" > + exitcode=1 > + fi > + nr_tests_ran=$((nr_tests_ran + 1)) > + fi # test_selected > } > > -mkdir "$mnt" > -mount -t hugetlbfs none "$mnt" > +# setup only needed for hugetlb tests > +if test_selected "hugetlb"; then > + mkdir "$mnt" > + mount -t hugetlbfs none "$mnt" > +fi > > -run_test ./hugepage-mmap > +CATEGORY="hugetlb" run_test ./hugepage-mmap > > shmmax=$(cat /proc/sys/kernel/shmmax) > shmall=$(cat /proc/sys/kernel/shmall) > echo 268435456 > /proc/sys/kernel/shmmax > echo 4194304 > /proc/sys/kernel/shmall > -run_test ./hugepage-shm > +CATEGORY="hugetlb" run_test ./hugepage-shm > echo "$shmmax" > /proc/sys/kernel/shmmax > echo "$shmall" > /proc/sys/kernel/shmall > > -run_test ./map_hugetlb > +CATEGORY="hugetlb" run_test ./map_hugetlb > > -run_test ./hugepage-mremap "$mnt"/huge_mremap > -rm -f "$mnt"/huge_mremap > +CATEGORY="hugetlb" run_test ./hugepage-mremap "$mnt"/huge_mremap > +test_selected "hugetlb" && rm -f "$mnt"/huge_mremap > > -run_test ./hugepage-vmemmap > +CATEGORY="hugetlb" run_test ./hugepage-vmemmap > > -run_test ./hugetlb-madvise "$mnt"/madvise-test > -rm -f "$mnt"/madvise-test > +CATEGORY="hugetlb" run_test ./hugetlb-madvise "$mnt"/madvise-test > +test_selected "hugetlb" && rm -f "$mnt"/madvise-test > > -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 > > -run_test ./map_fixed_noreplace > +CATEGORY="mmap" run_test ./map_fixed_noreplace > > # get_user_pages_fast() benchmark > -run_test ./gup_test -u > +CATEGORY="gup_test" run_test ./gup_test -u > # pin_user_pages_fast() benchmark > -run_test ./gup_test -a > +CATEGORY="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="gup_test" run_test ./gup_test -ct -F 0x1 0 19 0x1000 > > -run_test ./userfaultfd anon 20 16 > +CATEGORY="userfaultfd" run_test ./userfaultfd anon 20 16 > # Test requires source and destination huge pages. Size of source > # (half_ufd_size_MB) is passed as argument to test. > -run_test ./userfaultfd hugetlb "$half_ufd_size_MB" 32 > -run_test ./userfaultfd shmem 20 16 > - > -#cleanup > -umount "$mnt" > -rm -rf "$mnt" > -echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages > +CATEGORY="userfaultfd" run_test ./userfaultfd hugetlb "$half_ufd_size_MB" 32 > +CATEGORY="userfaultfd" run_test ./userfaultfd shmem 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 > > -run_test ./compaction_test > +CATEGORY="compaction" run_test ./compaction_test > > -run_test sudo -u nobody ./on-fault-limit > +CATEGORY="mlock" run_test sudo -u nobody ./on-fault-limit > > -run_test ./map_populate > +CATEGORY="mmap" run_test ./map_populate > > -run_test ./mlock-random-test > +CATEGORY="mlock" run_test ./mlock-random-test > > -run_test ./mlock2-tests > +CATEGORY="mlock" run_test ./mlock2-tests > > -run_test ./mrelease_test > +CATEGORY="process_mrelease" run_test ./mrelease_test > > -run_test ./mremap_test > +CATEGORY="mremap" run_test ./mremap_test > > -run_test ./thuge-gen > +CATEGORY="hugetlb" run_test ./thuge-gen > > if [ $VADDR64 -ne 0 ]; then > - run_test ./virtual_address_range > + CATEGORY="hugevm" run_test ./virtual_address_range > > # virtual address 128TB switch test > - run_test ./va_128TBswitch > + CATEGORY="hugevm" run_test ./va_128TBswitch > fi # VADDR64 > > # vmalloc stability smoke test > -run_test ./test_vmalloc.sh smoke > +CATEGORY="vmalloc" run_test ./test_vmalloc.sh smoke > > -run_test ./mremap_dontunmap > +CATEGORY="mremap" run_test ./mremap_dontunmap > > -run_test ./test_hmm.sh smoke > +CATEGORY="hmm" run_test ./test_hmm.sh smoke > > # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests > -run_test ./madv_populate > +CATEGORY="madv_populate" run_test ./madv_populate > > -run_test ./memfd_secret > +CATEGORY="memfd_secret" run_test ./memfd_secret > > # KSM MADV_MERGEABLE test with 10 identical pages > -run_test ./ksm_tests -M -p 10 > +CATEGORY="ksm" run_test ./ksm_tests -M -p 10 > # KSM unmerge test > -run_test ./ksm_tests -U > +CATEGORY="ksm" run_test ./ksm_tests -U > # KSM test with 10 zero pages and use_zero_pages = 0 > -run_test ./ksm_tests -Z -p 10 -z 0 > +CATEGORY="ksm" run_test ./ksm_tests -Z -p 10 -z 0 > # KSM test with 10 zero pages and use_zero_pages = 1 > -run_test ./ksm_tests -Z -p 10 -z 1 > +CATEGORY="ksm" run_test ./ksm_tests -Z -p 10 -z 1 > # KSM test with 2 NUMA nodes and merge_across_nodes = 1 > -run_test ./ksm_tests -N -m 1 > +CATEGORY="ksm_numa" run_test ./ksm_tests -N -m 1 > # KSM test with 2 NUMA nodes and merge_across_nodes = 0 > -run_test ./ksm_tests -N -m 0 > +CATEGORY="ksm_numa" run_test ./ksm_tests -N -m 0 > + > +echo "Ran $nr_tests_ran tests" > > exit $exitcode > -- > 2.31.1 >