Commit 637c7309 authored by Michael Vetter's avatar Michael Vetter Committed by Petr Mladek
Browse files

selftests: livepatch: rename KLP_SYSFS_DIR to SYSFS_KLP_DIR 



This naming makes more sense according to the directory structure.
Especially when we later add more paths.

Addtionally replace `/sys/kernel/livepatch` with `$SYSFS_KLP_DIR` in
the livepatch test files.

Signed-off-by: default avatarMichael Vetter <mvetter@suse.com>
Reviewed-by: default avatarMiroslav Benes <mbenes@suse.cz>
Reviewed-by: default avatarJoe Lawrence <joe.lawrence@redhat.com>
Tested-by: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Tested-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20241017200132.21946-2-mvetter@suse.com


[pmladek@suse.com: Fix corrupted substitution]
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent c8d8a35d

tools/testing/selftests/livepatch/functions.sh

+8 −8
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


MAX_RETRIES=600

RETRY_INTERVAL=".1"	# seconds

KLP_SYSFS_DIR="/sys/kernel/livepatch"

SYSFS_KLP_DIR="/sys/kernel/livepatch"



# Kselftest framework requirement - SKIP code is 4

ksft_skip=4
@@ -183,7 +183,7 @@ function load_lp_nowait() { 
	__load_mod "$mod" "$@"



	# Wait for livepatch in sysfs ...

	loop_until '[[ -e "/sys/kernel/livepatch/$mod" ]]' ||

	loop_until '[[ -e "$SYSFS_KLP_DIR/$mod" ]]' ||

		die "failed to load module $mod (sysfs)"

}
@@ -196,7 +196,7 @@ function load_lp() { 
	load_lp_nowait "$mod" "$@"



	# Wait until the transition finishes ...

	loop_until 'grep -q '^0$' /sys/kernel/livepatch/$mod/transition' ||

	loop_until 'grep -q '^0$' $SYSFS_KLP_DIR/$mod/transition' ||

		die "failed to complete transition"

}
@@ -246,12 +246,12 @@ function unload_lp() { 
function disable_lp() {

	local mod="$1"



	log "% echo 0 > /sys/kernel/livepatch/$mod/enabled"

	echo 0 > /sys/kernel/livepatch/"$mod"/enabled

	log "% echo 0 > $SYSFS_KLP_DIR/$mod/enabled"

	echo 0 > "$SYSFS_KLP_DIR/$mod/enabled"



	# Wait until the transition finishes and the livepatch gets

	# removed from sysfs...

	loop_until '[[ ! -e "/sys/kernel/livepatch/$mod" ]]' ||

	loop_until '[[ ! -e "$SYSFS_KLP_DIR/$mod" ]]' ||

		die "failed to disable livepatch $mod"

}
@@ -322,7 +322,7 @@ function check_sysfs_rights() { 
	local rel_path="$1"; shift

	local expected_rights="$1"; shift



	local path="$KLP_SYSFS_DIR/$mod/$rel_path"

	local path="$SYSFS_KLP_DIR/$mod/$rel_path"

	local rights=$(/bin/stat --format '%A' "$path")

	if test "$rights" != "$expected_rights" ; then

		die "Unexpected access rights of $path: $expected_rights vs. $rights"
@@ -338,7 +338,7 @@ function check_sysfs_value() { 
	local rel_path="$1"; shift

	local expected_value="$1"; shift



	local path="$KLP_SYSFS_DIR/$mod/$rel_path"

	local path="$SYSFS_KLP_DIR/$mod/$rel_path"

	local value=`cat $path`

	if test "$value" != "$expected_value" ; then

		die "Unexpected value in $path: $expected_value vs. $value"

tools/testing/selftests/livepatch/test-callbacks.sh

+12 −12
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ livepatch: '$MOD_LIVEPATCH': completing patching transition 
$MOD_LIVEPATCH: post_patch_callback: vmlinux

$MOD_LIVEPATCH: post_patch_callback: $MOD_TARGET -> [MODULE_STATE_LIVE] Normal state

livepatch: '$MOD_LIVEPATCH': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_LIVE] Normal state
@@ -94,7 +94,7 @@ livepatch: applying patch '$MOD_LIVEPATCH' to loading module '$MOD_TARGET' 
$MOD_LIVEPATCH: pre_patch_callback: $MOD_TARGET -> [MODULE_STATE_COMING] Full formed, running module_init

$MOD_LIVEPATCH: post_patch_callback: $MOD_TARGET -> [MODULE_STATE_COMING] Full formed, running module_init

$MOD_TARGET: ${MOD_TARGET}_init

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_LIVE] Normal state
@@ -146,7 +146,7 @@ $MOD_TARGET: ${MOD_TARGET}_exit 
$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

livepatch: reverting patch '$MOD_LIVEPATCH' on unloading module '$MOD_TARGET'

$MOD_LIVEPATCH: post_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': starting unpatching transition
@@ -195,7 +195,7 @@ $MOD_TARGET: ${MOD_TARGET}_exit 
$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

livepatch: reverting patch '$MOD_LIVEPATCH' on unloading module '$MOD_TARGET'

$MOD_LIVEPATCH: post_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': starting unpatching transition
@@ -227,7 +227,7 @@ livepatch: '$MOD_LIVEPATCH': starting patching transition 
livepatch: '$MOD_LIVEPATCH': completing patching transition

$MOD_LIVEPATCH: post_patch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': starting unpatching transition
@@ -310,7 +310,7 @@ $MOD_LIVEPATCH: pre_patch_callback: $MOD_TARGET -> [MODULE_STATE_COMING] Full fo 
livepatch: pre-patch callback failed for object '$MOD_TARGET'

livepatch: patch '$MOD_LIVEPATCH' failed for module '$MOD_TARGET', refusing to load module '$MOD_TARGET'

insmod: ERROR: could not insert module test_modules/$MOD_TARGET.ko: No such device

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': starting unpatching transition
@@ -364,7 +364,7 @@ $MOD_TARGET: ${MOD_TARGET}_exit 
$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

livepatch: reverting patch '$MOD_LIVEPATCH' on unloading module '$MOD_TARGET'

$MOD_LIVEPATCH: post_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH: pre_unpatch_callback: $MOD_TARGET_BUSY -> [MODULE_STATE_LIVE] Normal state
@@ -412,7 +412,7 @@ load_lp_nowait $MOD_LIVEPATCH 


# Wait until the livepatch reports in-transition state, i.e. that it's

# stalled on $MOD_TARGET_BUSY::busymod_work_func()

loop_until 'grep -q '^1$' /sys/kernel/livepatch/$MOD_LIVEPATCH/transition' ||

loop_until 'grep -q '^1$' $SYSFS_KLP_DIR/$MOD_LIVEPATCH/transition' ||

	die "failed to stall transition"



load_mod $MOD_TARGET
@@ -438,7 +438,7 @@ $MOD_TARGET: ${MOD_TARGET}_init 
$MOD_TARGET: ${MOD_TARGET}_exit

livepatch: reverting patch '$MOD_LIVEPATCH' on unloading module '$MOD_TARGET'

$MOD_LIVEPATCH: post_unpatch_callback: $MOD_TARGET -> [MODULE_STATE_GOING] Going away

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': reversing transition from patching to unpatching

livepatch: '$MOD_LIVEPATCH': starting unpatching transition

livepatch: '$MOD_LIVEPATCH': completing unpatching transition
@@ -483,14 +483,14 @@ livepatch: '$MOD_LIVEPATCH2': starting patching transition 
livepatch: '$MOD_LIVEPATCH2': completing patching transition

$MOD_LIVEPATCH2: post_patch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH2': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH2/enabled

livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition

$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH2': starting unpatching transition

livepatch: '$MOD_LIVEPATCH2': completing unpatching transition

$MOD_LIVEPATCH2: post_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH2': unpatching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH': starting unpatching transition
@@ -539,7 +539,7 @@ livepatch: '$MOD_LIVEPATCH2': starting patching transition 
livepatch: '$MOD_LIVEPATCH2': completing patching transition

$MOD_LIVEPATCH2: post_patch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH2': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH2/enabled

livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition

$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux

livepatch: '$MOD_LIVEPATCH2': starting unpatching transition

tools/testing/selftests/livepatch/test-ftrace.sh

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 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

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

livepatch: '$MOD_LIVEPATCH': starting unpatching transition

livepatch: '$MOD_LIVEPATCH': completing unpatching transition

tools/testing/selftests/livepatch/test-livepatch.sh

+6 −6
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ livepatch: '$MOD_LIVEPATCH1': initializing patching transition 
livepatch: '$MOD_LIVEPATCH1': starting patching transition

livepatch: '$MOD_LIVEPATCH1': completing patching transition

livepatch: '$MOD_LIVEPATCH1': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH1/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH1/enabled

livepatch: '$MOD_LIVEPATCH1': initializing unpatching transition

livepatch: '$MOD_LIVEPATCH1': starting unpatching transition

livepatch: '$MOD_LIVEPATCH1': completing unpatching transition
@@ -92,14 +92,14 @@ livepatch: '$MOD_REPLACE': completing patching transition 
livepatch: '$MOD_REPLACE': patching complete

$MOD_LIVEPATCH1: this has been live patched

$MOD_REPLACE: this has been live patched

% echo 0 > /sys/kernel/livepatch/$MOD_REPLACE/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_REPLACE/enabled

livepatch: '$MOD_REPLACE': initializing unpatching transition

livepatch: '$MOD_REPLACE': starting unpatching transition

livepatch: '$MOD_REPLACE': completing unpatching transition

livepatch: '$MOD_REPLACE': unpatching complete

% rmmod $MOD_REPLACE

$MOD_LIVEPATCH1: this has been live patched

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH1/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH1/enabled

livepatch: '$MOD_LIVEPATCH1': initializing unpatching transition

livepatch: '$MOD_LIVEPATCH1': starting unpatching transition

livepatch: '$MOD_LIVEPATCH1': completing unpatching transition
@@ -128,7 +128,7 @@ for mod in $MOD_LIVEPATCH2 $MOD_LIVEPATCH3; do 
	load_lp "$mod"

done



mods=(/sys/kernel/livepatch/*)

mods=($SYSFS_KLP_DIR/*)

nmods=${#mods[@]}

if [ "$nmods" -ne 3 ]; then

	die "Expecting three modules listed, found $nmods"
@@ -139,7 +139,7 @@ load_lp $MOD_REPLACE replace=1 
grep 'live patched' /proc/cmdline > /dev/kmsg

grep 'live patched' /proc/meminfo > /dev/kmsg



loop_until 'mods=(/sys/kernel/livepatch/*); nmods=${#mods[@]}; [[ "$nmods" -eq 1 ]]' ||

loop_until 'mods=($SYSFS_KLP_DIR/*); nmods=${#mods[@]}; [[ "$nmods" -eq 1 ]]' ||

        die "Expecting only one moduled listed, found $nmods"



# These modules were disabled by the atomic replace
@@ -188,7 +188,7 @@ $MOD_REPLACE: this has been live patched 
% rmmod $MOD_LIVEPATCH2

% rmmod $MOD_LIVEPATCH1

$MOD_REPLACE: this has been live patched

% echo 0 > /sys/kernel/livepatch/$MOD_REPLACE/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_REPLACE/enabled

livepatch: '$MOD_REPLACE': initializing unpatching transition

livepatch: '$MOD_REPLACE': starting unpatching transition

livepatch: '$MOD_REPLACE': completing unpatching transition

tools/testing/selftests/livepatch/test-state.sh

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ livepatch: '$MOD_LIVEPATCH': completing patching transition 
$MOD_LIVEPATCH: post_patch_callback: vmlinux

$MOD_LIVEPATCH: fix_console_loglevel: fixing console_loglevel

livepatch: '$MOD_LIVEPATCH': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH/enabled

livepatch: '$MOD_LIVEPATCH': initializing unpatching transition

$MOD_LIVEPATCH: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH: restore_console_loglevel: restoring console_loglevel
@@ -72,7 +72,7 @@ $MOD_LIVEPATCH2: post_patch_callback: vmlinux 
$MOD_LIVEPATCH2: fix_console_loglevel: taking over the console_loglevel change

livepatch: '$MOD_LIVEPATCH2': patching complete

% rmmod $MOD_LIVEPATCH

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH2/enabled

livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition

$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel
@@ -127,7 +127,7 @@ livepatch: '$MOD_LIVEPATCH2': completing patching transition 
$MOD_LIVEPATCH2: post_patch_callback: vmlinux

$MOD_LIVEPATCH2: fix_console_loglevel: taking over the console_loglevel change

livepatch: '$MOD_LIVEPATCH2': patching complete

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH2/enabled

livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition

$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel
@@ -162,7 +162,7 @@ livepatch: '$MOD_LIVEPATCH2': patching complete 
% insmod test_modules/$MOD_LIVEPATCH.ko

livepatch: Livepatch patch ($MOD_LIVEPATCH) is not compatible with the already installed livepatches.

insmod: ERROR: could not insert module test_modules/$MOD_LIVEPATCH.ko: Invalid parameters

% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled

% echo 0 > $SYSFS_KLP_DIR/$MOD_LIVEPATCH2/enabled

livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition

$MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux

$MOD_LIVEPATCH2: restore_console_loglevel: restoring console_loglevel