Rename the test module files to be more descriptive of what they actually test, as suggested by Petr.
Suggested-by: Petr Mladek <[email protected]> Signed-off-by: Yafang Shao <[email protected]> Acked-by: Song Liu <[email protected]> Acked-by: Miroslav Benes <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Tested-by: Petr Mladek <[email protected]> --- tools/testing/selftests/livepatch/test-ftrace.sh | 2 +- tools/testing/selftests/livepatch/test-kprobe.sh | 12 ++++++------ tools/testing/selftests/livepatch/test-livepatch.sh | 6 +++--- tools/testing/selftests/livepatch/test-syscall.sh | 2 +- tools/testing/selftests/livepatch/test-sysfs.sh | 6 +++--- .../selftests/livepatch/test_modules/Makefile | 8 ++++---- .../{test_klp_kprobe.c => test_klp_cmdline_kp.c} | 10 +++++----- .../{test_klp_livepatch.c => test_klp_cmdline_lp.c} | 10 +++++----- ...st_klp_atomic_replace.c => test_klp_meminfo_lp.c} | 10 +++++----- ...{test_klp_syscall.c => test_klp_syscall_getpid.c} | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) rename tools/testing/selftests/livepatch/test_modules/{test_klp_kprobe.c => test_klp_cmdline_kp.c} (78%) rename tools/testing/selftests/livepatch/test_modules/{test_klp_livepatch.c => test_klp_cmdline_lp.c} (79%) rename tools/testing/selftests/livepatch/test_modules/{test_klp_atomic_replace.c => test_klp_meminfo_lp.c} (82%) rename tools/testing/selftests/livepatch/test_modules/{test_klp_syscall.c => test_klp_syscall_getpid.c} (95%) diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh index d2c3dea63104..90e8fcc4d065 100755 --- a/tools/testing/selftests/livepatch/test-ftrace.sh +++ b/tools/testing/selftests/livepatch/test-ftrace.sh @@ -4,7 +4,7 @@ . $(dirname $0)/functions.sh -MOD_LIVEPATCH=test_klp_livepatch +MOD_LIVEPATCH=test_klp_cmdline_lp setup_config diff --git a/tools/testing/selftests/livepatch/test-kprobe.sh b/tools/testing/selftests/livepatch/test-kprobe.sh index 7ced4082cff3..81ab6d4760aa 100755 --- a/tools/testing/selftests/livepatch/test-kprobe.sh +++ b/tools/testing/selftests/livepatch/test-kprobe.sh @@ -7,8 +7,8 @@ grep -q kprobe_ftrace_ops /proc/kallsyms || skip "test-kprobe requires CONFIG_KPROBES_ON_FTRACE" -MOD_LIVEPATCH=test_klp_livepatch -MOD_KPROBE=test_klp_kprobe +MOD_LIVEPATCH=test_klp_cmdline_lp +MOD_KPROBE=test_klp_cmdline_kp setup_config @@ -24,7 +24,7 @@ load_mod $MOD_KPROBE has_post_handler=y load_failing_mod $MOD_LIVEPATCH unload_mod $MOD_KPROBE -check_result "% insmod test_modules/test_klp_kprobe.ko has_post_handler=y +check_result "% insmod test_modules/$MOD_KPROBE.ko has_post_handler=y % insmod test_modules/$MOD_LIVEPATCH.ko livepatch: enabling patch '$MOD_LIVEPATCH' livepatch: '$MOD_LIVEPATCH': initializing patching transition @@ -35,7 +35,7 @@ livepatch: '$MOD_LIVEPATCH': canceling patching transition, going to unpatch livepatch: '$MOD_LIVEPATCH': completing unpatching transition livepatch: '$MOD_LIVEPATCH': unpatching complete insmod: ERROR: could not insert module test_modules/$MOD_LIVEPATCH.ko: Device or resource busy -% rmmod test_klp_kprobe" +% rmmod $MOD_KPROBE" start_test "livepatch interaction with kprobed function without post_handler" @@ -46,14 +46,14 @@ unload_mod $MOD_KPROBE disable_lp $MOD_LIVEPATCH unload_lp $MOD_LIVEPATCH -check_result "% insmod test_modules/test_klp_kprobe.ko has_post_handler=n +check_result "% insmod test_modules/$MOD_KPROBE.ko has_post_handler=n % insmod test_modules/$MOD_LIVEPATCH.ko 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 -% rmmod test_klp_kprobe +% rmmod $MOD_KPROBE % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled livepatch: '$MOD_LIVEPATCH': initializing unpatching transition livepatch: '$MOD_LIVEPATCH': starting unpatching transition diff --git a/tools/testing/selftests/livepatch/test-livepatch.sh b/tools/testing/selftests/livepatch/test-livepatch.sh index c44c5341a2f1..5380b5f174d4 100755 --- a/tools/testing/selftests/livepatch/test-livepatch.sh +++ b/tools/testing/selftests/livepatch/test-livepatch.sh @@ -4,10 +4,10 @@ . $(dirname $0)/functions.sh -MOD_LIVEPATCH1=test_klp_livepatch -MOD_LIVEPATCH2=test_klp_syscall +MOD_LIVEPATCH1=test_klp_cmdline_lp +MOD_LIVEPATCH2=test_klp_syscall_getpid MOD_LIVEPATCH3=test_klp_callbacks_demo -MOD_REPLACE=test_klp_atomic_replace +MOD_REPLACE=test_klp_meminfo_lp MOD_TARGET=test_klp_mod_target MOD_TARGET_PATCH=test_klp_mod_patch diff --git a/tools/testing/selftests/livepatch/test-syscall.sh b/tools/testing/selftests/livepatch/test-syscall.sh index 5f9344277b62..488207f25c50 100755 --- a/tools/testing/selftests/livepatch/test-syscall.sh +++ b/tools/testing/selftests/livepatch/test-syscall.sh @@ -5,7 +5,7 @@ . $(dirname $0)/functions.sh -MOD_SYSCALL=test_klp_syscall +MOD_SYSCALL=test_klp_syscall_getpid setup_config diff --git a/tools/testing/selftests/livepatch/test-sysfs.sh b/tools/testing/selftests/livepatch/test-sysfs.sh index 3b16285c6e67..32d3af0097ac 100755 --- a/tools/testing/selftests/livepatch/test-sysfs.sh +++ b/tools/testing/selftests/livepatch/test-sysfs.sh @@ -4,9 +4,9 @@ . $(dirname $0)/functions.sh -MOD_LIVEPATCH=test_klp_livepatch +MOD_LIVEPATCH=test_klp_cmdline_lp MOD_LIVEPATCH2=test_klp_callbacks_demo -MOD_LIVEPATCH3=test_klp_syscall +MOD_LIVEPATCH3=test_klp_syscall_getpid HAS_PATCH_ATTR=0 HAS_REPLACE_ATTR=0 @@ -108,7 +108,7 @@ fi if [[ "$HAS_REPLACE_ATTR" == "1" ]]; then start_test "sysfs test replace enabled" - MOD_ATOMIC_REPLACE=test_klp_atomic_replace + MOD_ATOMIC_REPLACE=test_klp_meminfo_lp load_lp $MOD_ATOMIC_REPLACE replace=1 check_sysfs_rights "$MOD_ATOMIC_REPLACE" "replace" "-r--r--r--" diff --git a/tools/testing/selftests/livepatch/test_modules/Makefile b/tools/testing/selftests/livepatch/test_modules/Makefile index a13d398585dc..732e0003930b 100644 --- a/tools/testing/selftests/livepatch/test_modules/Makefile +++ b/tools/testing/selftests/livepatch/test_modules/Makefile @@ -1,20 +1,20 @@ TESTMODS_DIR := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST))))) KDIR ?= /lib/modules/$(shell uname -r)/build -obj-m += test_klp_atomic_replace.o \ +obj-m += test_klp_meminfo_lp.o \ test_klp_callbacks_busy.o \ test_klp_callbacks_demo.o \ test_klp_callbacks_demo2.o \ test_klp_callbacks_mod.o \ - test_klp_kprobe.o \ - test_klp_livepatch.o \ + test_klp_cmdline_kp.o \ + test_klp_cmdline_lp.o \ test_klp_mod_patch.o \ test_klp_mod_target.o \ test_klp_shadow_vars.o \ test_klp_state.o \ test_klp_state2.o \ test_klp_state3.o \ - test_klp_syscall.o + test_klp_syscall_getpid.o # Ensure that KDIR exists, otherwise skip the compilation modules: diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_kprobe.c b/tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_kp.c similarity index 78% rename from tools/testing/selftests/livepatch/test_modules/test_klp_kprobe.c rename to tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_kp.c index 67a8d29012f6..28ef7ea33fc7 100644 --- a/tools/testing/selftests/livepatch/test_modules/test_klp_kprobe.c +++ b/tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_kp.c @@ -18,7 +18,7 @@ static struct kprobe kp = { .symbol_name = "cmdline_proc_show", }; -static int __init kprobe_init(void) +static int __init cmdline_kp_init(void) { if (has_post_handler) kp.post_handler = post_handler; @@ -26,13 +26,13 @@ static int __init kprobe_init(void) return register_kprobe(&kp); } -static void __exit kprobe_exit(void) +static void __exit cmdline_kp_exit(void) { unregister_kprobe(&kp); } -module_init(kprobe_init) -module_exit(kprobe_exit) +module_init(cmdline_kp_init) +module_exit(cmdline_kp_exit) MODULE_LICENSE("GPL"); MODULE_AUTHOR("Michael Vetter <[email protected]>"); -MODULE_DESCRIPTION("Livepatch test: kprobe function"); +MODULE_DESCRIPTION("Livepatch test: cmdline kprobe"); diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c b/tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_lp.c similarity index 79% rename from tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c rename to tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_lp.c index aff08199de71..88c6aed925fb 100644 --- a/tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c +++ b/tools/testing/selftests/livepatch/test_modules/test_klp_cmdline_lp.c @@ -34,18 +34,18 @@ static struct klp_patch patch = { .objs = objs, }; -static int test_klp_livepatch_init(void) +static int test_klp_cmdline_lp_init(void) { return klp_enable_patch(&patch); } -static void test_klp_livepatch_exit(void) +static void test_klp_cmdline_lp_exit(void) { } -module_init(test_klp_livepatch_init); -module_exit(test_klp_livepatch_exit); +module_init(test_klp_cmdline_lp_init); +module_exit(test_klp_cmdline_lp_exit); MODULE_LICENSE("GPL"); MODULE_INFO(livepatch, "Y"); MODULE_AUTHOR("Seth Jennings <[email protected]>"); -MODULE_DESCRIPTION("Livepatch test: livepatch module"); +MODULE_DESCRIPTION("Livepatch test: cmdline livepatch"); diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c b/tools/testing/selftests/livepatch/test_modules/test_klp_meminfo_lp.c similarity index 82% rename from tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c rename to tools/testing/selftests/livepatch/test_modules/test_klp_meminfo_lp.c index 5af7093ca00c..f2477b217aab 100644 --- a/tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c +++ b/tools/testing/selftests/livepatch/test_modules/test_klp_meminfo_lp.c @@ -39,19 +39,19 @@ static struct klp_patch patch = { /* set .replace in the init function below for demo purposes */ }; -static int test_klp_atomic_replace_init(void) +static int test_klp_meminfo_lp_init(void) { patch.replace = replace; return klp_enable_patch(&patch); } -static void test_klp_atomic_replace_exit(void) +static void test_klp_meminfo_lp_exit(void) { } -module_init(test_klp_atomic_replace_init); -module_exit(test_klp_atomic_replace_exit); +module_init(test_klp_meminfo_lp_init); +module_exit(test_klp_meminfo_lp_exit); MODULE_LICENSE("GPL"); MODULE_INFO(livepatch, "Y"); MODULE_AUTHOR("Joe Lawrence <[email protected]>"); -MODULE_DESCRIPTION("Livepatch test: atomic replace"); +MODULE_DESCRIPTION("Livepatch test: meminfo livepatch"); diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c b/tools/testing/selftests/livepatch/test_modules/test_klp_syscall_getpid.c similarity index 95% rename from tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c rename to tools/testing/selftests/livepatch/test_modules/test_klp_syscall_getpid.c index 08aacc0e14de..5da2bc7920cc 100644 --- a/tools/testing/selftests/livepatch/test_modules/test_klp_syscall.c +++ b/tools/testing/selftests/livepatch/test_modules/test_klp_syscall_getpid.c @@ -93,7 +93,7 @@ static int livepatch_init(void) { int ret; - klp_kobj = kobject_create_and_add("test_klp_syscall", kernel_kobj); + klp_kobj = kobject_create_and_add("test_klp_syscall_getpid", kernel_kobj); if (!klp_kobj) return -ENOMEM; @@ -128,4 +128,4 @@ MODULE_INFO(livepatch, "Y"); MODULE_AUTHOR("Libor Pechacek <[email protected]>"); MODULE_AUTHOR("Nicolai Stange <[email protected]>"); MODULE_AUTHOR("Marcos Paulo de Souza <[email protected]>"); -MODULE_DESCRIPTION("Livepatch test: syscall transition"); +MODULE_DESCRIPTION("Livepatch test: syscall getpid transition"); -- 2.52.0
