The patch titled
Subject: selftests: simplify kmod failure value
has been added to the -mm tree. Its filename is
selftests-simplify-kmod-failure-value.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/selftests-simplify-kmod-failure-value.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/selftests-simplify-kmod-failure-value.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Subject: selftests: simplify kmod failure value
The "odd" 256 value was just an issue with the umh never wrapping it
around with WEXITSTATUS() for us. Now that it does that, we can use a
sane value / name for the selftest, and this is no longer a oddity.
We add a way to detect this for older kernels, and support the old return
value for kernel code where it was given.
This never affected userspace.
Link: http://lkml.kernel.org/r/20200610154923.27510-6-mcgrof@xxxxxxxxxx
Signed-off-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Reported-by: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
Cc: Alexei Starovoitov <ast@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Christian Brauner <christian.brauner@xxxxxxxxxx>
Cc: Chuck Lever <chuck.lever@xxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Jakub Kicinski <kuba@xxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
Cc: J. Bruce Fields <bfields@xxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Lars Ellenberg <lars.ellenberg@xxxxxxxxxx>
Cc: Nikolay Aleksandrov <nikolay@xxxxxxxxxxxxxxxxxxx>
Cc: Philipp Reisner <philipp.reisner@xxxxxxxxxx>
Cc: Roopa Prabhu <roopa@xxxxxxxxxxxxxxxxxxx>
Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx>
Cc: Sergei Trofimovich <slyfox@xxxxxxxxxx>
Cc: Sergey Kvachonok <ravenexp@xxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Cc: Tony Vroon <chainsaw@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/kmod/kmod.sh | 46 +++++++++++++++++++++----
1 file changed, 39 insertions(+), 7 deletions(-)
--- a/tools/testing/selftests/kmod/kmod.sh~selftests-simplify-kmod-failure-value
+++ a/tools/testing/selftests/kmod/kmod.sh
@@ -64,6 +64,8 @@ ALL_TESTS="$ALL_TESTS 0009:150:1"
ALL_TESTS="$ALL_TESTS 0010:1:1"
ALL_TESTS="$ALL_TESTS 0011:1:1"
+MODULE_NOT_FOUND="FAILURE"
+
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
@@ -155,14 +157,19 @@ test_finish()
echo "Test completed"
}
+# OLD_FAILURE is just because the old kernel umh never wrapped
+# the error with WEXITSTATUS(). Now that it does it, we get the
+# appropriate actual value from userspace observed in-kernel.
+
+# We keep the old mapping to ensure this script keeps working
+# with older kernels.
errno_name_to_val()
{
case "$1" in
- # kmod calls modprobe and upon of a module not found
- # modprobe returns just 1... However in the kernel we
- # *sometimes* see 256...
- MODULE_NOT_FOUND)
+ OLD_FAILURE)
echo 256;;
+ FAILURE)
+ echo 1;;
SUCCESS)
echo 0;;
-EPERM)
@@ -181,7 +188,9 @@ errno_name_to_val()
errno_val_to_name()
case "$1" in
256)
- echo MODULE_NOT_FOUND;;
+ echo OLD_FAILURE;;
+ 1)
+ echo FAILURE;;
0)
echo SUCCESS;;
-1)
@@ -335,6 +344,28 @@ kmod_defaults_fs()
config_set_test_case_fs
}
+check_umh()
+{
+ NAME=''
+
+ kmod_defaults_driver
+ config_num_threads 1
+ printf '\0' >"$DIR"/config_test_driver
+ config_trigger ${FUNCNAME[0]}
+ RC=$(config_get_test_result)
+ if [[ "$RC" == "256" ]]; then
+ MODULE_NOT_FOUND="OLD_FAILURE"
+ echo "check_umh: you have and old umh which didn't wrap errors"
+ echo " with WEXITSTATUS(). This is OK!"
+ elif [[ "$RC" != "1" ]]; then
+ echo "check_umh: Unexpected return value with no modprobe argument: $RC"
+ exit
+ else
+ echo "check_umh: You have a new umh which wraps erros with"
+ echo " WEXITSTATUS(). This is OK!"
+ fi
+}
+
kmod_test_0001_driver()
{
NAME='\000'
@@ -343,7 +374,7 @@ kmod_test_0001_driver()
config_num_threads 1
printf $NAME >"$DIR"/config_test_driver
config_trigger ${FUNCNAME[0]}
- config_expect_result ${FUNCNAME[0]} MODULE_NOT_FOUND
+ config_expect_result ${FUNCNAME[0]} $MODULE_NOT_FOUND
}
kmod_test_0001_fs()
@@ -371,7 +402,7 @@ kmod_test_0002_driver()
config_set_driver $NAME
config_num_threads 1
config_trigger ${FUNCNAME[0]}
- config_expect_result ${FUNCNAME[0]} MODULE_NOT_FOUND
+ config_expect_result ${FUNCNAME[0]} $MODULE_NOT_FOUND
}
kmod_test_0002_fs()
@@ -648,6 +679,7 @@ load_req_mod
MODPROBE=$(</proc/sys/kernel/modprobe)
trap "test_finish" EXIT
+check_umh
parse_args $@
exit 0
_
Patches currently in -mm which might be from mcgrof@xxxxxxxxxx are
umh-fix-processed-error-when-umh_wait_proc-is-used.patch
selftests-simplify-kmod-failure-value.patch
