From patchwork Wed Feb 12 17:44:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 13972257 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 D337EC02198 for ; Wed, 12 Feb 2025 17:45:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8927F6B0089; Wed, 12 Feb 2025 12:45:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 846386B008C; Wed, 12 Feb 2025 12:45:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6483D6B0092; Wed, 12 Feb 2025 12:45:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3E2BF6B0089 for ; Wed, 12 Feb 2025 12:45:55 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B147480321 for ; Wed, 12 Feb 2025 17:45:54 +0000 (UTC) X-FDA: 83112020628.02.2E02522 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id A081340005 for ; Wed, 12 Feb 2025 17:45:52 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Iihh7zap; spf=pass (imf01.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@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=1739382352; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NrMaIyxt2EC3K2Q9x+N5yhMusthXtEruvvq+Bu3A79I=; b=uIQy6+e2TEFFHePUElw1uupSZCr+t/b6vCFVNkF1rOaow0xB3v7Ixpesj84E/51R7R4eSl j3wVq2xBMv2F3InVYCY6Qfe0uFnV0LQKuhb5bI5iMytdY7VFgL2fC8rhYo/ToDX97DmI1C K5KlGZUYlAAwy8kfmid139GM6QB7Ztw= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Iihh7zap; spf=pass (imf01.hostedemail.com: domain of broonie@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=broonie@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739382352; a=rsa-sha256; cv=none; b=6PwcsQy2zqs/B4gfGaTfUCY0zJLuloKTiRp20G7PyuNmc5it40w2LY6jawOqk3NTzbs17X yNpwf+e6yOX9qzHgrpbMH5QQwW/YD/bEKlnDFQspwyuT9h216D8wlalDiDSKz7Gan85kSk fRVOOlG1vBPWbtdhqNTVn//vVdLx8tk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 24EDF5C6114; Wed, 12 Feb 2025 17:45:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E043C4CEE5; Wed, 12 Feb 2025 17:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739382351; bh=Am3KdYIPQjJJqDySmLeo2AVr33lxdKgLJ8ZrAYJIfwE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Iihh7zapczT7KxM5Vm3g/yb9+uPSB50XlzAuM/ZoQlE/5EuYk1NrXTxEN8WzE4vEd UypVyXnjfqXbtDsPro2pnKgJ93nwdPDsn8lkP+0Bh/OwBQIULiubjzbSzAV4AYYzsl WXdoYsEhJc52TSKIyoi8bvXruubS9li10FrChCFIa/WmAFblavJnYtwHVZfLKHE6tL fy43htODUYPox4RDzISQzzHxn1rOpNn352ZnGa/A1Lx+Uxrb/pPRfepwTAr07/y2RX j/m+yNQ04DRO+UeOKVJiHqQlAwBA4CSJDeIkyeowpS3ZvcU3LAA5Qsy1x8TyabvKfy FdzFdwFNiQoXg== From: Mark Brown Date: Wed, 12 Feb 2025 17:44:26 +0000 Subject: [PATCH 2/2] selftests/mm: Allow tests to run with no huge pages support MIME-Version: 1.0 Message-Id: <20250212-kselftest-mm-no-hugepages-v1-2-44702f538522@kernel.org> References: <20250212-kselftest-mm-no-hugepages-v1-0-44702f538522@kernel.org> In-Reply-To: <20250212-kselftest-mm-no-hugepages-v1-0-44702f538522@kernel.org> To: Andrew Morton , Shuah Khan Cc: Nico Pache , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.15-dev-1b0d6 X-Developer-Signature: v=1; a=openpgp-sha256; l=5034; i=broonie@kernel.org; h=from:subject:message-id; bh=Am3KdYIPQjJJqDySmLeo2AVr33lxdKgLJ8ZrAYJIfwE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBnrN5Il20DD+VhUdR0ubKKm9DDL6E/oyYts5aGN3Za zrQz7T2JATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZ6zeSAAKCRAk1otyXVSH0ICeB/ 4w/FgxT9RwtA7DwrjwxGCHSfCWlO/iDd4knXJQInuAxqYW2IveU6Y2bvg280rXvcuN4+hctl0uLwQK fp3zw+bBota+Gl+ftZ9rN9GrTSuGG8XMipvbBAUDfziHGsExY7LkD/OXHe3S7ukFBu23gfzbzvEiAX ty4OiU5xMUOEnC6szMeeiUFUU72RdJaReiAHLcwhhr6Gsxyq0C6CDVXpwEYLHXcaDowJEireF4mGaq GkEP2n938y7ooIcmA08JVDrjKZfEUUzwH1laDNEgVoV7HMuNuAL0hHNUFKjjyseOQWq3OerBry8xHw 2xZq/jwpdRGaasWQYe1dBPPEgUHsJZ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Rspam-User: X-Stat-Signature: mmgd7f9fsfmu6p33qer1fhwe375du1e8 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A081340005 X-HE-Tag: 1739382352-738741 X-HE-Meta: U2FsdGVkX1+1C2+BUdymE/iszOVQSsAjv6bj0nXDkdEr26EemR3U5LxjfsTd0mURSM0TzaYF7d+r/42tkMbQtg+qbkLT5k2g0lJrWQ3478d1FY6yXeF07gUK3fviFqBnM+JWLvSSWaIjdZnydyHIruz8AdIiE2pldhQOpNqjp6hO+CEhujUNQQUqXX939WkWMwu1a1Egm3oliQ9sDppa8uEt/1ayq/ddwRynOeReew+hksflBSca+JYnbHRBI5hqsR+RvtHvbve/a6YdIJmUphAzgYQFn/C/6TGB2nQtp+cOYGmZLtIOiLtkF/dvDr7kJ1qyHcqElG01b2AYoPK4rF9I4H+dPymwD6OCFG3NNWYvJpZcUTK79RIH5/w9Y5/5jjnlVa8ACC3eABl40a9avaSXFn2nfwKibHN15Monz8tijH2t6VlGzCOrphn4jEJql47ABNzb+QWp6mMRyEgpawr5t9KRmOTKKrPVhk74NVp9tjizslE41yNxet7TsjeHcebiLJqaZwKVav+vAI0KKCk/6pvxvyjyVRgNIzIOKQerdRad+aYphg1OsMlm81og/sF24fZ/QAjlJXzi7LGigWi5h9i3y+ow0XCAZI9hid5Evq6Dzqv5akq7q4guw/oDJPb+it45SwsjccJTKTAPjikPbdludS6ZC00arJA/iwkFbhVomCXKw1gSP5icmgYEhescexKah0vGPbk1St1rM7VD67qvmXr+eiL8v6DiImejPRD3++DdMmoMzAnbNZxfoOnb9efzcNmmFcDYt4rT2Bn7ZaNj/2PsVmkctf4pZE0w9uIIuiYncKzVFWTsCuOUQuov4MLl5akTeZ/G0lPqg+qlqIArZaOAfz6EUV9ZX5M4kMdmYeN+NhlQl9SCO2JQNvhySr0/it2lDSbJzvGoc0XhPPE7o+LcE+Ch8WEO5s0Lk1SZZFcRfUv+xjAOkLUGCcm+v9iGefFDqobKc2y gEU8Nkwt uxjneHSc2XDbSBAWbSEv52zMMzqfMTTFeBJpDemkPWhInfmUkEMdfc8X7aTo1Q+Egm/vmcWStdKypmQGbwBXQYdzna6kCOlOl2JwpITJRxdGcURApDOY6kAZ2XxKT9uvCbVfg+H0eJv69apoSfKkE7e4owmeUMef8WmIM0Ytu1E4zyqNgQJz7JDJXYgihKy+PAxMQ6ueNnVf19c3vr5JNTvFZvr8ap56+JNvJwj3z2dFS268r6pfJXykMaw== 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: List-Subscribe: List-Unsubscribe: Currently the mm selftests refuse to run if huge pages are not available in the current system but this is an optional feature and not all the tests actually require them. Change the test during startup to be non-fatal and skip or omit tests which actually rely on having huge pages, allowing the other tests to be run. The gup_test does support using madvise() to configure huge pages but it ignores the error code so we just let it run. Signed-off-by: Mark Brown Reviewed-by: Nico Pache --- tools/testing/selftests/mm/run_vmtests.sh | 66 ++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index da7e266681031d2772fb0c4139648904a18e0bf9..d3866b50a6e16a9ba08b6cf33d131edf2a9226be 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -187,9 +187,10 @@ if [ -n "$freepgs" ] && [ -n "$hpgsize_KB" ]; then printf "Not enough huge pages available (%d < %d)\n" \ "$freepgs" "$needpgs" fi + HAVE_HUGEPAGES=1 else echo "no hugetlbfs support in kernel?" - exit 1 + HAVE_HUGEPAGES=0 fi # filter 64bit architectures @@ -218,13 +219,20 @@ pretty_name() { # Usage: run_test [test binary] [arbitrary test arguments...] run_test() { if test_selected ${CATEGORY}; then + local skip=0 + # On memory constrainted systems some tests can fail to allocate hugepages. # perform some cleanup before the test for a higher success rate. if [ ${CATEGORY} == "thp" -o ${CATEGORY} == "hugetlb" ]; then - echo 3 > /proc/sys/vm/drop_caches - sleep 2 - echo 1 > /proc/sys/vm/compact_memory - sleep 2 + if [ "${HAVE_HUGEPAGES}" = "1" ]; then + echo 3 > /proc/sys/vm/drop_caches + sleep 2 + echo 1 > /proc/sys/vm/compact_memory + sleep 2 + else + echo "hugepages not supported" | tap_prefix + skip=1 + fi fi local test=$(pretty_name "$*") @@ -232,8 +240,12 @@ run_test() { local sep=$(echo -n "$title" | tr "[:graph:][:space:]" -) printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" | tap_prefix - ("$@" 2>&1) | tap_prefix - local ret=${PIPESTATUS[0]} + if [ "${skip}" != "1" ]; then + ("$@" 2>&1) | tap_prefix + local ret=${PIPESTATUS[0]} + else + local ret=$ksft_skip + fi count_total=$(( count_total + 1 )) if [ $ret -eq 0 ]; then count_pass=$(( count_pass + 1 )) @@ -271,13 +283,15 @@ CATEGORY="hugetlb" run_test ./hugepage-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise CATEGORY="hugetlb" run_test ./hugetlb_dio -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 +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 if test_selected "hugetlb"; then echo "NOTE: These hugetlb tests provide minimal coverage. Use" | tap_prefix @@ -391,7 +405,9 @@ CATEGORY="memfd_secret" run_test ./memfd_secret fi # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100 -CATEGORY="ksm" run_test ./ksm_tests -H -s 100 +if [ "${HAVE_HUGEPAGES}" = "1" ]; then + CATEGORY="ksm" run_test ./ksm_tests -H -s 100 +fi # KSM KSM_MERGE_TIME test with size of 100 CATEGORY="ksm" run_test ./ksm_tests -P -s 100 # KSM MADV_MERGEABLE test with 10 identical pages @@ -440,15 +456,17 @@ CATEGORY="thp" run_test ./transhuge-stress -d 20 # Try to create XFS if not provided if [ -z "${SPLIT_HUGE_PAGE_TEST_XFS_PATH}" ]; then - if test_selected "thp"; then - if grep xfs /proc/filesystems &>/dev/null; then - XFS_IMG=$(mktemp /tmp/xfs_img_XXXXXX) - SPLIT_HUGE_PAGE_TEST_XFS_PATH=$(mktemp -d /tmp/xfs_dir_XXXXXX) - truncate -s 314572800 ${XFS_IMG} - mkfs.xfs -q ${XFS_IMG} - mount -o loop ${XFS_IMG} ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} - MOUNTED_XFS=1 - fi + if [ "${HAVE_HUGEPAGES}" = "1" ]; then + if test_selected "thp"; then + if grep xfs /proc/filesystems &>/dev/null; then + XFS_IMG=$(mktemp /tmp/xfs_img_XXXXXX) + SPLIT_HUGE_PAGE_TEST_XFS_PATH=$(mktemp -d /tmp/xfs_dir_XXXXXX) + truncate -s 314572800 ${XFS_IMG} + mkfs.xfs -q ${XFS_IMG} + mount -o loop ${XFS_IMG} ${SPLIT_HUGE_PAGE_TEST_XFS_PATH} + MOUNTED_XFS=1 + fi + fi fi fi