Commit 3e77a49a authored by Zhao Gongyi's avatar Zhao Gongyi Committed by Shuah Khan

selftests/memory-hotplug: Restore memory before exit

Some momory will be left in offline state when calling
offline_memory_expect_fail() failed. Restore it before exit.
Signed-off-by: default avatarZhao Gongyi <zhaogongyi@huawei.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 13023c33
......@@ -134,6 +134,16 @@ offline_memory_expect_fail()
return 0
}
online_all_offline_memory()
{
for memory in `hotpluggable_offline_memory`; do
if ! online_memory_expect_success $memory; then
echo "$FUNCNAME $memory: unexpected fail" >&2
retval=1
fi
done
}
error=-12
priority=0
# Run with default of ratio=2 for Kselftest run
......@@ -275,11 +285,7 @@ done
# Online all hot-pluggable memory
#
echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_ONLINE/error
for memory in `hotpluggable_offline_memory`; do
if ! online_memory_expect_success $memory; then
retval=1
fi
done
online_all_offline_memory
#
# Test memory hot-remove error handling (online => offline)
......@@ -296,4 +302,9 @@ done
echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/MEM_GOING_OFFLINE/error
/sbin/modprobe -q -r memory-notifier-error-inject
#
# Restore memory before exit
#
online_all_offline_memory
exit $retval
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment