diff options
| author | Petr Mladek <pmladek@suse.com> | 2022-03-28 10:56:22 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2022-03-28 10:56:22 +0200 |
| commit | e7dbd4d5369df7d101d6fde5595229df7060939d (patch) | |
| tree | f9759b5a717f03b2ac3ef8de0e623dae639127ce /tools | |
| parent | 2957308343fa7c621df9f342fab88cb970b8d5f3 (diff) | |
| parent | 5e6ded2e7a5d9c71186acc8f51989ef6e6addda4 (diff) | |
| download | linux-e7dbd4d5369df7d101d6fde5595229df7060939d.tar.bz2 | |
Merge branch 'for-5.18/selftests-fixes' into for-linus
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/livepatch/functions.sh | 22 | ||||
| -rwxr-xr-x | tools/testing/selftests/livepatch/test-ftrace.sh | 3 |
2 files changed, 21 insertions, 4 deletions
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index 846c7ed71556..9230b869371d 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -75,9 +75,25 @@ function set_dynamic_debug() { } function set_ftrace_enabled() { - result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \ - sysctl kernel.ftrace_enabled 2>&1) - echo "livepatch: $result" > /dev/kmsg + local can_fail=0 + if [[ "$1" == "--fail" ]] ; then + can_fail=1 + shift + fi + + local err=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1) + local result=$(sysctl --values kernel.ftrace_enabled) + + if [[ "$result" != "$1" ]] ; then + if [[ $can_fail -eq 1 ]] ; then + echo "livepatch: $err" > /dev/kmsg + return + fi + + skip "failed to set kernel.ftrace_enabled = $1" + fi + + echo "livepatch: kernel.ftrace_enabled = $result" > /dev/kmsg } function cleanup() { diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh index 552e165512f4..825540a5194d 100755 --- a/tools/testing/selftests/livepatch/test-ftrace.sh +++ b/tools/testing/selftests/livepatch/test-ftrace.sh @@ -25,7 +25,8 @@ if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] die "livepatch kselftest(s) failed" fi -set_ftrace_enabled 0 +# Check that ftrace could not get disabled when a livepatch is enabled +set_ftrace_enabled --fail 0 if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] ; then echo -e "FAIL\n\n" die "livepatch kselftest(s) failed" |