| Message ID | 20191016113316.13415-4-mbenes@suse.cz (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 8c666d2ab5762280cb5ef43df4decb2a25450d54 |
| Headers | show |
| Series | ftrace: Introduce PERMANENT ftrace_ops flag | expand |
On Wed 2019-10-16 13:33:15, Miroslav Benes wrote: > From: Joe Lawrence <joe.lawrence@redhat.com> > > Since livepatching depends upon ftrace handlers to implement "patched" > code functionality, verify that the ftrace_enabled sysctl value > interacts with livepatch registration as expected. At the same time, > ensure that ftrace_enabled is set and part of the test environment > configuration that is saved and restored when running the selftests. > > Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> > Signed-off-by: Miroslav Benes <mbenes@suse.cz> > --- > tools/testing/selftests/livepatch/Makefile | 3 +- > .../testing/selftests/livepatch/functions.sh | 14 +++- > .../selftests/livepatch/test-ftrace.sh | 65 +++++++++++++++++++ > 3 files changed, 80 insertions(+), 2 deletions(-) > create mode 100755 tools/testing/selftests/livepatch/test-ftrace.sh > > diff --git a/tools/testing/selftests/livepatch/Makefile b/tools/testing/selftests/livepatch/Makefile > index fd405402c3ff..1886d9d94b88 100644 > --- a/tools/testing/selftests/livepatch/Makefile > +++ b/tools/testing/selftests/livepatch/Makefile > @@ -4,6 +4,7 @@ TEST_PROGS_EXTENDED := functions.sh > TEST_PROGS := \ > test-livepatch.sh \ > test-callbacks.sh \ > - test-shadow-vars.sh > + test-shadow-vars.sh \ > + test-ftrace.sh > > include ../lib.mk > diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh > index b7e5a67ae434..31eb09e38729 100644 > --- a/tools/testing/selftests/livepatch/functions.sh > +++ b/tools/testing/selftests/livepatch/functions.sh > @@ -32,12 +32,16 @@ function die() { > function push_config() { > DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control | \ > awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}') > + FTRACE_ENABLED=$(sysctl --values kernel.ftrace_enabled) > } > > function pop_config() { > if [[ -n "$DYNAMIC_DEBUG" ]]; then > echo -n "$DYNAMIC_DEBUG" > /sys/kernel/debug/dynamic_debug/control > fi > + if [[ -n "$FTRACE_ENABLED" ]]; then > + sysctl kernel.ftrace_enabled="$FTRACE_ENABLED" &> /dev/null > + fi > } > > function set_dynamic_debug() { > @@ -47,12 +51,20 @@ function set_dynamic_debug() { > EOF > } > > +function set_ftrace_enabled() { > + local sysctl="$1" The variable is not later used. > + result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ') > + echo "livepatch: $result" > /dev/kmsg > +} Otherwise, the patch looks good to me. After removing or using the variable: Reviewed-by: Petr Mladek <pmladek@suse.com> Best Regards, Petr
On 10/16/19 5:03 PM, Miroslav Benes wrote: > From: Joe Lawrence <joe.lawrence@redhat.com> > > Since livepatching depends upon ftrace handlers to implement "patched" > code functionality, verify that the ftrace_enabled sysctl value > interacts with livepatch registration as expected. At the same time, > ensure that ftrace_enabled is set and part of the test environment > configuration that is saved and restored when running the selftests. > > Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> > Signed-off-by: Miroslav Benes <mbenes@suse.cz> [...] > diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh > new file mode 100755 > index 000000000000..e2a76887f40a > --- /dev/null > +++ b/tools/testing/selftests/livepatch/test-ftrace.sh This test fails due to wrong file permissions, with the warning: # Warning: file test-ftrace.sh is not executable, correct this. not ok 4 selftests: livepatch: test-ftrace.sh
On 10/16/19 1:06 PM, Kamalesh Babulal wrote: > On 10/16/19 5:03 PM, Miroslav Benes wrote: >> From: Joe Lawrence <joe.lawrence@redhat.com> >> >> Since livepatching depends upon ftrace handlers to implement "patched" >> code functionality, verify that the ftrace_enabled sysctl value >> interacts with livepatch registration as expected. At the same time, >> ensure that ftrace_enabled is set and part of the test environment >> configuration that is saved and restored when running the selftests. >> >> Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> >> Signed-off-by: Miroslav Benes <mbenes@suse.cz> > > [...] >> diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh >> new file mode 100755 >> index 000000000000..e2a76887f40a >> --- /dev/null >> +++ b/tools/testing/selftests/livepatch/test-ftrace.sh > > This test fails due to wrong file permissions, with the warning: > > # Warning: file test-ftrace.sh is not executable, correct this. > not ok 4 selftests: livepatch: test-ftrace.sh > Hi Kamalesh, Thanks for testing. This error is weird as the git log says new file mode: 100755. 'git am' of Miroslav's patchset gives me a new test-ftrace.sh with "Access: (0775/-rwxrwxr-x)" Did you apply the mbox directly or.. ? -- Joe
On 10/17/19 3:17 AM, Joe Lawrence wrote: > On 10/16/19 1:06 PM, Kamalesh Babulal wrote: >> On 10/16/19 5:03 PM, Miroslav Benes wrote: >>> From: Joe Lawrence <joe.lawrence@redhat.com> >>> >>> Since livepatching depends upon ftrace handlers to implement "patched" >>> code functionality, verify that the ftrace_enabled sysctl value >>> interacts with livepatch registration as expected. At the same time, >>> ensure that ftrace_enabled is set and part of the test environment >>> configuration that is saved and restored when running the selftests. >>> >>> Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> >>> Signed-off-by: Miroslav Benes <mbenes@suse.cz> >> >> [...] >>> diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh >>> new file mode 100755 >>> index 000000000000..e2a76887f40a >>> --- /dev/null >>> +++ b/tools/testing/selftests/livepatch/test-ftrace.sh >> >> This test fails due to wrong file permissions, with the warning: >> >> # Warning: file test-ftrace.sh is not executable, correct this. >> not ok 4 selftests: livepatch: test-ftrace.sh >> > > Hi Kamalesh, > > Thanks for testing. This error is weird as the git log says new file mode: 100755. 'git am' of Miroslav's patchset gives me a new test-ftrace.sh with "Access: (0775/-rwxrwxr-x)" Did you apply the mbox directly or.. ? > Hi Joe, Thanks, I was using patch command to apply the patches and using git am helped. Sorry for the noise. The test cases passes now, without the issue I previously reported: [...] # TEST: livepatch interaction with ftrace_enabled sysctl ... ok ok 4 selftests: livepatch: test-ftrace.sh Long story is that the patch command version installed on the test machine doesn't understand new file mode permission from the git diff, updating the patch version creates the patch with 755 mode.
diff --git a/tools/testing/selftests/livepatch/Makefile b/tools/testing/selftests/livepatch/Makefile index fd405402c3ff..1886d9d94b88 100644 --- a/tools/testing/selftests/livepatch/Makefile +++ b/tools/testing/selftests/livepatch/Makefile @@ -4,6 +4,7 @@ TEST_PROGS_EXTENDED := functions.sh TEST_PROGS := \ test-livepatch.sh \ test-callbacks.sh \ - test-shadow-vars.sh + test-shadow-vars.sh \ + test-ftrace.sh include ../lib.mk diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index b7e5a67ae434..31eb09e38729 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -32,12 +32,16 @@ function die() { function push_config() { DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control | \ awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}') + FTRACE_ENABLED=$(sysctl --values kernel.ftrace_enabled) } function pop_config() { if [[ -n "$DYNAMIC_DEBUG" ]]; then echo -n "$DYNAMIC_DEBUG" > /sys/kernel/debug/dynamic_debug/control fi + if [[ -n "$FTRACE_ENABLED" ]]; then + sysctl kernel.ftrace_enabled="$FTRACE_ENABLED" &> /dev/null + fi } function set_dynamic_debug() { @@ -47,12 +51,20 @@ function set_dynamic_debug() { EOF } +function set_ftrace_enabled() { + local sysctl="$1" + result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ') + echo "livepatch: $result" > /dev/kmsg +} + # setup_config - save the current config and set a script exit trap that # restores the original config. Setup the dynamic debug -# for verbose livepatching output. +# for verbose livepatching output and turn on +# the ftrace_enabled sysctl. function setup_config() { push_config set_dynamic_debug + set_ftrace_enabled 1 trap pop_config EXIT INT TERM HUP } diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh new file mode 100755 index 000000000000..e2a76887f40a --- /dev/null +++ b/tools/testing/selftests/livepatch/test-ftrace.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019 Joe Lawrence <joe.lawrence@redhat.com> + +. $(dirname $0)/functions.sh + +MOD_LIVEPATCH=test_klp_livepatch + +setup_config + + +# TEST: livepatch interaction with ftrace_enabled sysctl +# - turn ftrace_enabled OFF and verify livepatches can't load +# - turn ftrace_enabled ON and verify livepatch can load +# - verify that ftrace_enabled can't be turned OFF while a livepatch is loaded + +echo -n "TEST: livepatch interaction with ftrace_enabled sysctl ... " +dmesg -C + +set_ftrace_enabled 0 +load_failing_mod $MOD_LIVEPATCH + +set_ftrace_enabled 1 +load_lp $MOD_LIVEPATCH +if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] ; then + echo -e "FAIL\n\n" + die "livepatch kselftest(s) failed" +fi + +set_ftrace_enabled 0 +if [[ "$(cat /proc/cmdline)" != "$MOD_LIVEPATCH: this has been live patched" ]] ; then + echo -e "FAIL\n\n" + die "livepatch kselftest(s) failed" +fi +disable_lp $MOD_LIVEPATCH +unload_lp $MOD_LIVEPATCH + +check_result "livepatch: kernel.ftrace_enabled = 0 +% modprobe $MOD_LIVEPATCH +livepatch: enabling patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': initializing patching transition +livepatch: failed to register ftrace handler for function 'cmdline_proc_show' (-16) +livepatch: failed to patch object 'vmlinux' +livepatch: failed to enable patch '$MOD_LIVEPATCH' +livepatch: '$MOD_LIVEPATCH': canceling patching transition, going to unpatch +livepatch: '$MOD_LIVEPATCH': completing unpatching transition +livepatch: '$MOD_LIVEPATCH': unpatching complete +modprobe: ERROR: could not insert '$MOD_LIVEPATCH': Device or resource busy +livepatch: kernel.ftrace_enabled = 1 +% modprobe $MOD_LIVEPATCH +livepatch: enabling patch '$MOD_LIVEPATCH' +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 +% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled +livepatch: '$MOD_LIVEPATCH': initializing unpatching transition +livepatch: '$MOD_LIVEPATCH': starting unpatching transition +livepatch: '$MOD_LIVEPATCH': completing unpatching transition +livepatch: '$MOD_LIVEPATCH': unpatching complete +% rmmod $MOD_LIVEPATCH" + + +exit 0