mirror of
https://github.com/dynup/kpatch
synced 2025-04-18 04:55:21 +00:00
30f09bfaa2
Add patches rebased on top of upstream 5.18.0. Integration tests for these can be ran as this: $ make PATCH_DIR="linux-5.18.0" KPATCH_BUILD_OPTS="--non-replace --sourcedir /path/to/src/linux-5.18.0" integration-slow Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
156 lines
4.5 KiB
Diff
156 lines
4.5 KiB
Diff
diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
|
|
--- src.orig/drivers/input/joydev.c 2022-06-15 10:04:09.640911448 -0400
|
|
+++ src/drivers/input/joydev.c 2022-06-15 10:04:37.199043370 -0400
|
|
@@ -1096,3 +1096,47 @@ static void __exit joydev_exit(void)
|
|
|
|
module_init(joydev_init);
|
|
module_exit(joydev_exit);
|
|
+
|
|
+#include <linux/module.h>
|
|
+#include "kpatch-macros.h"
|
|
+
|
|
+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, patch_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 int pre_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+ return 0; /* return -ENODEV; */
|
|
+}
|
|
+KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
|
|
+
|
|
+static void post_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
|
|
+
|
|
+static void pre_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
|
|
+
|
|
+static void post_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
|
|
diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
|
|
--- src.orig/drivers/input/misc/pcspkr.c 2022-06-15 10:04:09.649911492 -0400
|
|
+++ src/drivers/input/misc/pcspkr.c 2022-06-15 10:04:37.200043375 -0400
|
|
@@ -134,3 +134,46 @@ static struct platform_driver pcspkr_pla
|
|
};
|
|
module_platform_driver(pcspkr_platform_driver);
|
|
|
|
+#include <linux/module.h>
|
|
+#include "kpatch-macros.h"
|
|
+
|
|
+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, patch_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 int pre_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+ return 0;
|
|
+}
|
|
+KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
|
|
+
|
|
+static void post_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
|
|
+
|
|
+static void pre_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
|
|
+
|
|
+static void post_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
|
|
diff -Nupr src.orig/fs/aio.c src/fs/aio.c
|
|
--- src.orig/fs/aio.c 2022-06-15 10:04:10.537915743 -0400
|
|
+++ src/fs/aio.c 2022-06-15 10:04:37.201043380 -0400
|
|
@@ -50,6 +50,50 @@
|
|
|
|
#define KIOCB_KEY 0
|
|
|
|
+#include <linux/module.h>
|
|
+#include "kpatch-macros.h"
|
|
+
|
|
+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, patch_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 int pre_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+ return 0;
|
|
+}
|
|
+KPATCH_PRE_PATCH_CALLBACK(pre_patch_callback);
|
|
+
|
|
+static void post_patch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_PATCH_CALLBACK(post_patch_callback);
|
|
+
|
|
+static void pre_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_PRE_UNPATCH_CALLBACK(pre_unpatch_callback);
|
|
+
|
|
+static void post_unpatch_callback(patch_object *obj)
|
|
+{
|
|
+ callback_info(__func__, obj);
|
|
+}
|
|
+KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
|
|
+
|
|
#define AIO_RING_MAGIC 0xa10a10a1
|
|
#define AIO_RING_COMPAT_FEATURES 1
|
|
#define AIO_RING_INCOMPAT_FEATURES 0
|