Commit 35c9e74c authored by Joe Lawrence's avatar Joe Lawrence Committed by Steven Rostedt

selftests/livepatch: Make dynamic debug setup and restore generic

Livepatch selftests currently save the current dynamic debug config and
tweak it for the selftests. The config is restored at the end. Make the
infrastructure generic, so that more variables can be saved and
restored.

Link: http://lkml.kernel.org/r/20191016113316.13415-3-mbenes@suse.czSigned-off-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Signed-off-by: default avatarMiroslav Benes <mbenes@suse.cz>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 7162431d
...@@ -29,29 +29,33 @@ function die() { ...@@ -29,29 +29,33 @@ function die() {
exit 1 exit 1
} }
function push_dynamic_debug() { function push_config() {
DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control | \ DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control | \
awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}') awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}')
} }
function pop_dynamic_debug() { function pop_config() {
if [[ -n "$DYNAMIC_DEBUG" ]]; then if [[ -n "$DYNAMIC_DEBUG" ]]; then
echo -n "$DYNAMIC_DEBUG" > /sys/kernel/debug/dynamic_debug/control echo -n "$DYNAMIC_DEBUG" > /sys/kernel/debug/dynamic_debug/control
fi fi
} }
# set_dynamic_debug() - save the current dynamic debug config and tweak
# it for the self-tests. Set a script exit trap
# that restores the original config.
function set_dynamic_debug() { function set_dynamic_debug() {
push_dynamic_debug
trap pop_dynamic_debug EXIT INT TERM HUP
cat <<-EOF > /sys/kernel/debug/dynamic_debug/control cat <<-EOF > /sys/kernel/debug/dynamic_debug/control
file kernel/livepatch/* +p file kernel/livepatch/* +p
func klp_try_switch_task -p func klp_try_switch_task -p
EOF EOF
} }
# 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.
function setup_config() {
push_config
set_dynamic_debug
trap pop_config EXIT INT TERM HUP
}
# loop_until(cmd) - loop a command until it is successful or $MAX_RETRIES, # loop_until(cmd) - loop a command until it is successful or $MAX_RETRIES,
# sleep $RETRY_INTERVAL between attempts # sleep $RETRY_INTERVAL between attempts
# cmd - command and its arguments to run # cmd - command and its arguments to run
......
...@@ -9,7 +9,7 @@ MOD_LIVEPATCH2=test_klp_callbacks_demo2 ...@@ -9,7 +9,7 @@ MOD_LIVEPATCH2=test_klp_callbacks_demo2
MOD_TARGET=test_klp_callbacks_mod MOD_TARGET=test_klp_callbacks_mod
MOD_TARGET_BUSY=test_klp_callbacks_busy MOD_TARGET_BUSY=test_klp_callbacks_busy
set_dynamic_debug setup_config
# TEST: target module before livepatch # TEST: target module before livepatch
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
MOD_LIVEPATCH=test_klp_livepatch MOD_LIVEPATCH=test_klp_livepatch
MOD_REPLACE=test_klp_atomic_replace MOD_REPLACE=test_klp_atomic_replace
set_dynamic_debug setup_config
# TEST: basic function patching # TEST: basic function patching
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
MOD_TEST=test_klp_shadow_vars MOD_TEST=test_klp_shadow_vars
set_dynamic_debug setup_config
# TEST: basic shadow variable API # TEST: basic shadow variable API
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment