On Sun 2019-07-14 10:28:29, Joe Lawrence wrote:
> Before running a livpeatch self-test, first verify that we've built and
> installed the livepatch self-test kernel modules by running a 'modprobe
> --dry-run'. This should catch a few environment issues, including
> !CONFIG_LIVEPATCH and !CONFIG_TEST_LIVEPATCH. In these cases, exit
> gracefully with test-skip status rather than test-fail status.
>
> diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
> index 30195449c63c..92d6cfb49365 100644
> --- a/tools/testing/selftests/livepatch/functions.sh
> +++ b/tools/testing/selftests/livepatch/functions.sh
> @@ -13,6 +13,14 @@ function log() {
> echo "$1" > /dev/kmsg
> }
>
> +# skip(msg) - testing can't proceed
> +# msg - explanation
> +function skip() {
> + log "SKIP: $1"
> + echo "SKIP: $1" >&2
> + exit 4
> +}
> +
> # die(msg) - game over, man
> # msg - dying words
> function die() {
> @@ -43,6 +51,16 @@ function loop_until() {
> done
> }
>
> +function assert_mod() {
> + local mod="$1"
> +
> + if ! modprobe --dry-run "$mod" &>/dev/null ; then
JFYI, I do not have strong opinion but the long option and redirection
looks fine to me.
> + skip "Failed modprobe --dry-run of module: $mod"
> + fi
> +
> + return 1
return 0 or nothing?
> +}
> +
> function is_livepatch_mod() {
> local mod="$1"
>
> diff --git a/tools/testing/selftests/livepatch/test-callbacks.sh b/tools/testing/selftests/livepatch/test-callbacks.sh
> index e97a9dcb73c7..87a407cee7fd 100755
> --- a/tools/testing/selftests/livepatch/test-callbacks.sh
> +++ b/tools/testing/selftests/livepatch/test-callbacks.sh
> @@ -9,6 +9,11 @@ MOD_LIVEPATCH2=test_klp_callbacks_demo2
> MOD_TARGET=test_klp_callbacks_mod
> MOD_TARGET_BUSY=test_klp_callbacks_busy
>
> +assert_mod $MOD_LIVEPATCH
> +assert_mod $MOD_LIVEPATCH2
> +assert_mod $MOD_TARGET
> +assert_mod $MOD_TARGET_BUSY
I agree that moving this into __load_mod() is less error prone.
Best Regards,
Petr
