[PATCH livepatch/master v1 1/2] selftests/livepatch: Replace hardcoded path with variable in test-syscall.sh
From: George Guo guodongtai@kylinos.cn
Updated test-syscall.sh to replace the path /sys/kernel/test_klp_syscall/npids with a variable $MOD_SYSCALL.
Signed-off-by: George Guo guodongtai@kylinos.cn --- tools/testing/selftests/livepatch/test-syscall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/livepatch/test-syscall.sh b/tools/testing/selftests/livepatch/test-syscall.sh index b76a881d4..9cfa17b6b 100755 --- a/tools/testing/selftests/livepatch/test-syscall.sh +++ b/tools/testing/selftests/livepatch/test-syscall.sh @@ -24,9 +24,9 @@ pid_list=$(echo ${pids[@]} | tr ' ' ',') load_lp $MOD_SYSCALL klp_pids=$pid_list
# wait for all tasks to transition to patched state -loop_until 'grep -q '^0$' /sys/kernel/test_klp_syscall/npids' +loop_until 'grep -q '^0$' /sys/kernel/$MOD_SYSCALL/npids'
-pending_pids=$(cat /sys/kernel/test_klp_syscall/npids) +pending_pids=$(cat /sys/kernel/$MOD_SYSCALL/npids) log "$MOD_SYSCALL: Remaining not livepatched processes: $pending_pids"
for pid in ${pids[@]}; do
From: George Guo guodongtai@kylinos.cn
Replaced the hardcoded module name test_klp_callbacks_demo in the pre_patch_callback log message with the variable $MOD_LIVEPATCH.
Signed-off-by: George Guo guodongtai@kylinos.cn --- tools/testing/selftests/livepatch/test-callbacks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/livepatch/test-callbacks.sh b/tools/testing/selftests/livepatch/test-callbacks.sh index 32b150e25..150cb68fe 100755 --- a/tools/testing/selftests/livepatch/test-callbacks.sh +++ b/tools/testing/selftests/livepatch/test-callbacks.sh @@ -259,7 +259,7 @@ $MOD_TARGET: ${MOD_TARGET}_init % insmod test_modules/$MOD_LIVEPATCH.ko pre_patch_ret=-19 livepatch: enabling patch '$MOD_LIVEPATCH' livepatch: '$MOD_LIVEPATCH': initializing patching transition -test_klp_callbacks_demo: pre_patch_callback: vmlinux +$MOD_LIVEPATCH: pre_patch_callback: vmlinux livepatch: pre-patch callback failed for object 'vmlinux' livepatch: failed to enable patch '$MOD_LIVEPATCH' livepatch: '$MOD_LIVEPATCH': canceling patching transition, going to unpatch
On Mon 2024-11-25 19:28:12, George Guo wrote:
From: George Guo guodongtai@kylinos.cn
Replaced the hardcoded module name test_klp_callbacks_demo in the pre_patch_callback log message with the variable $MOD_LIVEPATCH.
Signed-off-by: George Guo guodongtai@kylinos.cn
Reviewed-by: Petr Mladek pmladek@suse.com
Best Regards, Petr
On Tue, 26 Nov 2024 14:18:30 +0100 Petr Mladek pmladek@suse.com wrote:
On Mon 2024-11-25 19:28:12, George Guo wrote:
From: George Guo guodongtai@kylinos.cn
Replaced the hardcoded module name test_klp_callbacks_demo in the pre_patch_callback log message with the variable $MOD_LIVEPATCH.
Signed-off-by: George Guo guodongtai@kylinos.cn
Reviewed-by: Petr Mladek pmladek@suse.com
Best Regards, Petr
Hi petr,
This patch could be merged?
Thanks!
On Mon 2024-11-25 19:28:12, George Guo wrote:
From: George Guo guodongtai@kylinos.cn
Replaced the hardcoded module name test_klp_callbacks_demo in the pre_patch_callback log message with the variable $MOD_LIVEPATCH.
Signed-off-by: George Guo guodongtai@kylinos.cn
JFYI, this patch has been committed into livepatching.git, branch for-6.14/selftests-trivial.
Best Regards, Petr
On Mon 2024-11-25 19:28:11, George Guo wrote:
From: George Guo guodongtai@kylinos.cn
Updated test-syscall.sh to replace the path /sys/kernel/test_klp_syscall/npids with a variable $MOD_SYSCALL.
Signed-off-by: George Guo guodongtai@kylinos.cn
This has already been fixed by the commit 59766286b6e54f8ad33 ("selftests: livepatch: save and restore kprobe state"). The change reached the mainline last week during the merge window for 6.13.
Best Regards, Petr
linux-kselftest-mirror@lists.linaro.org
-
George Guo -
Petr Mladek