github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

selftests/mm: move hwpoison setup into run_test() and silence modprobe output for memory-failure category

Browse Source 
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.

Also, ensure that skipped tests do not override a previously recorded
failure.  A skipped test currently sets exitcode to ksft_skip even if a
prior test has failed, which can mask failures in the final exit status. 
Update the logic to only set exitcode to ksft_skip when no failure has
been recorded.

Link: https://lore.kernel.org/93441f34f7ef5add47d1a130d03daa79e21b5050.1779296493.git.sayalip@linux.ibm.com
Fixes: ff4ef2fbd1 ("selftests/mm: add memory failure anonymous page test")
Signed-off-by: Sayali Patil <sayalip@linux.ibm.com>
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>
Cc: David Hildenbrand (Arm) <david@kernel.org>
Cc: Dev Jain <dev.jain@arm.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: "Ritesh Harjani (IBM)" <ritesh.list@gmail.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Sayali Patil 2026-05-21 12:17:52 +05:30 committed by Andrew Morton
parent f3bd00507f
commit 90c132f837
1 changed files with 41 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
tools/testing/selftests/mm/run_vmtests.sh
View File

@ -180,6 +180,9 @@ pretty_name() {
# Usage: run_test [test binary] [arbitrary test arguments...]
run_test() {
if test_selected ${CATEGORY}; then
local skip=0
local LOADED_HWPOISON_INJECT_MOD=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
@ -194,13 +197,45 @@ 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_HWPOISON_INJECT_MOD=1
if [ ! -d "$HWPOISON_DIR" ]; then
echo "hwpoison debugfs interface not present" \
| tap_prefix
skip=1
fi
fi
fi
fi
local test=$(pretty_name "$*")
local title="running $*"
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 -eq 1 ]; then
local ret=$ksft_skip
else
("$@" 2>&1) | tap_prefix
local ret=${PIPESTATUS[0]}
fi
# Unload hwpoison_inject if we loaded it
if [ "${LOADED_HWPOISON_INJECT_MOD}" = "1" ]; 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 ))
@ -210,7 +245,9 @@ run_test() {
count_skip=$(( count_skip + 1 ))
echo "[SKIP]" | tap_prefix
echo "ok ${count_total} ${test} # SKIP" | tap_output
exitcode=$ksft_skip
if [ $exitcode -eq 0 ]; then
exitcode=$ksft_skip
fi
else
count_fail=$(( count_fail + 1 ))
echo "[FAIL]" | tap_prefix
@ -422,24 +459,7 @@ CATEGORY="page_frag" run_test ./test_page_frag.sh nonaligned
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
echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" | tap_prefix
echo "1..${count_total}" | tap_output