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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DED8BCD4840 for ; Mon, 11 May 2026 16:34:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 513B06B0140; Mon, 11 May 2026 12:34:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C3726B0142; Mon, 11 May 2026 12:34:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3B2726B0143; Mon, 11 May 2026 12:34:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 24A996B0140 for ; Mon, 11 May 2026 12:34:52 -0400 (EDT) Received: from smtpin30.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E3A25160206 for ; Mon, 11 May 2026 16:34:51 +0000 (UTC) X-FDA: 84755687982.30.2D27A6A Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf17.hostedemail.com (Postfix) with ESMTP id 4E97B4000E for ; Mon, 11 May 2026 16:34:50 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E+I7jzkX; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1778517290; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YU0Mh/4wqxwtE/x4EBfHHhxmy42QMryvWhIKpxhXybU=; b=sokn4bpLFk+FNlmOb1fSCaAPve+VziqtKaIdF1fMcMwU1HSWnAlkuWFvl97d1sqgUs5a9o yaWRHsB9gLhNDzvrcxjVD/YKEdG3yJknMhKkbIk97953JjVqleRXSs78vLBhZPJPd3t9VF PJf4/K6/2QPMCwWgXfJdqvw0cjXWlfM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=E+I7jzkX; spf=pass (imf17.hostedemail.com: domain of rppt@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1778517290; a=rsa-sha256; cv=none; b=IZL47c8qUsjQ9VSSu+C/1bbOfNhTa/6QPgO9gp61geb6hVTp5FXASmqbAtDABqNRKkq8Sv gDChdGds4oQpnIR57HqhWGApPtTVmINwx8F7v8QMRu41skRyfcVIIJ9yczvruQJoVXLDfY +p+AqJD23giwiG6n0cBF8IDUgqtp1YM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id BFB67600CB; Mon, 11 May 2026 16:34:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7780DC2BCB0; Mon, 11 May 2026 16:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778517289; bh=8nR0ELKi7mbRVnmxjYNZjGeMYUYYYJwNNBptfNilokM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E+I7jzkXKdRKdySrSn134ag6OMHx+2+YsNNDNrt8UTVUya999OehInoOgd2qrhZmS n4me+JzaKWyzW04zbfT+z9Lsu/WNx/YaeuRaXzJA/aq00VZULVgDSvqaMtGlSj9ZaA KGPlM2NpreTNQK6LR5xx5P4vaAK1CvmzIrX2BcQLAUyYrAUTyheNh7z7nwwVD4liRB SZbIF91rKqIls6J1EE5PP0K22n6qk7p/NdeSQS9YU22QEl534t2Nznzed4HRIjsyYf JvLO9zMBtpv4kmu/q/smxBvegury63KKQCwUlIWuxwv6fEQY7MsQDO1SUHTD24y85y /2Em4CBqSIs3w== From: Mike Rapoport To: Andrew Morton , David Hildenbrand Cc: Baolin Wang , Barry Song , Dev Jain , Donet Tom , Jason Gunthorpe , John Hubbard , "Liam R. Howlett" , Lance Yang , Li Wang , Leon Romanovsky , Lorenzo Stoakes , Luiz Capitulino , Mark Brown , Michal Hocko , Mike Rapoport , Nico Pache , Peter Xu , Ryan Roberts , Sarthak Sharma , Shuah Khan , Suren Baghdasaryan , Vlastimil Babka , Zi Yan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v4 55/55] selftests/mm: run_vmtests.sh: drop detection and setup of HugeTLB Date: Mon, 11 May 2026 19:28:39 +0300 Message-ID: <20260511162840.375890-56-rppt@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260511162840.375890-1-rppt@kernel.org> References: <20260511162840.375890-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4E97B4000E X-Rspam-User: X-Stat-Signature: 18jdxd17zgjunrya4b6dh49h48ktaefh X-HE-Tag: 1778517290-337649 X-HE-Meta: U2FsdGVkX1+QUqvdHxkKOEapB2TpTQikv6/REJr4fv0v3Jv3rgn+p2p1HQzxkpGpOjOtfdSU8/jJfewGFbdlu7TaTRDIm4W4hdCyxJngKdyHr45PsbLsC0k2KRwtXSIkF4BduicZANmiYZcUJrjiIOf4GTgaxCQwyPA5isf0p+u3FptU5d+aGevPjCrcvzNF1OjM8riTy4UAZuJfH4NF3kmshwfxYYfuoAjaGw/z757JgS4EqdCV9FF4T/8kphmdLfDUU1DAg0d3O3eBA4O+uu9imTm3i7r48cEsAU6BQ2EeVbgHUvWtR2CwuiuVUXrSYTj5O/X1HpGwjTUAZEky1QJaBUVXFUdrwf1TgClsRONyMLTUO+vG6KCO2NpHcfwf2AA6haMqyXj3I2D3TuSK/W0+Q20lowa3Y6lxGy+2PDwXBV7XIA4f0C4LlBDyXj0LrhswIO5Vvh+tGHZoQjXuhag84rdEmfoAxdFWklmKJVuE12zCc7oZqQgFkb75k+Kle/rAfmzPUT1clH0jcE/aObRXiciiplpk3AHh9HZ+hu5vK1O6ELdwPTmVTGU4F46JfDNMu8ICYYLb5O99E2mvkUr2WY3q+ooG2lCRIHNdt9M5Dnd/UL6u7Da3gtvRCWULwyZ7QTOQW/IcIeAzW57cEtcn08tqoK00YDD8YEy8c8gicqw69dLY1Hmo8zwvlr6LVQALr3RIu063RMDpqcnxqrycavJMHr0+AWDCRkYQJpSjexwnssRRkolxQcRj4dPRYqh263zKWMXwuCU4+e6FU+V4XFRY3eqHKbbgUJ9WTDoJfB7/u9ub5w+R9JXkWElt5h5lwbmYD/cPPthCTyeZBGKTcVUPyXS1k+dQzEjpytwui2qFHw+rqU3vdol47D4OhTMA+O/DULFrBPK2gfNzCWN9ToCUud+l5DALgHlg2NV1oyQdMHbxOSsJ+2Ew+rz5T06o0eHn+mD5OqJr54w ucEwVlS5 StBqUDJSGvyPXbTyB68kNrRDYy04D/FDoIvY+Kdo/UZasK8NEXYkX/EltiofKo/FWSk1k2/aQ65Dz/ZyMG6bNpBuMz4IODppoH4n0oVFb1ab2GHcYPp4SAIWiOkGYuqNOlDIJIHWWwh4WY42DKv1FZopbpp6SLthqYZf27ZFqwP9db7H6r1JIU7qCfNegCCDGAYaBBy7rMwF1CwLWXlKhigarVWC2cTJUAtxj2vRmQ8KuXiodoOhatN/h/2swfQexGDdijwHDeKBtcj02bnvgMBv1E7T09azYF3QFI5+yag9RML9cE92Okdm0m6ZqYr+HzGzLEYLBimKyrv35AC2Nlh0Q3/YB477FvMF5PiBAnq07X+4= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" All the tests that use HugeTLB can detect and setup HugeTLB pages on their own. Drop detection and setup of HugeTLB from run_vmtests.sh. Tested-by: Luiz Capitulino Tested-by: Sarthak Sharma Signed-off-by: Mike Rapoport (Microsoft) --- tools/testing/selftests/mm/run_vmtests.sh | 125 ++-------------------- 1 file changed, 7 insertions(+), 118 deletions(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 45298157b155..73f14894790a 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -132,7 +132,7 @@ test_selected() { run_gup_matrix() { # -t: thp=on, -T: thp=off, -H: hugetlb=on - local hugetlb_mb=$(( needmem_KB / 1024 )) + local hugetlb_mb=256 for huge in -t -T "-H -m $hugetlb_mb"; do # -u: gup-fast, -U: gup-basic, -a: pin-fast, -b: pin-basic, -L: pin-longterm @@ -154,60 +154,6 @@ run_gup_matrix() { done } -# 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 - -# Simple hugetlbfs tests have a hardcoded minimum requirement of -# huge pages totaling 256MB (262144KB) in size. The userfaultfd -# hugetlb test requires a minimum of 2 * nr_cpus huge pages. Take -# both of these requirements into account and attempt to increase -# number of huge pages available. -nr_cpus=$(nproc) -uffd_min_KB=$((hpgsize_KB * nr_cpus * 2)) -hugetlb_min_KB=$((256 * 1024)) -if [[ $uffd_min_KB -gt $hugetlb_min_KB ]]; then - needmem_KB=$uffd_min_KB -else - needmem_KB=$hugetlb_min_KB -fi - -# set proper nr_hugepages -if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then - orig_nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) - needpgs=$((needmem_KB / hpgsize_KB)) - tries=2 - while [ "$tries" -gt 0 ] && [ "$freepgs" -lt "$needpgs" ]; do - lackpgs=$((needpgs - freepgs)) - echo 3 > /proc/sys/vm/drop_caches - if ! echo $((lackpgs + orig_nr_hugepgs)) > /proc/sys/vm/nr_hugepages; then - echo "Please run this test as root" - exit $ksft_skip - fi - while read -r name size unit; do - if [ "$name" = "HugePages_Free:" ]; then - freepgs=$size - fi - done < /proc/meminfo - tries=$((tries - 1)) - done - nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) - if [ "$freepgs" -lt "$needpgs" ]; then - printf "Not enough huge pages available (%d < %d)\n" \ - "$freepgs" "$needpgs" - fi - HAVE_HUGEPAGES=1 -else - echo "no hugetlbfs support in kernel?" - HAVE_HUGEPAGES=0 -fi - # filter 64bit architectures ARCH64STR="arm64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sparc64 x86_64" if [ -z "$ARCH" ]; then @@ -277,29 +223,13 @@ run_test() { echo "TAP version 13" | tap_output CATEGORY="hugetlb" run_test ./hugetlb-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 CATEGORY="hugetlb" run_test ./hugetlb-shm -echo "$shmmax" > /proc/sys/kernel/shmmax -echo "$shmall" > /proc/sys/kernel/shmall - CATEGORY="hugetlb" run_test ./hugetlb-mremap CATEGORY="hugetlb" run_test ./hugetlb-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise CATEGORY="hugetlb" run_test ./hugetlb_dio - -if [ "${HAVE_HUGEPAGES}" = "1" ]; then - nr_hugepages_tmp=$(cat /proc/sys/vm/nr_hugepages) - # For this test, we need one and just one huge page - echo 1 > /proc/sys/vm/nr_hugepages - CATEGORY="hugetlb" run_test ./hugetlb_fault_after_madv - CATEGORY="hugetlb" run_test ./hugetlb_madv_vs_map - # Restore the previous number of huge pages, since further tests rely on it - echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages -fi +CATEGORY="hugetlb" run_test ./hugetlb_fault_after_madv +CATEGORY="hugetlb" run_test ./hugetlb_madv_vs_map if test_selected "hugetlb"; then echo "NOTE: These hugetlb tests provide minimal coverage. Use" | tap_prefix @@ -326,44 +256,11 @@ CATEGORY="gup_test" run_test ./gup_longterm CATEGORY="userfaultfd" run_test ./uffd-unit-tests uffd_stress_bin=./uffd-stress CATEGORY="userfaultfd" run_test ${uffd_stress_bin} anon 20 16 -# Hugetlb tests require source and destination huge pages. Pass in almost half -# the size of the free pages we have, which is used for *each*. An adjustment -# of (nr_parallel - 1) is done (see nr_parallel in uffd-stress.c) to have some -# extra hugepages - this is done to prevent the test from failing by racily -# reserving more hugepages than strictly required. -# uffd-stress expects a region expressed in MiB, so we adjust -# half_ufd_size_MB accordingly. -adjustment=$(( (31 < (nr_cpus - 1)) ? 31 : (nr_cpus - 1) )) -half_ufd_size_MB=$((((freepgs - adjustment) * hpgsize_KB) / 1024 / 2)) -CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb "$half_ufd_size_MB" 32 -CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb-private "$half_ufd_size_MB" 32 +CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb 128 32 +CATEGORY="userfaultfd" run_test ${uffd_stress_bin} hugetlb-private 128 32 CATEGORY="userfaultfd" run_test ${uffd_stress_bin} shmem 20 16 CATEGORY="userfaultfd" run_test ${uffd_stress_bin} shmem-private 20 16 -# uffd-wp-mremap requires at least one page of each size. -have_all_size_hugepgs=true -declare -A nr_size_hugepgs -for f in /sys/kernel/mm/hugepages/**/nr_hugepages; do - old=$(cat $f) - nr_size_hugepgs["$f"]="$old" - if [ "$old" == 0 ]; then - echo 1 > "$f" - fi - if [ $(cat "$f") == 0 ]; then - have_all_size_hugepgs=false - break - fi -done -if $have_all_size_hugepgs; then - CATEGORY="userfaultfd" run_test ./uffd-wp-mremap -else - echo "# SKIP ./uffd-wp-mremap" -fi - -#cleanup -for f in "${!nr_size_hugepgs[@]}"; do - echo "${nr_size_hugepgs["$f"]}" > "$f" -done -echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages +CATEGORY="userfaultfd" run_test ./uffd-wp-mremap CATEGORY="compaction" run_test ./compaction_test @@ -387,12 +284,10 @@ CATEGORY="mremap" run_test ./mremap_test CATEGORY="hugetlb" run_test ./thuge-gen CATEGORY="hugetlb" run_test ./charge_reserved_hugetlb.sh -cgroup-v2 CATEGORY="hugetlb" run_test ./hugetlb_reparenting_test.sh -cgroup-v2 + if $RUN_DESTRUCTIVE; then -nr_hugepages_tmp=$(cat /proc/sys/vm/nr_hugepages) enable_soft_offline=$(cat /proc/sys/vm/enable_soft_offline) -echo 8 > /proc/sys/vm/nr_hugepages CATEGORY="hugetlb" run_test ./hugetlb-soft-offline -echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages echo "$enable_soft_offline" > /proc/sys/vm/enable_soft_offline CATEGORY="hugetlb" run_test ./hugetlb-read-hwpoison fi @@ -448,7 +343,6 @@ CATEGORY="ksm_numa" run_test ./ksm_tests -N -m 0 CATEGORY="ksm" run_test ./ksm_functional_tests # protection_keys tests -nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages) if [ -x ./protection_keys_32 ] then CATEGORY="pkey" run_test ./protection_keys_32 @@ -458,7 +352,6 @@ if [ -x ./protection_keys_64 ] then CATEGORY="pkey" run_test ./protection_keys_64 fi -echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages if [ -x ./soft-dirty ] then @@ -539,10 +432,6 @@ if [ -n "${LOADED_MOD}" ]; then modprobe -r hwpoison_inject > /dev/null 2>&1 fi -if [ "${HAVE_HUGEPAGES}" = 1 ]; then - echo "$orig_nr_hugepgs" > /proc/sys/vm/nr_hugepages -fi - echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" | tap_prefix echo "1..${count_total}" | tap_output -- 2.53.0