From 5dcc40b0645dc094264741f723225748bb2732b3 Mon Sep 17 00:00:00 2001 From: Ryan Sullivan Date: Thu, 16 May 2024 10:28:11 -0400 Subject: [PATCH] test/integration/rhel-9.5: add tests for kernel-5.14.0-503.11.1.el9_5 Signed-off-by: Ryan Sullivan --- .../integration/rhel-9.5/data-new-LOADED.test | 3 + test/integration/rhel-9.5/data-new.patch | 20 +++ .../rhel-9.5/gcc-static-local-var-6.patch | 22 +++ .../rhel-9.5/macro-callbacks.patch | 155 ++++++++++++++++++ test/integration/rhel-9.5/module-LOADED.test | 13 ++ test/integration/rhel-9.5/module.patch | 64 ++++++++ test/integration/rhel-9.5/multiple.test | 7 + test/integration/rhel-9.5/new-globals.patch | 34 ++++ .../rhel-9.5/shadow-newpid-LOADED.test | 3 + test/integration/rhel-9.5/shadow-newpid.patch | 75 +++++++++ .../integration/rhel-9.5/special-static.patch | 22 +++ test/integration/rhel-9.5/syscall-LOADED.test | 3 + test/integration/rhel-9.5/syscall.patch | 20 +++ .../rhel-9.5/warn-detect-FAIL.patch | 9 + 14 files changed, 450 insertions(+) create mode 100755 test/integration/rhel-9.5/data-new-LOADED.test create mode 100644 test/integration/rhel-9.5/data-new.patch create mode 100644 test/integration/rhel-9.5/gcc-static-local-var-6.patch create mode 100644 test/integration/rhel-9.5/macro-callbacks.patch create mode 100755 test/integration/rhel-9.5/module-LOADED.test create mode 100644 test/integration/rhel-9.5/module.patch create mode 100755 test/integration/rhel-9.5/multiple.test create mode 100644 test/integration/rhel-9.5/new-globals.patch create mode 100755 test/integration/rhel-9.5/shadow-newpid-LOADED.test create mode 100644 test/integration/rhel-9.5/shadow-newpid.patch create mode 100644 test/integration/rhel-9.5/special-static.patch create mode 100755 test/integration/rhel-9.5/syscall-LOADED.test create mode 100644 test/integration/rhel-9.5/syscall.patch create mode 100644 test/integration/rhel-9.5/warn-detect-FAIL.patch diff --git a/test/integration/rhel-9.5/data-new-LOADED.test b/test/integration/rhel-9.5/data-new-LOADED.test new file mode 100755 index 000000000..9f25744e6 --- /dev/null +++ b/test/integration/rhel-9.5/data-new-LOADED.test @@ -0,0 +1,3 @@ +#!/bin/bash + +grep "kpatch: 5" /proc/meminfo diff --git a/test/integration/rhel-9.5/data-new.patch b/test/integration/rhel-9.5/data-new.patch new file mode 100644 index 000000000..1c0f62058 --- /dev/null +++ b/test/integration/rhel-9.5/data-new.patch @@ -0,0 +1,20 @@ +diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c +--- src.orig/fs/proc/meminfo.c 2024-10-30 13:11:05.778615433 -0400 ++++ src/fs/proc/meminfo.c 2024-10-30 13:11:06.647613918 -0400 +@@ -31,6 +31,8 @@ static void show_val_kb(struct seq_file + seq_write(m, " kB\n", 4); + } + ++static int foo = 5; ++ + static int meminfo_proc_show(struct seq_file *m, void *v) + { + struct sysinfo i; +@@ -168,6 +170,7 @@ static int meminfo_proc_show(struct seq_ + show_val_kb(m, "CmaFree: ", + global_zone_page_state(NR_FREE_CMA_PAGES)); + #endif ++ seq_printf(m, "kpatch: %d\n", foo); + + #ifdef CONFIG_UNACCEPTED_MEMORY + show_val_kb(m, "Unaccepted: ", diff --git a/test/integration/rhel-9.5/gcc-static-local-var-6.patch b/test/integration/rhel-9.5/gcc-static-local-var-6.patch new file mode 100644 index 000000000..1a509ee76 --- /dev/null +++ b/test/integration/rhel-9.5/gcc-static-local-var-6.patch @@ -0,0 +1,22 @@ +diff -Nupr src.orig/net/ipv6/netfilter.c src/net/ipv6/netfilter.c +--- src.orig/net/ipv6/netfilter.c 2024-10-30 13:11:06.032614990 -0400 ++++ src/net/ipv6/netfilter.c 2024-10-30 13:11:15.536598418 -0400 +@@ -97,6 +97,8 @@ static int nf_ip6_reroute(struct sk_buff + return 0; + } + ++#include "kpatch-macros.h" ++ + int __nf_ip6_route(struct net *net, struct dst_entry **dst, + struct flowi *fl, bool strict) + { +@@ -110,6 +112,9 @@ int __nf_ip6_route(struct net *net, stru + struct dst_entry *result; + int err; + ++ if (!jiffies) ++ printk("kpatch nf_ip6_route foo\n"); ++ + result = ip6_route_output(net, sk, &fl->u.ip6); + err = result->error; + if (err) diff --git a/test/integration/rhel-9.5/macro-callbacks.patch b/test/integration/rhel-9.5/macro-callbacks.patch new file mode 100644 index 000000000..c68623c4b --- /dev/null +++ b/test/integration/rhel-9.5/macro-callbacks.patch @@ -0,0 +1,155 @@ +diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c +--- src.orig/drivers/input/joydev.c 2024-10-30 13:11:05.315616240 -0400 ++++ src/drivers/input/joydev.c 2024-10-30 13:11:17.882594327 -0400 +@@ -1096,3 +1096,47 @@ static void __exit joydev_exit(void) + + module_init(joydev_init); + module_exit(joydev_exit); ++ ++#include ++#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 2024-10-30 13:11:05.319616233 -0400 ++++ src/drivers/input/misc/pcspkr.c 2024-10-30 13:11:17.882594327 -0400 +@@ -134,3 +134,46 @@ static struct platform_driver pcspkr_pla + }; + module_platform_driver(pcspkr_platform_driver); + ++#include ++#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 2024-10-30 13:11:05.749615483 -0400 ++++ src/fs/aio.c 2024-10-30 13:11:17.882594327 -0400 +@@ -50,6 +50,50 @@ + + #define KIOCB_KEY 0 + ++#include ++#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 diff --git a/test/integration/rhel-9.5/module-LOADED.test b/test/integration/rhel-9.5/module-LOADED.test new file mode 100755 index 000000000..72bb85266 --- /dev/null +++ b/test/integration/rhel-9.5/module-LOADED.test @@ -0,0 +1,13 @@ +#!/bin/bash + +set -o errexit + +sudo modprobe nfsd +sleep 5 +grep -q kpatch /proc/fs/nfs/exports + +# TODO: This will trigger a printk on newer kernels which have the .klp.arch +# removal. Don't actually do the grep until running on a newer kernel. +echo "file fs/nfsd/export.c +p" > /sys/kernel/debug/dynamic_debug/control +cat /proc/fs/nfs/exports > /dev/null +# dmesg | grep -q "kpatch: pr_debug" diff --git a/test/integration/rhel-9.5/module.patch b/test/integration/rhel-9.5/module.patch new file mode 100644 index 000000000..837937250 --- /dev/null +++ b/test/integration/rhel-9.5/module.patch @@ -0,0 +1,64 @@ +diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c +--- src.orig/fs/nfsd/export.c 2024-10-30 13:11:05.769615449 -0400 ++++ src/fs/nfsd/export.c 2024-10-30 13:11:20.262590177 -0400 +@@ -1356,6 +1356,10 @@ static void exp_flags(struct seq_file *m + } + } + ++#include ++extern char *kpatch_string(void); ++ ++__attribute__((optimize("-fno-optimize-sibling-calls"))) + static int e_show(struct seq_file *m, void *p) + { + struct cache_head *cp = p; +@@ -1363,12 +1367,36 @@ static int e_show(struct seq_file *m, vo + struct cache_detail *cd = m->private; + bool export_stats = is_export_stats_file(m); + ++#ifdef CONFIG_X86_64 ++ alternative("ud2", "call single_task_running", X86_FEATURE_ALWAYS); ++ alternative("call single_task_running", "ud2", X86_FEATURE_IA64); ++ ++ slow_down_io(); /* paravirt call */ ++#endif ++ ++ pr_debug("kpatch: pr_debug() test\n"); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) ++{ ++ static DEFINE_STATIC_KEY_TRUE(kpatch_key); ++ ++ if (static_branch_unlikely(&memcg_kmem_online_key)) ++ printk("kpatch: memcg_kmem_online_key\n"); ++ ++ BUG_ON(!static_branch_likely(&kpatch_key)); ++ static_branch_disable(&kpatch_key); ++ BUG_ON(static_branch_likely(&kpatch_key)); ++ static_branch_enable(&kpatch_key); ++} ++#endif ++ + if (p == SEQ_START_TOKEN) { + seq_puts(m, "# Version 1.1\n"); + if (export_stats) + seq_puts(m, "# Path Client Start-time\n#\tStats\n"); + else + seq_puts(m, "# Path Client(Flags) # IPs\n"); ++ seq_puts(m, kpatch_string()); + return 0; + } + +diff -Nupr src.orig/net/netlink/af_netlink.c src/net/netlink/af_netlink.c +--- src.orig/net/netlink/af_netlink.c 2024-10-30 13:11:06.044614969 -0400 ++++ src/net/netlink/af_netlink.c 2024-10-30 13:11:20.263590176 -0400 +@@ -2936,4 +2936,9 @@ panic: + panic("netlink_init: Cannot allocate nl_table\n"); + } + ++char *kpatch_string(void) ++{ ++ return "# kpatch\n"; ++} ++ + core_initcall(netlink_proto_init); diff --git a/test/integration/rhel-9.5/multiple.test b/test/integration/rhel-9.5/multiple.test new file mode 100755 index 000000000..7e4b3525c --- /dev/null +++ b/test/integration/rhel-9.5/multiple.test @@ -0,0 +1,7 @@ +#!/bin/bash + +SCRIPTDIR="$(readlink -f $(dirname $(type -p $0)))" + +declare -a blacklist=(meminfo-string-LOADED.test) + +source ${SCRIPTDIR}/../common/multiple.template diff --git a/test/integration/rhel-9.5/new-globals.patch b/test/integration/rhel-9.5/new-globals.patch new file mode 100644 index 000000000..26f60bb1e --- /dev/null +++ b/test/integration/rhel-9.5/new-globals.patch @@ -0,0 +1,34 @@ +diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c +--- src.orig/fs/proc/cmdline.c 2024-10-30 13:11:05.778615433 -0400 ++++ src/fs/proc/cmdline.c 2024-10-30 13:11:22.659585998 -0400 +@@ -17,3 +17,10 @@ static int __init proc_cmdline_init(void + return 0; + } + fs_initcall(proc_cmdline_init); ++ ++#include ++void kpatch_print_message(void) ++{ ++ if (!jiffies) ++ printk("hello there!\n"); ++} +diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c +--- src.orig/fs/proc/meminfo.c 2024-10-30 13:11:05.778615433 -0400 ++++ src/fs/proc/meminfo.c 2024-10-30 13:11:22.659585998 -0400 +@@ -21,6 +21,8 @@ + #include + #include "internal.h" + ++void kpatch_print_message(void); ++ + void __attribute__((weak)) arch_report_meminfo(struct seq_file *m) + { + } +@@ -57,6 +59,7 @@ static int meminfo_proc_show(struct seq_ + sreclaimable = global_node_page_state_pages(NR_SLAB_RECLAIMABLE_B); + sunreclaim = global_node_page_state_pages(NR_SLAB_UNRECLAIMABLE_B); + ++ kpatch_print_message(); + show_val_kb(m, "MemTotal: ", i.totalram); + show_val_kb(m, "MemFree: ", i.freeram); + show_val_kb(m, "MemAvailable: ", available); diff --git a/test/integration/rhel-9.5/shadow-newpid-LOADED.test b/test/integration/rhel-9.5/shadow-newpid-LOADED.test new file mode 100755 index 000000000..c07d11205 --- /dev/null +++ b/test/integration/rhel-9.5/shadow-newpid-LOADED.test @@ -0,0 +1,3 @@ +#!/bin/bash + +grep -q newpid: /proc/$$/status diff --git a/test/integration/rhel-9.5/shadow-newpid.patch b/test/integration/rhel-9.5/shadow-newpid.patch new file mode 100644 index 000000000..80a701a4d --- /dev/null +++ b/test/integration/rhel-9.5/shadow-newpid.patch @@ -0,0 +1,75 @@ +diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c +--- src.orig/fs/proc/array.c 2024-10-30 13:11:05.778615433 -0400 ++++ src/fs/proc/array.c 2024-10-30 13:11:25.054581822 -0400 +@@ -403,12 +403,19 @@ static inline void task_seccomp(struct s + seq_putc(m, '\n'); + } + ++#include + static inline void task_context_switch_counts(struct seq_file *m, + struct task_struct *p) + { ++ int *newpid; ++ + seq_put_decimal_ull(m, "voluntary_ctxt_switches:\t", p->nvcsw); + seq_put_decimal_ull(m, "\nnonvoluntary_ctxt_switches:\t", p->nivcsw); + seq_putc(m, '\n'); ++ ++ newpid = klp_shadow_get(p, 0); ++ if (newpid) ++ seq_printf(m, "newpid:\t%d\n", *newpid); + } + + static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) +diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c +--- src.orig/kernel/exit.c 2024-10-30 13:11:05.990615064 -0400 ++++ src/kernel/exit.c 2024-10-30 13:11:25.055581820 -0400 +@@ -767,6 +767,7 @@ static void check_stack_usage(void) + static inline void check_stack_usage(void) {} + #endif + ++#include + void __noreturn do_exit(long code) + { + struct task_struct *tsk = current; +@@ -830,6 +831,8 @@ void __noreturn do_exit(long code) + exit_task_work(tsk); + exit_thread(tsk); + ++ klp_shadow_free(tsk, 0, NULL); ++ + /* + * Flush inherited counters to the parent - before the parent + * gets woken up by child-exit notifications. +diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c +--- src.orig/kernel/fork.c 2024-10-30 13:11:05.990615064 -0400 ++++ src/kernel/fork.c 2024-10-30 13:11:25.055581820 -0400 +@@ -2721,6 +2721,7 @@ struct task_struct *create_io_thread(int + * + * args->exit_signal is expected to be checked for sanity by the caller. + */ ++#include + pid_t kernel_clone(struct kernel_clone_args *args) + { + u64 clone_flags = args->flags; +@@ -2729,6 +2730,8 @@ pid_t kernel_clone(struct kernel_clone_a + struct task_struct *p; + int trace = 0; + pid_t nr; ++ int *newpid; ++ static int ctr = 0; + + /* + * For legacy clone() calls, CLONE_PIDFD uses the parent_tid argument +@@ -2768,6 +2771,11 @@ pid_t kernel_clone(struct kernel_clone_a + if (IS_ERR(p)) + return PTR_ERR(p); + ++ newpid = klp_shadow_get_or_alloc(p, 0, sizeof(*newpid), GFP_KERNEL, ++ NULL, NULL); ++ if (newpid) ++ *newpid = ctr++; ++ + /* + * Do this prior waking up the new thread - the thread pointer + * might get invalid after that point, if the thread exits quickly. diff --git a/test/integration/rhel-9.5/special-static.patch b/test/integration/rhel-9.5/special-static.patch new file mode 100644 index 000000000..13f20a381 --- /dev/null +++ b/test/integration/rhel-9.5/special-static.patch @@ -0,0 +1,22 @@ +diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c +--- src.orig/kernel/fork.c 2024-10-30 13:11:05.990615064 -0400 ++++ src/kernel/fork.c 2024-10-30 13:11:27.473577604 -0400 +@@ -1790,10 +1790,18 @@ static void posix_cpu_timers_init_group( + posix_cputimers_group_init(pct, cpu_limit); + } + ++void kpatch_foo(void) ++{ ++ if (!jiffies) ++ printk("kpatch copy signal\n"); ++} ++ + static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) + { + struct signal_struct *sig; + ++ kpatch_foo(); ++ + if (clone_flags & CLONE_THREAD) + return 0; + diff --git a/test/integration/rhel-9.5/syscall-LOADED.test b/test/integration/rhel-9.5/syscall-LOADED.test new file mode 100755 index 000000000..3a2fd88e0 --- /dev/null +++ b/test/integration/rhel-9.5/syscall-LOADED.test @@ -0,0 +1,3 @@ +#!/bin/bash + +uname -s | grep -q kpatch diff --git a/test/integration/rhel-9.5/syscall.patch b/test/integration/rhel-9.5/syscall.patch new file mode 100644 index 000000000..5cf953d19 --- /dev/null +++ b/test/integration/rhel-9.5/syscall.patch @@ -0,0 +1,20 @@ +diff -Nupr src.orig/kernel/sys.c src/kernel/sys.c +--- src.orig/kernel/sys.c 2024-10-30 13:11:05.995615055 -0400 ++++ src/kernel/sys.c 2024-10-30 13:11:29.968573254 -0400 +@@ -1285,13 +1285,15 @@ static int override_release(char __user + return ret; + } + +-SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name) ++#include "kpatch-syscall.h" ++KPATCH_SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name) + { + struct new_utsname tmp; + + down_read(&uts_sem); + memcpy(&tmp, utsname(), sizeof(tmp)); + up_read(&uts_sem); ++ strcat(tmp.sysname, ".kpatch"); + if (copy_to_user(name, &tmp, sizeof(tmp))) + return -EFAULT; + diff --git a/test/integration/rhel-9.5/warn-detect-FAIL.patch b/test/integration/rhel-9.5/warn-detect-FAIL.patch new file mode 100644 index 000000000..72b6e5208 --- /dev/null +++ b/test/integration/rhel-9.5/warn-detect-FAIL.patch @@ -0,0 +1,9 @@ +diff -Nupr src.orig/arch/x86/kvm/x86.c src/arch/x86/kvm/x86.c +--- src.orig/arch/x86/kvm/x86.c 2024-10-30 13:11:04.987616812 -0400 ++++ src/arch/x86/kvm/x86.c 2024-10-30 13:11:32.482568870 -0400 +@@ -1,4 +1,5 @@ + // SPDX-License-Identifier: GPL-2.0-only ++ + /* + * Kernel-based Virtual Machine driver for Linux + *