selftests/livepatch: adopt to newer sysctl error format
Subsystems (2)
Petr Mladek
maintainerPATCH v2 1/1 selftests/livepatch: adopt to newer sysctl error format
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest test-ftrace.sh, that tests the interaction of sysctl ftrace_enabled:
Make it work with all sysctl versions using '-q' option.
Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure.
---
The patch has been created against livepatch.git, branch for-5.9/selftests-cleanup. But it applies also against the current Linus' tree.
tools/testing/selftests/livepatch/functions.sh | 3 ++-
tools/testing/selftests/livepatch/test-ftrace.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
tools/testing/selftests/livepatch/functions.sh +2 -1
@@ -75,7 +75,8 @@ function set_dynamic_debug() { } function set_ftrace_enabled() { - result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ') + result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \ + sysctl kernel.ftrace_enabled 2>&1) echo "livepatch: $result" > /dev/kmsg }
tools/testing/selftests/livepatch/test-ftrace.sh +1 -1
@@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition livepatch: '$MOD_LIVEPATCH': starting patching transition livepatch: '$MOD_LIVEPATCH': completing patching transition livepatch: '$MOD_LIVEPATCH': patching complete -livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0 +livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled livepatch: '$MOD_LIVEPATCH': initializing unpatching transition livepatch: '$MOD_LIVEPATCH': starting unpatching transition
Signature · 1 line
2.26.2
Quoted 11 lines · Petr Mladek
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest
test-ftrace.sh, that tests the interaction of sysctlftrace_enabled:Make it work with all sysctl versions using '-q' option.
Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure.
Reported-by Kamalesh Babulal <[email protected]>Signed-off-by Petr Mladek <[email protected]>
Signature · 1 line
Kamalesh
Quoted 40 lines · Petr Mladek
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest
test-ftrace.sh, that tests the interaction of sysctlftrace_enabled:Make it work with all sysctl versions using '-q' option.
Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure.
Reported-by Kamalesh Babulal <[email protected]>Signed-off-by Petr Mladek <[email protected]>---
The patch has been created against livepatch.git, branch for-5.9/selftests-cleanup. But it applies also against the current Linus' tree.
tools/testing/selftests/livepatch/functions.sh| 3 ++-tools/testing/selftests/livepatch/test-ftrace.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)tools/testing/selftests/livepatch/functions.sh +2
-1@@ -75,7 +75,8 @@ function set_dynamic_debug() { } function set_ftrace_enabled() { - result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ') + result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \ + sysctl kernel.ftrace_enabled 2>&1) echo "livepatch: $result" > /dev/kmsg }tools/testing/selftests/livepatch/test-ftrace.sh +0
-0
tools/testing/selftests/livepatch/test-ftrace.sh livepatch: '$MOD_LIVEPATCH': initializing patching transition · line 57
Quoted 8 lines
tools/testing/selftests/livepatch/test-ftrace.sh +1
-1@@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition livepatch: '$MOD_LIVEPATCH': starting patching transition livepatch: '$MOD_LIVEPATCH': completing patching transition livepatch: '$MOD_LIVEPATCH': patching complete -livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0 +livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled livepatch: '$MOD_LIVEPATCH': initializing unpatching transition livepatch: '$MOD_LIVEPATCH': starting unpatching transition
Looks good, thanks.
-- Joe
Quoted 11 lines · Petr Mladek
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest
test-ftrace.sh, that tests the interaction of sysctlftrace_enabled:Make it work with all sysctl versions using '-q' option.
Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure.
Reported-by Kamalesh Babulal <[email protected]>Signed-off-by Petr Mladek <[email protected]>
M
Petr Mladek
maintainerQuoted 11 lines · Petr Mladek
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest
test-ftrace.sh, that tests the interaction of sysctlftrace_enabled:Make it work with all sysctl versions using '-q' option.
Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure.
Reported-by Kamalesh Babulal <[email protected]>Signed-off-by Petr Mladek <[email protected]>
The patch is commited in livepatch.git,
branch for-5.9/selftests-cleanup.
Best Regards,
Petr