On 2026/3/11 3:15, Zi Yan wrote:
> On 10 Mar 2026, at 5:49, Sayali Patil wrote:
>
>> 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.
>>
>> Fixes: ff4ef2fbd101 ("selftests/mm: add memory failure anonymous page test")
>> Signed-off-by: Sayali Patil <[email protected]>
>> ---
>> tools/testing/selftests/mm/run_vmtests.sh | 46 ++++++++++++++---------
>> 1 file changed, 28 insertions(+), 18 deletions(-)
>>
>> diff --git a/tools/testing/selftests/mm/run_vmtests.sh
>> b/tools/testing/selftests/mm/run_vmtests.sh
>> index 7273c3e18227..7f3a3027cd9a 100755
>> --- a/tools/testing/selftests/mm/run_vmtests.sh
>> +++ b/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 ))
>> @@ -540,24 +567,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
>>
>> if [ "${HAVE_HUGEPAGES}" = 1 ]; then
>> echo "$orig_nr_hugepgs" > /proc/sys/vm/nr_hugepages
>> --
>> 2.52.0
>
> +Miaohe
>
> LGTM.
>
> Acked-by: Zi Yan <[email protected]>
LGTM. Thanks both.
Acked-by: Miaohe Lin <[email protected]>
Thanks.
.
