livepatch: Move tests from lib/livepatch to selftests/livepatch
authorMarcos Paulo de Souza <mpdesouza@suse.com>
Fri, 12 Jan 2024 17:43:51 +0000 (14:43 -0300)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 22 Jan 2024 17:29:47 +0000 (10:29 -0700)
The modules are being moved from lib/livepatch to
tools/testing/selftests/livepatch/test_modules.

This code moving will allow writing more complex tests, like for example an
userspace C code that will call a livepatched kernel function.

The modules are now built as out-of-tree
modules, but being part of the kernel source means they will be maintained.

Another advantage of the code moving is to be able to easily change,
debug and rebuild the tests by running make on the selftests/livepatch
directory, which is not currently possible since the modules on
lib/livepatch are build and installed using the "modules" target.

The current approach also keeps the ability to execute the tests manually
by executing the scripts inside selftests/livepatch directory, as it's
currently supported. If the modules are modified, they needed to be
rebuilt before running the scripts though.

The modules are built before running the selftests when using the
kselftest invocations:

make kselftest TARGETS=livepatch
or
make -C tools/testing/selftests/livepatch run_tests

Having the modules being built as out-of-modules requires changing the
currently used 'modprobe' by 'insmod' and adapt the test scripts that
check for the kernel message buffer.

Now it is possible to only compile the modules by running:

make -C tools/testing/selftests/livepatch/

This way the test modules and other test program can be built in order
to be packaged if so desired.

As there aren't any modules being built on lib/livepatch, remove the
TEST_LIVEPATCH Kconfig and it's references.

Note: "make gen_tar" packages the pre-built binaries into the tarball.
       It means that it will store the test modules pre-built for
       the kernel running on the build host.

       Note that these modules need not binary compatible with
       the kernel built from the same sources. But the same
       is true for other packaged selftest binaries.

       The entire kernel sources are needed for rebuilding
       the selftests on another system.

Reviewed-by: Joe Lawrence <joe.lawrence@redhat.com>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
37 files changed:
MAINTAINERS
arch/s390/configs/debug_defconfig
arch/s390/configs/defconfig
lib/Kconfig.debug
lib/Makefile
lib/livepatch/Makefile [deleted file]
lib/livepatch/test_klp_atomic_replace.c [deleted file]
lib/livepatch/test_klp_callbacks_busy.c [deleted file]
lib/livepatch/test_klp_callbacks_demo.c [deleted file]
lib/livepatch/test_klp_callbacks_demo2.c [deleted file]
lib/livepatch/test_klp_callbacks_mod.c [deleted file]
lib/livepatch/test_klp_livepatch.c [deleted file]
lib/livepatch/test_klp_shadow_vars.c [deleted file]
lib/livepatch/test_klp_state.c [deleted file]
lib/livepatch/test_klp_state2.c [deleted file]
lib/livepatch/test_klp_state3.c [deleted file]
tools/testing/selftests/livepatch/Makefile
tools/testing/selftests/livepatch/README
tools/testing/selftests/livepatch/config
tools/testing/selftests/livepatch/functions.sh
tools/testing/selftests/livepatch/test-callbacks.sh
tools/testing/selftests/livepatch/test-ftrace.sh
tools/testing/selftests/livepatch/test-livepatch.sh
tools/testing/selftests/livepatch/test-shadow-vars.sh
tools/testing/selftests/livepatch/test-state.sh
tools/testing/selftests/livepatch/test-sysfs.sh
tools/testing/selftests/livepatch/test_modules/Makefile [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_busy.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo2.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_mod.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_shadow_vars.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_state.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_state2.c [new file with mode: 0644]
tools/testing/selftests/livepatch/test_modules/test_klp_state3.c [new file with mode: 0644]

index 8d1052fa6a6924d17a4d2681fa7907c544e35186..ad5bec15bf0fc2d60204df552a23913d048439de 100644 (file)
@@ -12510,7 +12510,6 @@ F:      arch/powerpc/include/asm/livepatch.h
 F:     include/linux/livepatch.h
 F:     kernel/livepatch/
 F:     kernel/module/livepatch.c
-F:     lib/livepatch/
 F:     samples/livepatch/
 F:     tools/testing/selftests/livepatch/
 
index cae2dd34fbb49d16ee020e72fb669010dca832f8..f9c44d392125b5d79507bed9a3690b70e28b2873 100644 (file)
@@ -886,4 +886,3 @@ CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_STRING_SELFTEST=y
 CONFIG_TEST_BITOPS=m
 CONFIG_TEST_BPF=m
-CONFIG_TEST_LIVEPATCH=m
index 42b988873e5443df15b054d78610697fdf769293..ef78734b235c4dff41ac586c8ebc1c1f6693d468 100644 (file)
@@ -815,4 +815,3 @@ CONFIG_KPROBES_SANITY_TEST=m
 CONFIG_PERCPU_TEST=m
 CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_TEST_BPF=m
-CONFIG_TEST_LIVEPATCH=m
index 975a07f9f1cc08838d272f83d5f04a85ff2f5cd2..c95d52853bf97259786d31bcb03cb0db64fb1f7d 100644 (file)
@@ -2857,28 +2857,6 @@ config TEST_MEMCAT_P
 
          If unsure, say N.
 
-config TEST_LIVEPATCH
-       tristate "Test livepatching"
-       default n
-       depends on DYNAMIC_DEBUG
-       depends on LIVEPATCH
-       depends on m
-       help
-         Test kernel livepatching features for correctness.  The tests will
-         load test modules that will be livepatched in various scenarios.
-
-         To run all the livepatching tests:
-
-         make -C tools/testing/selftests TARGETS=livepatch run_tests
-
-         Alternatively, individual tests may be invoked:
-
-         tools/testing/selftests/livepatch/test-callbacks.sh
-         tools/testing/selftests/livepatch/test-livepatch.sh
-         tools/testing/selftests/livepatch/test-shadow-vars.sh
-
-         If unsure, say N.
-
 config TEST_OBJAGG
        tristate "Perform selftest on object aggreration manager"
        default n
index 6b09731d8e6195603aab99a3fd3f5dc56331f567..95ed57f377fd9b9493d25bc9e7dd4681d86c75c6 100644 (file)
@@ -134,8 +134,6 @@ endif
 obj-$(CONFIG_TEST_FPU) += test_fpu.o
 CFLAGS_test_fpu.o += $(FPU_CFLAGS)
 
-obj-$(CONFIG_TEST_LIVEPATCH) += livepatch/
-
 # Some KUnit files (hooks.o) need to be built-in even when KUnit is a module,
 # so we can't just use obj-$(CONFIG_KUNIT).
 ifdef CONFIG_KUNIT
diff --git a/lib/livepatch/Makefile b/lib/livepatch/Makefile
deleted file mode 100644 (file)
index dcc912b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Makefile for livepatch test code.
-
-obj-$(CONFIG_TEST_LIVEPATCH) += test_klp_atomic_replace.o \
-                               test_klp_callbacks_demo.o \
-                               test_klp_callbacks_demo2.o \
-                               test_klp_callbacks_busy.o \
-                               test_klp_callbacks_mod.o \
-                               test_klp_livepatch.o \
-                               test_klp_shadow_vars.o \
-                               test_klp_state.o \
-                               test_klp_state2.o \
-                               test_klp_state3.o
diff --git a/lib/livepatch/test_klp_atomic_replace.c b/lib/livepatch/test_klp_atomic_replace.c
deleted file mode 100644 (file)
index 5af7093..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/livepatch.h>
-
-static int replace;
-module_param(replace, int, 0644);
-MODULE_PARM_DESC(replace, "replace (default=0)");
-
-#include <linux/seq_file.h>
-static int livepatch_meminfo_proc_show(struct seq_file *m, void *v)
-{
-       seq_printf(m, "%s: %s\n", THIS_MODULE->name,
-                  "this has been live patched");
-       return 0;
-}
-
-static struct klp_func funcs[] = {
-       {
-               .old_name = "meminfo_proc_show",
-               .new_func = livepatch_meminfo_proc_show,
-       }, {}
-};
-
-static struct klp_object objs[] = {
-       {
-               /* name being NULL means vmlinux */
-               .funcs = funcs,
-       }, {}
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-       /* set .replace in the init function below for demo purposes */
-};
-
-static int test_klp_atomic_replace_init(void)
-{
-       patch.replace = replace;
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_atomic_replace_exit(void)
-{
-}
-
-module_init(test_klp_atomic_replace_init);
-module_exit(test_klp_atomic_replace_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: atomic replace");
diff --git a/lib/livepatch/test_klp_callbacks_busy.c b/lib/livepatch/test_klp_callbacks_busy.c
deleted file mode 100644 (file)
index 133929e..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/workqueue.h>
-#include <linux/delay.h>
-
-/* load/run-time control from sysfs writer  */
-static bool block_transition;
-module_param(block_transition, bool, 0644);
-MODULE_PARM_DESC(block_transition, "block_transition (default=false)");
-
-static void busymod_work_func(struct work_struct *work);
-static DECLARE_WORK(work, busymod_work_func);
-static DECLARE_COMPLETION(busymod_work_started);
-
-static void busymod_work_func(struct work_struct *work)
-{
-       pr_info("%s enter\n", __func__);
-       complete(&busymod_work_started);
-
-       while (READ_ONCE(block_transition)) {
-               /*
-                * Busy-wait until the sysfs writer has acknowledged a
-                * blocked transition and clears the flag.
-                */
-               msleep(20);
-       }
-
-       pr_info("%s exit\n", __func__);
-}
-
-static int test_klp_callbacks_busy_init(void)
-{
-       pr_info("%s\n", __func__);
-       schedule_work(&work);
-
-       /*
-        * To synchronize kernel messages, hold the init function from
-        * exiting until the work function's entry message has printed.
-        */
-       wait_for_completion(&busymod_work_started);
-
-       if (!block_transition) {
-               /*
-                * Serialize output: print all messages from the work
-                * function before returning from init().
-                */
-               flush_work(&work);
-       }
-
-       return 0;
-}
-
-static void test_klp_callbacks_busy_exit(void)
-{
-       WRITE_ONCE(block_transition, false);
-       flush_work(&work);
-       pr_info("%s\n", __func__);
-}
-
-module_init(test_klp_callbacks_busy_init);
-module_exit(test_klp_callbacks_busy_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: busy target module");
diff --git a/lib/livepatch/test_klp_callbacks_demo.c b/lib/livepatch/test_klp_callbacks_demo.c
deleted file mode 100644 (file)
index 3fd8fe1..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/livepatch.h>
-
-static int pre_patch_ret;
-module_param(pre_patch_ret, int, 0644);
-MODULE_PARM_DESC(pre_patch_ret, "pre_patch_ret (default=0)");
-
-static const char *const module_state[] = {
-       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
-       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
-       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
-       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
-};
-
-static void callback_info(const char *callback, struct klp_object *obj)
-{
-       if (obj->mod)
-               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
-                       module_state[obj->mod->state]);
-       else
-               pr_info("%s: vmlinux\n", callback);
-}
-
-/* Executed on object patching (ie, patch enablement) */
-static int pre_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       return pre_patch_ret;
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void pre_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-static void patched_work_func(struct work_struct *work)
-{
-       pr_info("%s\n", __func__);
-}
-
-static struct klp_func no_funcs[] = {
-       {}
-};
-
-static struct klp_func busymod_funcs[] = {
-       {
-               .old_name = "busymod_work_func",
-               .new_func = patched_work_func,
-       }, {}
-};
-
-static struct klp_object objs[] = {
-       {
-               .name = NULL,   /* vmlinux */
-               .funcs = no_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       },      {
-               .name = "test_klp_callbacks_mod",
-               .funcs = no_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       },      {
-               .name = "test_klp_callbacks_busy",
-               .funcs = busymod_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       }, { }
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-};
-
-static int test_klp_callbacks_demo_init(void)
-{
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_callbacks_demo_exit(void)
-{
-}
-
-module_init(test_klp_callbacks_demo_init);
-module_exit(test_klp_callbacks_demo_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: livepatch demo");
diff --git a/lib/livepatch/test_klp_callbacks_demo2.c b/lib/livepatch/test_klp_callbacks_demo2.c
deleted file mode 100644 (file)
index 5417573..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/livepatch.h>
-
-static int replace;
-module_param(replace, int, 0644);
-MODULE_PARM_DESC(replace, "replace (default=0)");
-
-static const char *const module_state[] = {
-       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
-       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
-       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
-       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
-};
-
-static void callback_info(const char *callback, struct klp_object *obj)
-{
-       if (obj->mod)
-               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
-                       module_state[obj->mod->state]);
-       else
-               pr_info("%s: vmlinux\n", callback);
-}
-
-/* Executed on object patching (ie, patch enablement) */
-static int pre_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       return 0;
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void pre_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-}
-
-static struct klp_func no_funcs[] = {
-       { }
-};
-
-static struct klp_object objs[] = {
-       {
-               .name = NULL,   /* vmlinux */
-               .funcs = no_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       }, { }
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-       /* set .replace in the init function below for demo purposes */
-};
-
-static int test_klp_callbacks_demo2_init(void)
-{
-       patch.replace = replace;
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_callbacks_demo2_exit(void)
-{
-}
-
-module_init(test_klp_callbacks_demo2_init);
-module_exit(test_klp_callbacks_demo2_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: livepatch demo2");
diff --git a/lib/livepatch/test_klp_callbacks_mod.c b/lib/livepatch/test_klp_callbacks_mod.c
deleted file mode 100644 (file)
index 8fbe645..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-
-static int test_klp_callbacks_mod_init(void)
-{
-       pr_info("%s\n", __func__);
-       return 0;
-}
-
-static void test_klp_callbacks_mod_exit(void)
-{
-       pr_info("%s\n", __func__);
-}
-
-module_init(test_klp_callbacks_mod_init);
-module_exit(test_klp_callbacks_mod_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: target module");
diff --git a/lib/livepatch/test_klp_livepatch.c b/lib/livepatch/test_klp_livepatch.c
deleted file mode 100644 (file)
index aff0819..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2014 Seth Jennings <sjenning@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/livepatch.h>
-
-#include <linux/seq_file.h>
-static int livepatch_cmdline_proc_show(struct seq_file *m, void *v)
-{
-       seq_printf(m, "%s: %s\n", THIS_MODULE->name,
-                  "this has been live patched");
-       return 0;
-}
-
-static struct klp_func funcs[] = {
-       {
-               .old_name = "cmdline_proc_show",
-               .new_func = livepatch_cmdline_proc_show,
-       }, { }
-};
-
-static struct klp_object objs[] = {
-       {
-               /* name being NULL means vmlinux */
-               .funcs = funcs,
-       }, { }
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-};
-
-static int test_klp_livepatch_init(void)
-{
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_livepatch_exit(void)
-{
-}
-
-module_init(test_klp_livepatch_init);
-module_exit(test_klp_livepatch_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Seth Jennings <sjenning@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: livepatch module");
diff --git a/lib/livepatch/test_klp_shadow_vars.c b/lib/livepatch/test_klp_shadow_vars.c
deleted file mode 100644 (file)
index b991164..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/livepatch.h>
-#include <linux/slab.h>
-
-/*
- * Keep a small list of pointers so that we can print address-agnostic
- * pointer values.  Use a rolling integer count to differentiate the values.
- * Ironically we could have used the shadow variable API to do this, but
- * let's not lean too heavily on the very code we're testing.
- */
-static LIST_HEAD(ptr_list);
-struct shadow_ptr {
-       void *ptr;
-       int id;
-       struct list_head list;
-};
-
-static void free_ptr_list(void)
-{
-       struct shadow_ptr *sp, *tmp_sp;
-
-       list_for_each_entry_safe(sp, tmp_sp, &ptr_list, list) {
-               list_del(&sp->list);
-               kfree(sp);
-       }
-}
-
-static int ptr_id(void *ptr)
-{
-       struct shadow_ptr *sp;
-       static int count;
-
-       list_for_each_entry(sp, &ptr_list, list) {
-               if (sp->ptr == ptr)
-                       return sp->id;
-       }
-
-       sp = kmalloc(sizeof(*sp), GFP_ATOMIC);
-       if (!sp)
-               return -ENOMEM;
-       sp->ptr = ptr;
-       sp->id = count++;
-
-       list_add(&sp->list, &ptr_list);
-
-       return sp->id;
-}
-
-/*
- * Shadow variable wrapper functions that echo the function and arguments
- * to the kernel log for testing verification.  Don't display raw pointers,
- * but use the ptr_id() value instead.
- */
-static void *shadow_get(void *obj, unsigned long id)
-{
-       int **sv;
-
-       sv = klp_shadow_get(obj, id);
-       pr_info("klp_%s(obj=PTR%d, id=0x%lx) = PTR%d\n",
-               __func__, ptr_id(obj), id, ptr_id(sv));
-
-       return sv;
-}
-
-static void *shadow_alloc(void *obj, unsigned long id, size_t size,
-                         gfp_t gfp_flags, klp_shadow_ctor_t ctor,
-                         void *ctor_data)
-{
-       int **var = ctor_data;
-       int **sv;
-
-       sv = klp_shadow_alloc(obj, id, size, gfp_flags, ctor, var);
-       pr_info("klp_%s(obj=PTR%d, id=0x%lx, size=%zx, gfp_flags=%pGg), ctor=PTR%d, ctor_data=PTR%d = PTR%d\n",
-               __func__, ptr_id(obj), id, size, &gfp_flags, ptr_id(ctor),
-               ptr_id(*var), ptr_id(sv));
-
-       return sv;
-}
-
-static void *shadow_get_or_alloc(void *obj, unsigned long id, size_t size,
-                                gfp_t gfp_flags, klp_shadow_ctor_t ctor,
-                                void *ctor_data)
-{
-       int **var = ctor_data;
-       int **sv;
-
-       sv = klp_shadow_get_or_alloc(obj, id, size, gfp_flags, ctor, var);
-       pr_info("klp_%s(obj=PTR%d, id=0x%lx, size=%zx, gfp_flags=%pGg), ctor=PTR%d, ctor_data=PTR%d = PTR%d\n",
-               __func__, ptr_id(obj), id, size, &gfp_flags, ptr_id(ctor),
-               ptr_id(*var), ptr_id(sv));
-
-       return sv;
-}
-
-static void shadow_free(void *obj, unsigned long id, klp_shadow_dtor_t dtor)
-{
-       klp_shadow_free(obj, id, dtor);
-       pr_info("klp_%s(obj=PTR%d, id=0x%lx, dtor=PTR%d)\n",
-               __func__, ptr_id(obj), id, ptr_id(dtor));
-}
-
-static void shadow_free_all(unsigned long id, klp_shadow_dtor_t dtor)
-{
-       klp_shadow_free_all(id, dtor);
-       pr_info("klp_%s(id=0x%lx, dtor=PTR%d)\n", __func__, id, ptr_id(dtor));
-}
-
-
-/* Shadow variable constructor - remember simple pointer data */
-static int shadow_ctor(void *obj, void *shadow_data, void *ctor_data)
-{
-       int **sv = shadow_data;
-       int **var = ctor_data;
-
-       if (!var)
-               return -EINVAL;
-
-       *sv = *var;
-       pr_info("%s: PTR%d -> PTR%d\n", __func__, ptr_id(sv), ptr_id(*var));
-
-       return 0;
-}
-
-/*
- * With more than one item to free in the list, order is not determined and
- * shadow_dtor will not be passed to shadow_free_all() which would make the
- * test fail. (see pass 6)
- */
-static void shadow_dtor(void *obj, void *shadow_data)
-{
-       int **sv = shadow_data;
-
-       pr_info("%s(obj=PTR%d, shadow_data=PTR%d)\n",
-               __func__, ptr_id(obj), ptr_id(sv));
-}
-
-/* number of objects we simulate that need shadow vars */
-#define NUM_OBJS 3
-
-/* dynamically created obj fields have the following shadow var id values */
-#define SV_ID1 0x1234
-#define SV_ID2 0x1235
-
-/*
- * The main test case adds/removes new fields (shadow var) to each of these
- * test structure instances. The last group of fields in the struct represent
- * the idea that shadow variables may be added and removed to and from the
- * struct during execution.
- */
-struct test_object {
-        /* add anything here below and avoid to define an empty struct */
-       struct shadow_ptr sp;
-
-       /* these represent shadow vars added and removed with SV_ID{1,2} */
-       /* char nfield1; */
-       /* int  nfield2; */
-};
-
-static int test_klp_shadow_vars_init(void)
-{
-       struct test_object objs[NUM_OBJS];
-       char nfields1[NUM_OBJS], *pnfields1[NUM_OBJS], **sv1[NUM_OBJS];
-       char *pndup[NUM_OBJS];
-       int nfields2[NUM_OBJS], *pnfields2[NUM_OBJS], **sv2[NUM_OBJS];
-       void **sv;
-       int ret;
-       int i;
-
-       ptr_id(NULL);
-
-       /*
-        * With an empty shadow variable hash table, expect not to find
-        * any matches.
-        */
-       sv = shadow_get(&objs[0], SV_ID1);
-       if (!sv)
-               pr_info("  got expected NULL result\n");
-
-       /* pass 1: init & alloc a char+int pair of svars for each objs */
-       for (i = 0; i < NUM_OBJS; i++) {
-               pnfields1[i] = &nfields1[i];
-               ptr_id(pnfields1[i]);
-
-               if (i % 2) {
-                       sv1[i] = shadow_alloc(&objs[i], SV_ID1,
-                                       sizeof(pnfields1[i]), GFP_KERNEL,
-                                       shadow_ctor, &pnfields1[i]);
-               } else {
-                       sv1[i] = shadow_get_or_alloc(&objs[i], SV_ID1,
-                                       sizeof(pnfields1[i]), GFP_KERNEL,
-                                       shadow_ctor, &pnfields1[i]);
-               }
-               if (!sv1[i]) {
-                       ret = -ENOMEM;
-                       goto out;
-               }
-
-               pnfields2[i] = &nfields2[i];
-               ptr_id(pnfields2[i]);
-               sv2[i] = shadow_alloc(&objs[i], SV_ID2, sizeof(pnfields2[i]),
-                                       GFP_KERNEL, shadow_ctor, &pnfields2[i]);
-               if (!sv2[i]) {
-                       ret = -ENOMEM;
-                       goto out;
-               }
-       }
-
-       /* pass 2: verify we find allocated svars and where they point to */
-       for (i = 0; i < NUM_OBJS; i++) {
-               /* check the "char" svar for all objects */
-               sv = shadow_get(&objs[i], SV_ID1);
-               if (!sv) {
-                       ret = -EINVAL;
-                       goto out;
-               }
-               if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
-                       pr_info("  got expected PTR%d -> PTR%d result\n",
-                               ptr_id(sv1[i]), ptr_id(*sv1[i]));
-
-               /* check the "int" svar for all objects */
-               sv = shadow_get(&objs[i], SV_ID2);
-               if (!sv) {
-                       ret = -EINVAL;
-                       goto out;
-               }
-               if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
-                       pr_info("  got expected PTR%d -> PTR%d result\n",
-                               ptr_id(sv2[i]), ptr_id(*sv2[i]));
-       }
-
-       /* pass 3: verify that 'get_or_alloc' returns already allocated svars */
-       for (i = 0; i < NUM_OBJS; i++) {
-               pndup[i] = &nfields1[i];
-               ptr_id(pndup[i]);
-
-               sv = shadow_get_or_alloc(&objs[i], SV_ID1, sizeof(pndup[i]),
-                                       GFP_KERNEL, shadow_ctor, &pndup[i]);
-               if (!sv) {
-                       ret = -EINVAL;
-                       goto out;
-               }
-               if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
-                       pr_info("  got expected PTR%d -> PTR%d result\n",
-                                       ptr_id(sv1[i]), ptr_id(*sv1[i]));
-       }
-
-       /* pass 4: free <objs[*], SV_ID1> pairs of svars, verify removal */
-       for (i = 0; i < NUM_OBJS; i++) {
-               shadow_free(&objs[i], SV_ID1, shadow_dtor); /* 'char' pairs */
-               sv = shadow_get(&objs[i], SV_ID1);
-               if (!sv)
-                       pr_info("  got expected NULL result\n");
-       }
-
-       /* pass 5: check we still find <objs[*], SV_ID2> svar pairs */
-       for (i = 0; i < NUM_OBJS; i++) {
-               sv = shadow_get(&objs[i], SV_ID2);      /* 'int' pairs */
-               if (!sv) {
-                       ret = -EINVAL;
-                       goto out;
-               }
-               if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
-                       pr_info("  got expected PTR%d -> PTR%d result\n",
-                                       ptr_id(sv2[i]), ptr_id(*sv2[i]));
-       }
-
-       /* pass 6: free all the <objs[*], SV_ID2> svar pairs too. */
-       shadow_free_all(SV_ID2, NULL);          /* 'int' pairs */
-       for (i = 0; i < NUM_OBJS; i++) {
-               sv = shadow_get(&objs[i], SV_ID2);
-               if (!sv)
-                       pr_info("  got expected NULL result\n");
-       }
-
-       free_ptr_list();
-
-       return 0;
-out:
-       shadow_free_all(SV_ID1, NULL);          /* 'char' pairs */
-       shadow_free_all(SV_ID2, NULL);          /* 'int' pairs */
-       free_ptr_list();
-
-       return ret;
-}
-
-static void test_klp_shadow_vars_exit(void)
-{
-}
-
-module_init(test_klp_shadow_vars_init);
-module_exit(test_klp_shadow_vars_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
-MODULE_DESCRIPTION("Livepatch test: shadow variables");
diff --git a/lib/livepatch/test_klp_state.c b/lib/livepatch/test_klp_state.c
deleted file mode 100644 (file)
index 57a4253..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2019 SUSE
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/livepatch.h>
-
-#define CONSOLE_LOGLEVEL_STATE 1
-/* Version 1 does not support migration. */
-#define CONSOLE_LOGLEVEL_STATE_VERSION 1
-
-static const char *const module_state[] = {
-       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
-       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
-       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
-       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
-};
-
-static void callback_info(const char *callback, struct klp_object *obj)
-{
-       if (obj->mod)
-               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
-                       module_state[obj->mod->state]);
-       else
-               pr_info("%s: vmlinux\n", callback);
-}
-
-static struct klp_patch patch;
-
-static int allocate_loglevel_state(void)
-{
-       struct klp_state *loglevel_state;
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return -EINVAL;
-
-       loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
-       if (!loglevel_state->data)
-               return -ENOMEM;
-
-       pr_info("%s: allocating space to store console_loglevel\n",
-               __func__);
-       return 0;
-}
-
-static void fix_console_loglevel(void)
-{
-       struct klp_state *loglevel_state;
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       pr_info("%s: fixing console_loglevel\n", __func__);
-       *(int *)loglevel_state->data = console_loglevel;
-       console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
-}
-
-static void restore_console_loglevel(void)
-{
-       struct klp_state *loglevel_state;
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       pr_info("%s: restoring console_loglevel\n", __func__);
-       console_loglevel = *(int *)loglevel_state->data;
-}
-
-static void free_loglevel_state(void)
-{
-       struct klp_state *loglevel_state;
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       pr_info("%s: freeing space for the stored console_loglevel\n",
-               __func__);
-       kfree(loglevel_state->data);
-}
-
-/* Executed on object patching (ie, patch enablement) */
-static int pre_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       return allocate_loglevel_state();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       fix_console_loglevel();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void pre_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       restore_console_loglevel();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       free_loglevel_state();
-}
-
-static struct klp_func no_funcs[] = {
-       {}
-};
-
-static struct klp_object objs[] = {
-       {
-               .name = NULL,   /* vmlinux */
-               .funcs = no_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       }, { }
-};
-
-static struct klp_state states[] = {
-       {
-               .id = CONSOLE_LOGLEVEL_STATE,
-               .version = CONSOLE_LOGLEVEL_STATE_VERSION,
-       }, { }
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-       .states = states,
-       .replace = true,
-};
-
-static int test_klp_callbacks_demo_init(void)
-{
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_callbacks_demo_exit(void)
-{
-}
-
-module_init(test_klp_callbacks_demo_init);
-module_exit(test_klp_callbacks_demo_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Petr Mladek <pmladek@suse.com>");
-MODULE_DESCRIPTION("Livepatch test: system state modification");
diff --git a/lib/livepatch/test_klp_state2.c b/lib/livepatch/test_klp_state2.c
deleted file mode 100644 (file)
index c978ea4..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2019 SUSE
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/livepatch.h>
-
-#define CONSOLE_LOGLEVEL_STATE 1
-/* Version 2 supports migration. */
-#define CONSOLE_LOGLEVEL_STATE_VERSION 2
-
-static const char *const module_state[] = {
-       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
-       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
-       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
-       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
-};
-
-static void callback_info(const char *callback, struct klp_object *obj)
-{
-       if (obj->mod)
-               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
-                       module_state[obj->mod->state]);
-       else
-               pr_info("%s: vmlinux\n", callback);
-}
-
-static struct klp_patch patch;
-
-static int allocate_loglevel_state(void)
-{
-       struct klp_state *loglevel_state, *prev_loglevel_state;
-
-       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
-       if (prev_loglevel_state) {
-               pr_info("%s: space to store console_loglevel already allocated\n",
-               __func__);
-               return 0;
-       }
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return -EINVAL;
-
-       loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
-       if (!loglevel_state->data)
-               return -ENOMEM;
-
-       pr_info("%s: allocating space to store console_loglevel\n",
-               __func__);
-       return 0;
-}
-
-static void fix_console_loglevel(void)
-{
-       struct klp_state *loglevel_state, *prev_loglevel_state;
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
-       if (prev_loglevel_state) {
-               pr_info("%s: taking over the console_loglevel change\n",
-               __func__);
-               loglevel_state->data = prev_loglevel_state->data;
-               return;
-       }
-
-       pr_info("%s: fixing console_loglevel\n", __func__);
-       *(int *)loglevel_state->data = console_loglevel;
-       console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
-}
-
-static void restore_console_loglevel(void)
-{
-       struct klp_state *loglevel_state, *prev_loglevel_state;
-
-       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
-       if (prev_loglevel_state) {
-               pr_info("%s: passing the console_loglevel change back to the old livepatch\n",
-               __func__);
-               return;
-       }
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       pr_info("%s: restoring console_loglevel\n", __func__);
-       console_loglevel = *(int *)loglevel_state->data;
-}
-
-static void free_loglevel_state(void)
-{
-       struct klp_state *loglevel_state, *prev_loglevel_state;
-
-       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
-       if (prev_loglevel_state) {
-               pr_info("%s: keeping space to store console_loglevel\n",
-               __func__);
-               return;
-       }
-
-       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
-       if (!loglevel_state)
-               return;
-
-       pr_info("%s: freeing space for the stored console_loglevel\n",
-               __func__);
-       kfree(loglevel_state->data);
-}
-
-/* Executed on object patching (ie, patch enablement) */
-static int pre_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       return allocate_loglevel_state();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_patch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       fix_console_loglevel();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void pre_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       restore_console_loglevel();
-}
-
-/* Executed on object unpatching (ie, patch disablement) */
-static void post_unpatch_callback(struct klp_object *obj)
-{
-       callback_info(__func__, obj);
-       free_loglevel_state();
-}
-
-static struct klp_func no_funcs[] = {
-       {}
-};
-
-static struct klp_object objs[] = {
-       {
-               .name = NULL,   /* vmlinux */
-               .funcs = no_funcs,
-               .callbacks = {
-                       .pre_patch = pre_patch_callback,
-                       .post_patch = post_patch_callback,
-                       .pre_unpatch = pre_unpatch_callback,
-                       .post_unpatch = post_unpatch_callback,
-               },
-       }, { }
-};
-
-static struct klp_state states[] = {
-       {
-               .id = CONSOLE_LOGLEVEL_STATE,
-               .version = CONSOLE_LOGLEVEL_STATE_VERSION,
-       }, { }
-};
-
-static struct klp_patch patch = {
-       .mod = THIS_MODULE,
-       .objs = objs,
-       .states = states,
-       .replace = true,
-};
-
-static int test_klp_callbacks_demo_init(void)
-{
-       return klp_enable_patch(&patch);
-}
-
-static void test_klp_callbacks_demo_exit(void)
-{
-}
-
-module_init(test_klp_callbacks_demo_init);
-module_exit(test_klp_callbacks_demo_exit);
-MODULE_LICENSE("GPL");
-MODULE_INFO(livepatch, "Y");
-MODULE_AUTHOR("Petr Mladek <pmladek@suse.com>");
-MODULE_DESCRIPTION("Livepatch test: system state modification");
diff --git a/lib/livepatch/test_klp_state3.c b/lib/livepatch/test_klp_state3.c
deleted file mode 100644 (file)
index 9226579..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-// Copyright (C) 2019 SUSE
-
-/* The console loglevel fix is the same in the next cumulative patch. */
-#include "test_klp_state2.c"
index 02fadc9d55e0f576b22b0053189739d51ed6fba5..119e2bbebe5d0dc74c8872c92f90b76f50718b2d 100644 (file)
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
+TEST_GEN_MODS_DIR := test_modules
 TEST_PROGS_EXTENDED := functions.sh
 TEST_PROGS := \
        test-livepatch.sh \
index 0942dd5826f87d546b804d78a0b82f14329f6240..d2035dd64a2bea04cc55e1413ef76671ef6f7b0f 100644 (file)
@@ -13,23 +13,36 @@ the message buffer for only the duration of each individual test.)
 Config
 ------
 
-Set these config options and their prerequisites:
+Set CONFIG_LIVEPATCH=y option and it's prerequisites.
 
-CONFIG_LIVEPATCH=y
-CONFIG_TEST_LIVEPATCH=m
 
+Building the tests
+------------------
+
+To only build the tests without running them, run:
+
+  % make -C tools/testing/selftests/livepatch
+
+The command above will compile all test modules and test programs, making them
+ready to be packaged if so desired.
 
 Running the tests
 -----------------
 
-Test kernel modules are built as part of lib/ (make modules) and need to
-be installed (make modules_install) as the test scripts will modprobe
-them.
+Test kernel modules are built before running the livepatch selftests.  The
+modules are located under test_modules directory, and are built as out-of-tree
+modules.  This is specially useful since the same sources can be built and
+tested on systems with different kABI, ensuring they the tests are backwards
+compatible.  The modules will be loaded by the test scripts using insmod.
 
 To run the livepatch selftests, from the top of the kernel source tree:
 
   % make -C tools/testing/selftests TARGETS=livepatch run_tests
 
+or
+
+  % make kselftest TARGETS=livepatch
+
 
 Adding tests
 ------------
index ad23100cb27c84da75727efb714244487008c046..e88bf518a23ab3ccff9dfa1da9656e61e4f2a316 100644 (file)
@@ -1,3 +1,2 @@
 CONFIG_LIVEPATCH=y
 CONFIG_DYNAMIC_DEBUG=y
-CONFIG_TEST_LIVEPATCH=m
index c8416c54b4637b1380810f0c9f71bc99e1710b8e..e60cf09491a6663395f199360d1a8cf58c8afe4a 100644 (file)
@@ -127,16 +127,14 @@ function loop_until() {
        done
 }
 
-function assert_mod() {
-       local mod="$1"
-
-       modprobe --dry-run "$mod" &>/dev/null
-}
-
 function is_livepatch_mod() {
        local mod="$1"
 
-       if [[ $(modinfo "$mod" | awk '/^livepatch:/{print $NF}') == "Y" ]]; then
+       if [[ ! -f "test_modules/$mod.ko" ]]; then
+               die "Can't find \"test_modules/$mod.ko\", try \"make\""
+       fi
+
+       if [[ $(modinfo "test_modules/$mod.ko" | awk '/^livepatch:/{print $NF}') == "Y" ]]; then
                return 0
        fi
 
@@ -146,9 +144,9 @@ function is_livepatch_mod() {
 function __load_mod() {
        local mod="$1"; shift
 
-       local msg="% modprobe $mod $*"
+       local msg="% insmod test_modules/$mod.ko $*"
        log "${msg%% }"
-       ret=$(modprobe "$mod" "$@" 2>&1)
+       ret=$(insmod "test_modules/$mod.ko" "$@" 2>&1)
        if [[ "$ret" != "" ]]; then
                die "$ret"
        fi
@@ -161,13 +159,10 @@ function __load_mod() {
 
 # load_mod(modname, params) - load a kernel module
 #      modname - module name to load
-#      params  - module parameters to pass to modprobe
+#      params  - module parameters to pass to insmod
 function load_mod() {
        local mod="$1"; shift
 
-       assert_mod "$mod" ||
-               skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root"
-
        is_livepatch_mod "$mod" &&
                die "use load_lp() to load the livepatch module $mod"
 
@@ -177,13 +172,10 @@ function load_mod() {
 # load_lp_nowait(modname, params) - load a kernel module with a livepatch
 #                      but do not wait on until the transition finishes
 #      modname - module name to load
-#      params  - module parameters to pass to modprobe
+#      params  - module parameters to pass to insmod
 function load_lp_nowait() {
        local mod="$1"; shift
 
-       assert_mod "$mod" ||
-               skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root"
-
        is_livepatch_mod "$mod" ||
                die "module $mod is not a livepatch"
 
@@ -196,7 +188,7 @@ function load_lp_nowait() {
 
 # load_lp(modname, params) - load a kernel module with a livepatch
 #      modname - module name to load
-#      params  - module parameters to pass to modprobe
+#      params  - module parameters to pass to insmod
 function load_lp() {
        local mod="$1"; shift
 
@@ -209,13 +201,13 @@ function load_lp() {
 
 # load_failing_mod(modname, params) - load a kernel module, expect to fail
 #      modname - module name to load
-#      params  - module parameters to pass to modprobe
+#      params  - module parameters to pass to insmod
 function load_failing_mod() {
        local mod="$1"; shift
 
-       local msg="% modprobe $mod $*"
+       local msg="% insmod test_modules/$mod.ko $*"
        log "${msg%% }"
-       ret=$(modprobe "$mod" "$@" 2>&1)
+       ret=$(insmod "test_modules/$mod.ko" "$@" 2>&1)
        if [[ "$ret" == "" ]]; then
                die "$mod unexpectedly loaded"
        fi
index 90b26dbb26262c6f21ac02741cec6c316636fff2..32b150e25b10b8ab8e3cbc8a20005b2e883f8b50 100755 (executable)
@@ -34,9 +34,9 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 unload_mod $MOD_TARGET
 
-check_result "% modprobe $MOD_TARGET
+check_result "% insmod test_modules/$MOD_TARGET.ko
 $MOD_TARGET: ${MOD_TARGET}_init
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -81,7 +81,7 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 unload_mod $MOD_TARGET
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -89,7 +89,7 @@ livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 livepatch: '$MOD_LIVEPATCH': patching complete
-% modprobe $MOD_TARGET
+% insmod test_modules/$MOD_TARGET.ko
 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
@@ -129,9 +129,9 @@ unload_mod $MOD_TARGET
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_TARGET
+check_result "% insmod test_modules/$MOD_TARGET.ko
 $MOD_TARGET: ${MOD_TARGET}_init
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -177,7 +177,7 @@ unload_mod $MOD_TARGET
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -185,7 +185,7 @@ livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 livepatch: '$MOD_LIVEPATCH': patching complete
-% modprobe $MOD_TARGET
+% insmod test_modules/$MOD_TARGET.ko
 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
@@ -219,7 +219,7 @@ load_lp $MOD_LIVEPATCH
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -254,9 +254,9 @@ load_mod $MOD_TARGET
 load_failing_mod $MOD_LIVEPATCH pre_patch_ret=-19
 unload_mod $MOD_TARGET
 
-check_result "% modprobe $MOD_TARGET
+check_result "% insmod test_modules/$MOD_TARGET.ko
 $MOD_TARGET: ${MOD_TARGET}_init
-% modprobe $MOD_LIVEPATCH pre_patch_ret=-19
+% 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
@@ -265,7 +265,7 @@ 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': No such device
+insmod: ERROR: could not insert module test_modules/$MOD_LIVEPATCH.ko: No such device
 % rmmod $MOD_TARGET
 $MOD_TARGET: ${MOD_TARGET}_exit"
 
@@ -295,7 +295,7 @@ load_failing_mod $MOD_TARGET
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -304,12 +304,12 @@ livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 livepatch: '$MOD_LIVEPATCH': patching complete
 % echo -19 > /sys/module/$MOD_LIVEPATCH/parameters/pre_patch_ret
-% modprobe $MOD_TARGET
+% insmod test_modules/$MOD_TARGET.ko
 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
 livepatch: pre-patch callback failed for object '$MOD_TARGET'
 livepatch: patch '$MOD_LIVEPATCH' failed for module '$MOD_TARGET', refusing to load module '$MOD_TARGET'
-modprobe: ERROR: could not insert '$MOD_TARGET': No such device
+insmod: ERROR: could not insert module test_modules/$MOD_TARGET.ko: No such device
 % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled
 livepatch: '$MOD_LIVEPATCH': initializing unpatching transition
 $MOD_LIVEPATCH: pre_unpatch_callback: vmlinux
@@ -340,11 +340,11 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 unload_mod $MOD_TARGET_BUSY
 
-check_result "% modprobe $MOD_TARGET_BUSY block_transition=N
+check_result "% insmod test_modules/$MOD_TARGET_BUSY.ko block_transition=N
 $MOD_TARGET_BUSY: ${MOD_TARGET_BUSY}_init
 $MOD_TARGET_BUSY: busymod_work_func enter
 $MOD_TARGET_BUSY: busymod_work_func exit
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -354,7 +354,7 @@ livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 $MOD_LIVEPATCH: post_patch_callback: $MOD_TARGET_BUSY -> [MODULE_STATE_LIVE] Normal state
 livepatch: '$MOD_LIVEPATCH': patching complete
-% modprobe $MOD_TARGET
+% insmod test_modules/$MOD_TARGET.ko
 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
@@ -421,16 +421,16 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 unload_mod $MOD_TARGET_BUSY
 
-check_result "% modprobe $MOD_TARGET_BUSY block_transition=Y
+check_result "% insmod test_modules/$MOD_TARGET_BUSY.ko block_transition=Y
 $MOD_TARGET_BUSY: ${MOD_TARGET_BUSY}_init
 $MOD_TARGET_BUSY: busymod_work_func enter
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
 $MOD_LIVEPATCH: pre_patch_callback: $MOD_TARGET_BUSY -> [MODULE_STATE_LIVE] Normal state
 livepatch: '$MOD_LIVEPATCH': starting patching transition
-% modprobe $MOD_TARGET
+% insmod test_modules/$MOD_TARGET.ko
 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_TARGET: ${MOD_TARGET}_init
@@ -467,7 +467,7 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -475,7 +475,7 @@ livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 livepatch: '$MOD_LIVEPATCH': patching complete
-% modprobe $MOD_LIVEPATCH2
+% insmod test_modules/$MOD_LIVEPATCH2.ko
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
@@ -523,7 +523,7 @@ disable_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -531,7 +531,7 @@ livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 $MOD_LIVEPATCH: post_patch_callback: vmlinux
 livepatch: '$MOD_LIVEPATCH': patching complete
-% modprobe $MOD_LIVEPATCH2 replace=1
+% insmod test_modules/$MOD_LIVEPATCH2.ko replace=1
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
index 825540a5194d472a122963fdf1b1327aac4e6217..730218bce99c5006336c1c08e4a1d5a74054bda8 100755 (executable)
@@ -35,7 +35,7 @@ disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
 check_result "livepatch: kernel.ftrace_enabled = 0
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: failed to register ftrace handler for function 'cmdline_proc_show' (-16)
@@ -44,9 +44,9 @@ 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
+insmod: ERROR: could not insert module test_modules/$MOD_LIVEPATCH.ko: Device or resource busy
 livepatch: kernel.ftrace_enabled = 1
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: '$MOD_LIVEPATCH': starting patching transition
index 5fe79ac34be12de172ca12ef4295f18223331f7c..e3455a6b11589eed3df64e818b5d5bae1fd97b54 100755 (executable)
@@ -31,7 +31,7 @@ if [[ "$(cat /proc/cmdline)" == "$MOD_LIVEPATCH: this has been live patched" ]]
        die "livepatch kselftest(s) failed"
 fi
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: '$MOD_LIVEPATCH': starting patching transition
@@ -75,14 +75,14 @@ unload_lp $MOD_LIVEPATCH
 grep 'live patched' /proc/cmdline > /dev/kmsg
 grep 'live patched' /proc/meminfo > /dev/kmsg
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% 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
 $MOD_LIVEPATCH: this has been live patched
-% modprobe $MOD_REPLACE replace=0
+% insmod test_modules/$MOD_REPLACE.ko replace=0
 livepatch: enabling patch '$MOD_REPLACE'
 livepatch: '$MOD_REPLACE': initializing patching transition
 livepatch: '$MOD_REPLACE': starting patching transition
@@ -135,14 +135,14 @@ unload_lp $MOD_REPLACE
 grep 'live patched' /proc/cmdline > /dev/kmsg
 grep 'live patched' /proc/meminfo > /dev/kmsg
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% 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
 $MOD_LIVEPATCH: this has been live patched
-% modprobe $MOD_REPLACE replace=1
+% insmod test_modules/$MOD_REPLACE.ko replace=1
 livepatch: enabling patch '$MOD_REPLACE'
 livepatch: '$MOD_REPLACE': initializing patching transition
 livepatch: '$MOD_REPLACE': starting patching transition
index e04cb354f56b2059359f0aa3fa941a5cb6d8b220..1218c155bffeaba5735b0b127348bbe569a9017a 100755 (executable)
@@ -16,7 +16,7 @@ start_test "basic shadow variable API"
 load_mod $MOD_TEST
 unload_mod $MOD_TEST
 
-check_result "% modprobe $MOD_TEST
+check_result "% insmod test_modules/$MOD_TEST.ko
 $MOD_TEST: klp_shadow_get(obj=PTR1, id=0x1234) = PTR0
 $MOD_TEST:   got expected NULL result
 $MOD_TEST: shadow_ctor: PTR3 -> PTR2
index 38656721c958b48814f58f0f9b7741a1482db3db..10a52ac061850561f7d2fb9201755c55fdd9c7c7 100755 (executable)
@@ -19,7 +19,7 @@ load_lp $MOD_LIVEPATCH
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -51,7 +51,7 @@ unload_lp $MOD_LIVEPATCH
 disable_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH2
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 $MOD_LIVEPATCH: pre_patch_callback: vmlinux
@@ -61,7 +61,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
-% modprobe $MOD_LIVEPATCH2
+% insmod test_modules/$MOD_LIVEPATCH2.ko
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
@@ -96,7 +96,7 @@ disable_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH3
 
-check_result "% modprobe $MOD_LIVEPATCH2
+check_result "% insmod test_modules/$MOD_LIVEPATCH2.ko
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
@@ -106,7 +106,7 @@ livepatch: '$MOD_LIVEPATCH2': completing patching transition
 $MOD_LIVEPATCH2: post_patch_callback: vmlinux
 $MOD_LIVEPATCH2: fix_console_loglevel: fixing console_loglevel
 livepatch: '$MOD_LIVEPATCH2': patching complete
-% modprobe $MOD_LIVEPATCH3
+% insmod test_modules/$MOD_LIVEPATCH3.ko
 livepatch: enabling patch '$MOD_LIVEPATCH3'
 livepatch: '$MOD_LIVEPATCH3': initializing patching transition
 $MOD_LIVEPATCH3: pre_patch_callback: vmlinux
@@ -117,7 +117,7 @@ $MOD_LIVEPATCH3: post_patch_callback: vmlinux
 $MOD_LIVEPATCH3: fix_console_loglevel: taking over the console_loglevel change
 livepatch: '$MOD_LIVEPATCH3': patching complete
 % rmmod $MOD_LIVEPATCH2
-% modprobe $MOD_LIVEPATCH2
+% insmod test_modules/$MOD_LIVEPATCH2.ko
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
@@ -149,7 +149,7 @@ load_failing_mod $MOD_LIVEPATCH
 disable_lp $MOD_LIVEPATCH2
 unload_lp $MOD_LIVEPATCH2
 
-check_result "% modprobe $MOD_LIVEPATCH2
+check_result "% insmod test_modules/$MOD_LIVEPATCH2.ko
 livepatch: enabling patch '$MOD_LIVEPATCH2'
 livepatch: '$MOD_LIVEPATCH2': initializing patching transition
 $MOD_LIVEPATCH2: pre_patch_callback: vmlinux
@@ -159,9 +159,9 @@ livepatch: '$MOD_LIVEPATCH2': completing patching transition
 $MOD_LIVEPATCH2: post_patch_callback: vmlinux
 $MOD_LIVEPATCH2: fix_console_loglevel: fixing console_loglevel
 livepatch: '$MOD_LIVEPATCH2': patching complete
-% modprobe $MOD_LIVEPATCH
+% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: Livepatch patch ($MOD_LIVEPATCH) is not compatible with the already installed livepatches.
-modprobe: ERROR: could not insert '$MOD_LIVEPATCH': Invalid argument
+insmod: ERROR: could not insert module test_modules/$MOD_LIVEPATCH.ko: Invalid parameters
 % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH2/enabled
 livepatch: '$MOD_LIVEPATCH2': initializing unpatching transition
 $MOD_LIVEPATCH2: pre_unpatch_callback: vmlinux
index 7f76f280189a0c341517e641612387ae1ec63143..6c646afa7395e5324c24c0aeaa6ac606745ea4f4 100755 (executable)
@@ -27,7 +27,7 @@ disable_lp $MOD_LIVEPATCH
 
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe $MOD_LIVEPATCH
+check_result "% insmod test_modules/$MOD_LIVEPATCH.ko
 livepatch: enabling patch '$MOD_LIVEPATCH'
 livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: '$MOD_LIVEPATCH': starting patching transition
@@ -56,7 +56,7 @@ check_sysfs_value  "$MOD_LIVEPATCH" "$MOD_TARGET/patched" "0"
 disable_lp $MOD_LIVEPATCH
 unload_lp $MOD_LIVEPATCH
 
-check_result "% modprobe test_klp_callbacks_demo
+check_result "% insmod test_modules/test_klp_callbacks_demo.ko
 livepatch: enabling patch 'test_klp_callbacks_demo'
 livepatch: 'test_klp_callbacks_demo': initializing patching transition
 test_klp_callbacks_demo: pre_patch_callback: vmlinux
@@ -64,7 +64,7 @@ livepatch: 'test_klp_callbacks_demo': starting patching transition
 livepatch: 'test_klp_callbacks_demo': completing patching transition
 test_klp_callbacks_demo: post_patch_callback: vmlinux
 livepatch: 'test_klp_callbacks_demo': patching complete
-% modprobe test_klp_callbacks_mod
+% insmod test_modules/test_klp_callbacks_mod.ko
 livepatch: applying patch 'test_klp_callbacks_demo' to loading module 'test_klp_callbacks_mod'
 test_klp_callbacks_demo: pre_patch_callback: test_klp_callbacks_mod -> [MODULE_STATE_COMING] Full formed, running module_init
 test_klp_callbacks_demo: post_patch_callback: test_klp_callbacks_mod -> [MODULE_STATE_COMING] Full formed, running module_init
diff --git a/tools/testing/selftests/livepatch/test_modules/Makefile b/tools/testing/selftests/livepatch/test_modules/Makefile
new file mode 100644 (file)
index 0000000..6f7c210
--- /dev/null
@@ -0,0 +1,19 @@
+TESTMODS_DIR := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
+KDIR ?= /lib/modules/$(shell uname -r)/build
+
+obj-m += test_klp_atomic_replace.o \
+       test_klp_callbacks_busy.o \
+       test_klp_callbacks_demo.o \
+       test_klp_callbacks_demo2.o \
+       test_klp_callbacks_mod.o \
+       test_klp_livepatch.o \
+       test_klp_state.o \
+       test_klp_state2.o \
+       test_klp_state3.o \
+       test_klp_shadow_vars.o
+
+modules:
+       $(Q)$(MAKE) -C $(KDIR) modules KBUILD_EXTMOD=$(TESTMODS_DIR)
+
+clean:
+       $(Q)$(MAKE) -C $(KDIR) clean KBUILD_EXTMOD=$(TESTMODS_DIR)
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c b/tools/testing/selftests/livepatch/test_modules/test_klp_atomic_replace.c
new file mode 100644 (file)
index 0000000..5af7093
--- /dev/null
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/livepatch.h>
+
+static int replace;
+module_param(replace, int, 0644);
+MODULE_PARM_DESC(replace, "replace (default=0)");
+
+#include <linux/seq_file.h>
+static int livepatch_meminfo_proc_show(struct seq_file *m, void *v)
+{
+       seq_printf(m, "%s: %s\n", THIS_MODULE->name,
+                  "this has been live patched");
+       return 0;
+}
+
+static struct klp_func funcs[] = {
+       {
+               .old_name = "meminfo_proc_show",
+               .new_func = livepatch_meminfo_proc_show,
+       }, {}
+};
+
+static struct klp_object objs[] = {
+       {
+               /* name being NULL means vmlinux */
+               .funcs = funcs,
+       }, {}
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+       /* set .replace in the init function below for demo purposes */
+};
+
+static int test_klp_atomic_replace_init(void)
+{
+       patch.replace = replace;
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_atomic_replace_exit(void)
+{
+}
+
+module_init(test_klp_atomic_replace_init);
+module_exit(test_klp_atomic_replace_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: atomic replace");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_busy.c b/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_busy.c
new file mode 100644 (file)
index 0000000..133929e
--- /dev/null
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/workqueue.h>
+#include <linux/delay.h>
+
+/* load/run-time control from sysfs writer  */
+static bool block_transition;
+module_param(block_transition, bool, 0644);
+MODULE_PARM_DESC(block_transition, "block_transition (default=false)");
+
+static void busymod_work_func(struct work_struct *work);
+static DECLARE_WORK(work, busymod_work_func);
+static DECLARE_COMPLETION(busymod_work_started);
+
+static void busymod_work_func(struct work_struct *work)
+{
+       pr_info("%s enter\n", __func__);
+       complete(&busymod_work_started);
+
+       while (READ_ONCE(block_transition)) {
+               /*
+                * Busy-wait until the sysfs writer has acknowledged a
+                * blocked transition and clears the flag.
+                */
+               msleep(20);
+       }
+
+       pr_info("%s exit\n", __func__);
+}
+
+static int test_klp_callbacks_busy_init(void)
+{
+       pr_info("%s\n", __func__);
+       schedule_work(&work);
+
+       /*
+        * To synchronize kernel messages, hold the init function from
+        * exiting until the work function's entry message has printed.
+        */
+       wait_for_completion(&busymod_work_started);
+
+       if (!block_transition) {
+               /*
+                * Serialize output: print all messages from the work
+                * function before returning from init().
+                */
+               flush_work(&work);
+       }
+
+       return 0;
+}
+
+static void test_klp_callbacks_busy_exit(void)
+{
+       WRITE_ONCE(block_transition, false);
+       flush_work(&work);
+       pr_info("%s\n", __func__);
+}
+
+module_init(test_klp_callbacks_busy_init);
+module_exit(test_klp_callbacks_busy_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: busy target module");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo.c b/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo.c
new file mode 100644 (file)
index 0000000..3fd8fe1
--- /dev/null
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/livepatch.h>
+
+static int pre_patch_ret;
+module_param(pre_patch_ret, int, 0644);
+MODULE_PARM_DESC(pre_patch_ret, "pre_patch_ret (default=0)");
+
+static const char *const module_state[] = {
+       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
+       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
+       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
+       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
+};
+
+static void callback_info(const char *callback, struct klp_object *obj)
+{
+       if (obj->mod)
+               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
+                       module_state[obj->mod->state]);
+       else
+               pr_info("%s: vmlinux\n", callback);
+}
+
+/* Executed on object patching (ie, patch enablement) */
+static int pre_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       return pre_patch_ret;
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void pre_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+static void patched_work_func(struct work_struct *work)
+{
+       pr_info("%s\n", __func__);
+}
+
+static struct klp_func no_funcs[] = {
+       {}
+};
+
+static struct klp_func busymod_funcs[] = {
+       {
+               .old_name = "busymod_work_func",
+               .new_func = patched_work_func,
+       }, {}
+};
+
+static struct klp_object objs[] = {
+       {
+               .name = NULL,   /* vmlinux */
+               .funcs = no_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       },      {
+               .name = "test_klp_callbacks_mod",
+               .funcs = no_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       },      {
+               .name = "test_klp_callbacks_busy",
+               .funcs = busymod_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       }, { }
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+};
+
+static int test_klp_callbacks_demo_init(void)
+{
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_callbacks_demo_exit(void)
+{
+}
+
+module_init(test_klp_callbacks_demo_init);
+module_exit(test_klp_callbacks_demo_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: livepatch demo");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo2.c b/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_demo2.c
new file mode 100644 (file)
index 0000000..5417573
--- /dev/null
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/livepatch.h>
+
+static int replace;
+module_param(replace, int, 0644);
+MODULE_PARM_DESC(replace, "replace (default=0)");
+
+static const char *const module_state[] = {
+       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
+       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
+       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
+       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
+};
+
+static void callback_info(const char *callback, struct klp_object *obj)
+{
+       if (obj->mod)
+               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
+                       module_state[obj->mod->state]);
+       else
+               pr_info("%s: vmlinux\n", callback);
+}
+
+/* Executed on object patching (ie, patch enablement) */
+static int pre_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       return 0;
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void pre_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+}
+
+static struct klp_func no_funcs[] = {
+       { }
+};
+
+static struct klp_object objs[] = {
+       {
+               .name = NULL,   /* vmlinux */
+               .funcs = no_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       }, { }
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+       /* set .replace in the init function below for demo purposes */
+};
+
+static int test_klp_callbacks_demo2_init(void)
+{
+       patch.replace = replace;
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_callbacks_demo2_exit(void)
+{
+}
+
+module_init(test_klp_callbacks_demo2_init);
+module_exit(test_klp_callbacks_demo2_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: livepatch demo2");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_mod.c b/tools/testing/selftests/livepatch/test_modules/test_klp_callbacks_mod.c
new file mode 100644 (file)
index 0000000..8fbe645
--- /dev/null
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+
+static int test_klp_callbacks_mod_init(void)
+{
+       pr_info("%s\n", __func__);
+       return 0;
+}
+
+static void test_klp_callbacks_mod_exit(void)
+{
+       pr_info("%s\n", __func__);
+}
+
+module_init(test_klp_callbacks_mod_init);
+module_exit(test_klp_callbacks_mod_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: target module");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c b/tools/testing/selftests/livepatch/test_modules/test_klp_livepatch.c
new file mode 100644 (file)
index 0000000..aff0819
--- /dev/null
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2014 Seth Jennings <sjenning@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/livepatch.h>
+
+#include <linux/seq_file.h>
+static int livepatch_cmdline_proc_show(struct seq_file *m, void *v)
+{
+       seq_printf(m, "%s: %s\n", THIS_MODULE->name,
+                  "this has been live patched");
+       return 0;
+}
+
+static struct klp_func funcs[] = {
+       {
+               .old_name = "cmdline_proc_show",
+               .new_func = livepatch_cmdline_proc_show,
+       }, { }
+};
+
+static struct klp_object objs[] = {
+       {
+               /* name being NULL means vmlinux */
+               .funcs = funcs,
+       }, { }
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+};
+
+static int test_klp_livepatch_init(void)
+{
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_livepatch_exit(void)
+{
+}
+
+module_init(test_klp_livepatch_init);
+module_exit(test_klp_livepatch_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Seth Jennings <sjenning@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: livepatch module");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_shadow_vars.c b/tools/testing/selftests/livepatch/test_modules/test_klp_shadow_vars.c
new file mode 100644 (file)
index 0000000..b991164
--- /dev/null
@@ -0,0 +1,301 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2018 Joe Lawrence <joe.lawrence@redhat.com>
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/livepatch.h>
+#include <linux/slab.h>
+
+/*
+ * Keep a small list of pointers so that we can print address-agnostic
+ * pointer values.  Use a rolling integer count to differentiate the values.
+ * Ironically we could have used the shadow variable API to do this, but
+ * let's not lean too heavily on the very code we're testing.
+ */
+static LIST_HEAD(ptr_list);
+struct shadow_ptr {
+       void *ptr;
+       int id;
+       struct list_head list;
+};
+
+static void free_ptr_list(void)
+{
+       struct shadow_ptr *sp, *tmp_sp;
+
+       list_for_each_entry_safe(sp, tmp_sp, &ptr_list, list) {
+               list_del(&sp->list);
+               kfree(sp);
+       }
+}
+
+static int ptr_id(void *ptr)
+{
+       struct shadow_ptr *sp;
+       static int count;
+
+       list_for_each_entry(sp, &ptr_list, list) {
+               if (sp->ptr == ptr)
+                       return sp->id;
+       }
+
+       sp = kmalloc(sizeof(*sp), GFP_ATOMIC);
+       if (!sp)
+               return -ENOMEM;
+       sp->ptr = ptr;
+       sp->id = count++;
+
+       list_add(&sp->list, &ptr_list);
+
+       return sp->id;
+}
+
+/*
+ * Shadow variable wrapper functions that echo the function and arguments
+ * to the kernel log for testing verification.  Don't display raw pointers,
+ * but use the ptr_id() value instead.
+ */
+static void *shadow_get(void *obj, unsigned long id)
+{
+       int **sv;
+
+       sv = klp_shadow_get(obj, id);
+       pr_info("klp_%s(obj=PTR%d, id=0x%lx) = PTR%d\n",
+               __func__, ptr_id(obj), id, ptr_id(sv));
+
+       return sv;
+}
+
+static void *shadow_alloc(void *obj, unsigned long id, size_t size,
+                         gfp_t gfp_flags, klp_shadow_ctor_t ctor,
+                         void *ctor_data)
+{
+       int **var = ctor_data;
+       int **sv;
+
+       sv = klp_shadow_alloc(obj, id, size, gfp_flags, ctor, var);
+       pr_info("klp_%s(obj=PTR%d, id=0x%lx, size=%zx, gfp_flags=%pGg), ctor=PTR%d, ctor_data=PTR%d = PTR%d\n",
+               __func__, ptr_id(obj), id, size, &gfp_flags, ptr_id(ctor),
+               ptr_id(*var), ptr_id(sv));
+
+       return sv;
+}
+
+static void *shadow_get_or_alloc(void *obj, unsigned long id, size_t size,
+                                gfp_t gfp_flags, klp_shadow_ctor_t ctor,
+                                void *ctor_data)
+{
+       int **var = ctor_data;
+       int **sv;
+
+       sv = klp_shadow_get_or_alloc(obj, id, size, gfp_flags, ctor, var);
+       pr_info("klp_%s(obj=PTR%d, id=0x%lx, size=%zx, gfp_flags=%pGg), ctor=PTR%d, ctor_data=PTR%d = PTR%d\n",
+               __func__, ptr_id(obj), id, size, &gfp_flags, ptr_id(ctor),
+               ptr_id(*var), ptr_id(sv));
+
+       return sv;
+}
+
+static void shadow_free(void *obj, unsigned long id, klp_shadow_dtor_t dtor)
+{
+       klp_shadow_free(obj, id, dtor);
+       pr_info("klp_%s(obj=PTR%d, id=0x%lx, dtor=PTR%d)\n",
+               __func__, ptr_id(obj), id, ptr_id(dtor));
+}
+
+static void shadow_free_all(unsigned long id, klp_shadow_dtor_t dtor)
+{
+       klp_shadow_free_all(id, dtor);
+       pr_info("klp_%s(id=0x%lx, dtor=PTR%d)\n", __func__, id, ptr_id(dtor));
+}
+
+
+/* Shadow variable constructor - remember simple pointer data */
+static int shadow_ctor(void *obj, void *shadow_data, void *ctor_data)
+{
+       int **sv = shadow_data;
+       int **var = ctor_data;
+
+       if (!var)
+               return -EINVAL;
+
+       *sv = *var;
+       pr_info("%s: PTR%d -> PTR%d\n", __func__, ptr_id(sv), ptr_id(*var));
+
+       return 0;
+}
+
+/*
+ * With more than one item to free in the list, order is not determined and
+ * shadow_dtor will not be passed to shadow_free_all() which would make the
+ * test fail. (see pass 6)
+ */
+static void shadow_dtor(void *obj, void *shadow_data)
+{
+       int **sv = shadow_data;
+
+       pr_info("%s(obj=PTR%d, shadow_data=PTR%d)\n",
+               __func__, ptr_id(obj), ptr_id(sv));
+}
+
+/* number of objects we simulate that need shadow vars */
+#define NUM_OBJS 3
+
+/* dynamically created obj fields have the following shadow var id values */
+#define SV_ID1 0x1234
+#define SV_ID2 0x1235
+
+/*
+ * The main test case adds/removes new fields (shadow var) to each of these
+ * test structure instances. The last group of fields in the struct represent
+ * the idea that shadow variables may be added and removed to and from the
+ * struct during execution.
+ */
+struct test_object {
+        /* add anything here below and avoid to define an empty struct */
+       struct shadow_ptr sp;
+
+       /* these represent shadow vars added and removed with SV_ID{1,2} */
+       /* char nfield1; */
+       /* int  nfield2; */
+};
+
+static int test_klp_shadow_vars_init(void)
+{
+       struct test_object objs[NUM_OBJS];
+       char nfields1[NUM_OBJS], *pnfields1[NUM_OBJS], **sv1[NUM_OBJS];
+       char *pndup[NUM_OBJS];
+       int nfields2[NUM_OBJS], *pnfields2[NUM_OBJS], **sv2[NUM_OBJS];
+       void **sv;
+       int ret;
+       int i;
+
+       ptr_id(NULL);
+
+       /*
+        * With an empty shadow variable hash table, expect not to find
+        * any matches.
+        */
+       sv = shadow_get(&objs[0], SV_ID1);
+       if (!sv)
+               pr_info("  got expected NULL result\n");
+
+       /* pass 1: init & alloc a char+int pair of svars for each objs */
+       for (i = 0; i < NUM_OBJS; i++) {
+               pnfields1[i] = &nfields1[i];
+               ptr_id(pnfields1[i]);
+
+               if (i % 2) {
+                       sv1[i] = shadow_alloc(&objs[i], SV_ID1,
+                                       sizeof(pnfields1[i]), GFP_KERNEL,
+                                       shadow_ctor, &pnfields1[i]);
+               } else {
+                       sv1[i] = shadow_get_or_alloc(&objs[i], SV_ID1,
+                                       sizeof(pnfields1[i]), GFP_KERNEL,
+                                       shadow_ctor, &pnfields1[i]);
+               }
+               if (!sv1[i]) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
+
+               pnfields2[i] = &nfields2[i];
+               ptr_id(pnfields2[i]);
+               sv2[i] = shadow_alloc(&objs[i], SV_ID2, sizeof(pnfields2[i]),
+                                       GFP_KERNEL, shadow_ctor, &pnfields2[i]);
+               if (!sv2[i]) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
+       }
+
+       /* pass 2: verify we find allocated svars and where they point to */
+       for (i = 0; i < NUM_OBJS; i++) {
+               /* check the "char" svar for all objects */
+               sv = shadow_get(&objs[i], SV_ID1);
+               if (!sv) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
+                       pr_info("  got expected PTR%d -> PTR%d result\n",
+                               ptr_id(sv1[i]), ptr_id(*sv1[i]));
+
+               /* check the "int" svar for all objects */
+               sv = shadow_get(&objs[i], SV_ID2);
+               if (!sv) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
+                       pr_info("  got expected PTR%d -> PTR%d result\n",
+                               ptr_id(sv2[i]), ptr_id(*sv2[i]));
+       }
+
+       /* pass 3: verify that 'get_or_alloc' returns already allocated svars */
+       for (i = 0; i < NUM_OBJS; i++) {
+               pndup[i] = &nfields1[i];
+               ptr_id(pndup[i]);
+
+               sv = shadow_get_or_alloc(&objs[i], SV_ID1, sizeof(pndup[i]),
+                                       GFP_KERNEL, shadow_ctor, &pndup[i]);
+               if (!sv) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if ((char **)sv == sv1[i] && *sv1[i] == pnfields1[i])
+                       pr_info("  got expected PTR%d -> PTR%d result\n",
+                                       ptr_id(sv1[i]), ptr_id(*sv1[i]));
+       }
+
+       /* pass 4: free <objs[*], SV_ID1> pairs of svars, verify removal */
+       for (i = 0; i < NUM_OBJS; i++) {
+               shadow_free(&objs[i], SV_ID1, shadow_dtor); /* 'char' pairs */
+               sv = shadow_get(&objs[i], SV_ID1);
+               if (!sv)
+                       pr_info("  got expected NULL result\n");
+       }
+
+       /* pass 5: check we still find <objs[*], SV_ID2> svar pairs */
+       for (i = 0; i < NUM_OBJS; i++) {
+               sv = shadow_get(&objs[i], SV_ID2);      /* 'int' pairs */
+               if (!sv) {
+                       ret = -EINVAL;
+                       goto out;
+               }
+               if ((int **)sv == sv2[i] && *sv2[i] == pnfields2[i])
+                       pr_info("  got expected PTR%d -> PTR%d result\n",
+                                       ptr_id(sv2[i]), ptr_id(*sv2[i]));
+       }
+
+       /* pass 6: free all the <objs[*], SV_ID2> svar pairs too. */
+       shadow_free_all(SV_ID2, NULL);          /* 'int' pairs */
+       for (i = 0; i < NUM_OBJS; i++) {
+               sv = shadow_get(&objs[i], SV_ID2);
+               if (!sv)
+                       pr_info("  got expected NULL result\n");
+       }
+
+       free_ptr_list();
+
+       return 0;
+out:
+       shadow_free_all(SV_ID1, NULL);          /* 'char' pairs */
+       shadow_free_all(SV_ID2, NULL);          /* 'int' pairs */
+       free_ptr_list();
+
+       return ret;
+}
+
+static void test_klp_shadow_vars_exit(void)
+{
+}
+
+module_init(test_klp_shadow_vars_init);
+module_exit(test_klp_shadow_vars_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Joe Lawrence <joe.lawrence@redhat.com>");
+MODULE_DESCRIPTION("Livepatch test: shadow variables");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_state.c b/tools/testing/selftests/livepatch/test_modules/test_klp_state.c
new file mode 100644 (file)
index 0000000..57a4253
--- /dev/null
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 SUSE
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/printk.h>
+#include <linux/livepatch.h>
+
+#define CONSOLE_LOGLEVEL_STATE 1
+/* Version 1 does not support migration. */
+#define CONSOLE_LOGLEVEL_STATE_VERSION 1
+
+static const char *const module_state[] = {
+       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
+       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
+       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
+       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
+};
+
+static void callback_info(const char *callback, struct klp_object *obj)
+{
+       if (obj->mod)
+               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
+                       module_state[obj->mod->state]);
+       else
+               pr_info("%s: vmlinux\n", callback);
+}
+
+static struct klp_patch patch;
+
+static int allocate_loglevel_state(void)
+{
+       struct klp_state *loglevel_state;
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return -EINVAL;
+
+       loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
+       if (!loglevel_state->data)
+               return -ENOMEM;
+
+       pr_info("%s: allocating space to store console_loglevel\n",
+               __func__);
+       return 0;
+}
+
+static void fix_console_loglevel(void)
+{
+       struct klp_state *loglevel_state;
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       pr_info("%s: fixing console_loglevel\n", __func__);
+       *(int *)loglevel_state->data = console_loglevel;
+       console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
+}
+
+static void restore_console_loglevel(void)
+{
+       struct klp_state *loglevel_state;
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       pr_info("%s: restoring console_loglevel\n", __func__);
+       console_loglevel = *(int *)loglevel_state->data;
+}
+
+static void free_loglevel_state(void)
+{
+       struct klp_state *loglevel_state;
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       pr_info("%s: freeing space for the stored console_loglevel\n",
+               __func__);
+       kfree(loglevel_state->data);
+}
+
+/* Executed on object patching (ie, patch enablement) */
+static int pre_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       return allocate_loglevel_state();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       fix_console_loglevel();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void pre_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       restore_console_loglevel();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       free_loglevel_state();
+}
+
+static struct klp_func no_funcs[] = {
+       {}
+};
+
+static struct klp_object objs[] = {
+       {
+               .name = NULL,   /* vmlinux */
+               .funcs = no_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       }, { }
+};
+
+static struct klp_state states[] = {
+       {
+               .id = CONSOLE_LOGLEVEL_STATE,
+               .version = CONSOLE_LOGLEVEL_STATE_VERSION,
+       }, { }
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+       .states = states,
+       .replace = true,
+};
+
+static int test_klp_callbacks_demo_init(void)
+{
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_callbacks_demo_exit(void)
+{
+}
+
+module_init(test_klp_callbacks_demo_init);
+module_exit(test_klp_callbacks_demo_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Petr Mladek <pmladek@suse.com>");
+MODULE_DESCRIPTION("Livepatch test: system state modification");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_state2.c b/tools/testing/selftests/livepatch/test_modules/test_klp_state2.c
new file mode 100644 (file)
index 0000000..c978ea4
--- /dev/null
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 SUSE
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/printk.h>
+#include <linux/livepatch.h>
+
+#define CONSOLE_LOGLEVEL_STATE 1
+/* Version 2 supports migration. */
+#define CONSOLE_LOGLEVEL_STATE_VERSION 2
+
+static const char *const module_state[] = {
+       [MODULE_STATE_LIVE]     = "[MODULE_STATE_LIVE] Normal state",
+       [MODULE_STATE_COMING]   = "[MODULE_STATE_COMING] Full formed, running module_init",
+       [MODULE_STATE_GOING]    = "[MODULE_STATE_GOING] Going away",
+       [MODULE_STATE_UNFORMED] = "[MODULE_STATE_UNFORMED] Still setting it up",
+};
+
+static void callback_info(const char *callback, struct klp_object *obj)
+{
+       if (obj->mod)
+               pr_info("%s: %s -> %s\n", callback, obj->mod->name,
+                       module_state[obj->mod->state]);
+       else
+               pr_info("%s: vmlinux\n", callback);
+}
+
+static struct klp_patch patch;
+
+static int allocate_loglevel_state(void)
+{
+       struct klp_state *loglevel_state, *prev_loglevel_state;
+
+       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
+       if (prev_loglevel_state) {
+               pr_info("%s: space to store console_loglevel already allocated\n",
+               __func__);
+               return 0;
+       }
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return -EINVAL;
+
+       loglevel_state->data = kzalloc(sizeof(console_loglevel), GFP_KERNEL);
+       if (!loglevel_state->data)
+               return -ENOMEM;
+
+       pr_info("%s: allocating space to store console_loglevel\n",
+               __func__);
+       return 0;
+}
+
+static void fix_console_loglevel(void)
+{
+       struct klp_state *loglevel_state, *prev_loglevel_state;
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
+       if (prev_loglevel_state) {
+               pr_info("%s: taking over the console_loglevel change\n",
+               __func__);
+               loglevel_state->data = prev_loglevel_state->data;
+               return;
+       }
+
+       pr_info("%s: fixing console_loglevel\n", __func__);
+       *(int *)loglevel_state->data = console_loglevel;
+       console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
+}
+
+static void restore_console_loglevel(void)
+{
+       struct klp_state *loglevel_state, *prev_loglevel_state;
+
+       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
+       if (prev_loglevel_state) {
+               pr_info("%s: passing the console_loglevel change back to the old livepatch\n",
+               __func__);
+               return;
+       }
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       pr_info("%s: restoring console_loglevel\n", __func__);
+       console_loglevel = *(int *)loglevel_state->data;
+}
+
+static void free_loglevel_state(void)
+{
+       struct klp_state *loglevel_state, *prev_loglevel_state;
+
+       prev_loglevel_state = klp_get_prev_state(CONSOLE_LOGLEVEL_STATE);
+       if (prev_loglevel_state) {
+               pr_info("%s: keeping space to store console_loglevel\n",
+               __func__);
+               return;
+       }
+
+       loglevel_state = klp_get_state(&patch, CONSOLE_LOGLEVEL_STATE);
+       if (!loglevel_state)
+               return;
+
+       pr_info("%s: freeing space for the stored console_loglevel\n",
+               __func__);
+       kfree(loglevel_state->data);
+}
+
+/* Executed on object patching (ie, patch enablement) */
+static int pre_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       return allocate_loglevel_state();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_patch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       fix_console_loglevel();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void pre_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       restore_console_loglevel();
+}
+
+/* Executed on object unpatching (ie, patch disablement) */
+static void post_unpatch_callback(struct klp_object *obj)
+{
+       callback_info(__func__, obj);
+       free_loglevel_state();
+}
+
+static struct klp_func no_funcs[] = {
+       {}
+};
+
+static struct klp_object objs[] = {
+       {
+               .name = NULL,   /* vmlinux */
+               .funcs = no_funcs,
+               .callbacks = {
+                       .pre_patch = pre_patch_callback,
+                       .post_patch = post_patch_callback,
+                       .pre_unpatch = pre_unpatch_callback,
+                       .post_unpatch = post_unpatch_callback,
+               },
+       }, { }
+};
+
+static struct klp_state states[] = {
+       {
+               .id = CONSOLE_LOGLEVEL_STATE,
+               .version = CONSOLE_LOGLEVEL_STATE_VERSION,
+       }, { }
+};
+
+static struct klp_patch patch = {
+       .mod = THIS_MODULE,
+       .objs = objs,
+       .states = states,
+       .replace = true,
+};
+
+static int test_klp_callbacks_demo_init(void)
+{
+       return klp_enable_patch(&patch);
+}
+
+static void test_klp_callbacks_demo_exit(void)
+{
+}
+
+module_init(test_klp_callbacks_demo_init);
+module_exit(test_klp_callbacks_demo_exit);
+MODULE_LICENSE("GPL");
+MODULE_INFO(livepatch, "Y");
+MODULE_AUTHOR("Petr Mladek <pmladek@suse.com>");
+MODULE_DESCRIPTION("Livepatch test: system state modification");
diff --git a/tools/testing/selftests/livepatch/test_modules/test_klp_state3.c b/tools/testing/selftests/livepatch/test_modules/test_klp_state3.c
new file mode 100644 (file)
index 0000000..9226579
--- /dev/null
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (C) 2019 SUSE
+
+/* The console loglevel fix is the same in the next cumulative patch. */
+#include "test_klp_state2.c"