From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED24E3FB7FD for ; Fri, 27 Mar 2026 17:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774634363; cv=none; b=aifkeXkmegB4jHrLiV/NFTx1mz648NuG+UPP6OA9IDexDGfjUh2IGCi14d4QI5gCx8W4CCq50e7dVbDsRJARXK6pSu9eqcUkZ7MCKFo1CMmiZQRPN8bRHNtfGzFw1dXdJ7G5qtNe7AYDnqehyOQDGGXDbv0yN5DeYl8dpk2lECM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774634363; c=relaxed/simple; bh=cIWpZMAF/7R/KSfPJTljeBnerzszsZjNCupLYMQb6BI=; h=Date:To:From:Subject:Message-Id; b=lcQ1HUpPBaP0KvN83Vw7thi4rKZ+RCCL6qT0a1GwVE4QaexPPuE7YA6Xq7FEOFmyDRXWEXFMj5AfgbuBhqjI9Ztx/8J2Ww7fRt4+tlyO1g9R3xDWAPkuUhAboI2nC7MepxbsIU7HfR5q/RWticuVqZ/AOdxjksZHxQ08FPXzJ9k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=QIK/sc6U; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="QIK/sc6U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3832C19423; Fri, 27 Mar 2026 17:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1774634362; bh=cIWpZMAF/7R/KSfPJTljeBnerzszsZjNCupLYMQb6BI=; h=Date:To:From:Subject:From; b=QIK/sc6UjDcGOLf9BrYvSGAanptSs2mvPWVCt9vfbF6L6NwaEg/Ls+MduWKbNRGVS C/vVnXo1CtrhBbfKjppO8QSbW/FI5S8ut0+xOYU8EuwnS7eMcwFo1md6aLii9nEAIB NIqsd80eEPyF7NJgHPb8751K9t4xLxfvm6XMfm3U= Date: Fri, 27 Mar 2026 10:59:22 -0700 To: mm-commits@vger.kernel.org,sayalip@linux.ibm.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] selftests-mm-move-hwpoison-setup-into-run_test-and-silence-modprobe-output-for-memory-failure-category.patch removed from -mm tree Message-Id: <20260327175922.C3832C19423@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: selftests/mm: move hwpoison setup into run_test() and silence modprobe output for memory-failure category has been removed from the -mm tree. Its filename was selftests-mm-move-hwpoison-setup-into-run_test-and-silence-modprobe-output-for-memory-failure-category.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Sayali Patil Subject: selftests/mm: move hwpoison setup into run_test() and silence modprobe output for memory-failure category Date: Thu, 12 Mar 2026 17:55:39 +0530 run_vmtests.sh contains special handling to ensure the hwpoison_inject module is available for the memory-failure tests. This logic was implemented outside of run_test(), making the setup category-specific but managed globally. Move the hwpoison_inject handling into run_test() and restrict it to the memory-failure category so that: 1. the module is checked and loaded only when memory-failure tests run, 2. the test is skipped if the module or the debugfs interface (/sys/kernel/debug/hwpoison/) is not available. 3. the module is unloaded after the test if it was loaded by the script. This localizes category-specific setup and makes the test flow consistent with other per-category preparations. While updating this logic, fix the module availability check. The script previously used: modprobe -R hwpoison_inject The -R option prints the resolved module name to stdout, causing every run to print: hwpoison_inject in the test output, even when no action is required, introducing unnecessary noise. Replace this with: modprobe -n hwpoison_inject which verifies that the module is loadable without producing output, keeping the selftest logs clean and consistent. Link: https://lkml.kernel.org/r/35a44ccc4d1587255e8f920b22e983f74c024f2e.1773305678.git.sayalip@linux.ibm.com Fixes: ff4ef2fbd101 ("selftests/mm: add memory failure anonymous page test") Signed-off-by: Sayali Patil Acked-by: Zi Yan Acked-by: Miaohe Lin Cc: David Hildenbrand Cc: Dev Jain Cc: Johannes Weiner Cc: Liam Howlett Cc: Lorenzo Stoakes (Oracle) Cc: Michal Hocko Cc: "Michal Koutný" Cc: Muchun Song Cc: Oscar Salvador Cc: "Ritesh Harjani (IBM)" Cc: Roman Gushchin Cc: Shakeel Butt Cc: Shuah Khan Cc: Tejun Heo Signed-off-by: Andrew Morton --- tools/testing/selftests/mm/run_vmtests.sh | 46 ++++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) --- a/tools/testing/selftests/mm/run_vmtests.sh~selftests-mm-move-hwpoison-setup-into-run_test-and-silence-modprobe-output-for-memory-failure-category +++ a/tools/testing/selftests/mm/run_vmtests.sh @@ -250,6 +250,27 @@ run_test() { fi fi + # Ensure hwpoison_inject is available for memory-failure tests + if [ "${CATEGORY}" = "memory-failure" ]; then + # Try to load hwpoison_inject if not present. + HWPOISON_DIR=/sys/kernel/debug/hwpoison/ + if [ ! -d "$HWPOISON_DIR" ]; then + if ! modprobe -n hwpoison_inject > /dev/null 2>&1; then + echo "Module hwpoison_inject not found, skipping..." \ + | tap_prefix + skip=1 + else + modprobe hwpoison_inject > /dev/null 2>&1 + LOADED_MOD=1 + fi + fi + + if [ ! -d "$HWPOISON_DIR" ]; then + echo "hwpoison debugfs interface not present" | tap_prefix + skip=1 + fi + fi + local test=$(pretty_name "$*") local title="running $*" local sep=$(echo -n "$title" | tr "[:graph:][:space:]" -) @@ -261,6 +282,12 @@ run_test() { else local ret=$ksft_skip fi + + # Unload hwpoison_inject if we loaded it + if [ -n "${LOADED_MOD}" ]; then + modprobe -r hwpoison_inject > /dev/null 2>&1 + fi + count_total=$(( count_total + 1 )) if [ $ret -eq 0 ]; then count_pass=$(( count_pass + 1 )) @@ -542,24 +569,7 @@ CATEGORY="page_frag" run_test ./test_pag CATEGORY="rmap" run_test ./rmap -# Try to load hwpoison_inject if not present. -HWPOISON_DIR=/sys/kernel/debug/hwpoison/ -if [ ! -d "$HWPOISON_DIR" ]; then - if ! modprobe -q -R hwpoison_inject; then - echo "Module hwpoison_inject not found, skipping..." - else - modprobe hwpoison_inject > /dev/null 2>&1 - LOADED_MOD=1 - fi -fi - -if [ -d "$HWPOISON_DIR" ]; then - CATEGORY="memory-failure" run_test ./memory-failure -fi - -if [ -n "${LOADED_MOD}" ]; then - modprobe -r hwpoison_inject > /dev/null 2>&1 -fi +CATEGORY="memory-failure" run_test ./memory-failure if [ "${HAVE_HUGEPAGES}" = 1 ]; then echo "$orig_nr_hugepgs" > /proc/sys/vm/nr_hugepages _ Patches currently in -mm which might be from sayalip@linux.ibm.com are a.patch selftests-cgroup-extend-test_hugetlb_memcgc-to-support-all-huge-page-sizes.patch