Skip to content

Commit 16c8726

Browse files
committed
test/integration/rhel-9.7: add tests for kernel-5.14.0-595.el9
Signed-off-by: Ryan Sullivan <rysulliv@redhat.com>
1 parent f7d4662 commit 16c8726

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

test/integration/rhel-9.7/data-new.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
2-
--- src.orig/fs/proc/meminfo.c 2025-05-19 11:11:45.435442401 -0400
3-
+++ src/fs/proc/meminfo.c 2025-05-19 11:11:46.953440911 -0400
2+
--- src.orig/fs/proc/meminfo.c 2025-07-01 13:11:10.561930982 -0400
3+
+++ src/fs/proc/meminfo.c 2025-07-01 13:11:11.425927733 -0400
44
@@ -31,6 +31,8 @@ static void show_val_kb(struct seq_file
55
seq_write(m, " kB\n", 4);
66
}

test/integration/rhel-9.7/gcc-static-local-var-6.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/net/ipv6/netfilter.c src/net/ipv6/netfilter.c
2-
--- src.orig/net/ipv6/netfilter.c 2025-05-19 11:11:45.937441908 -0400
3-
+++ src/net/ipv6/netfilter.c 2025-05-19 11:11:59.545428551 -0400
2+
--- src.orig/net/ipv6/netfilter.c 2025-07-01 13:11:10.853929884 -0400
3+
+++ src/net/ipv6/netfilter.c 2025-07-01 13:11:19.888895909 -0400
44
@@ -97,6 +97,8 @@ static int nf_ip6_reroute(struct sk_buff
55
return 0;
66
}

test/integration/rhel-9.7/macro-callbacks.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
2-
--- src.orig/drivers/input/joydev.c 2025-05-19 11:11:44.463443355 -0400
3-
+++ src/drivers/input/joydev.c 2025-05-19 11:12:03.609424562 -0400
2+
--- src.orig/drivers/input/joydev.c 2025-07-01 13:11:10.024933001 -0400
3+
+++ src/drivers/input/joydev.c 2025-07-01 13:11:22.386886517 -0400
44
@@ -1096,3 +1096,47 @@ static void __exit joydev_exit(void)
55

66
module_init(joydev_init);
@@ -50,8 +50,8 @@ diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c
5050
+}
5151
+KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
5252
diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
53-
--- src.orig/drivers/input/misc/pcspkr.c 2025-05-19 11:11:44.469443349 -0400
54-
+++ src/drivers/input/misc/pcspkr.c 2025-05-19 11:12:03.610424561 -0400
53+
--- src.orig/drivers/input/misc/pcspkr.c 2025-07-01 13:11:10.028932986 -0400
54+
+++ src/drivers/input/misc/pcspkr.c 2025-07-01 13:11:22.386886517 -0400
5555
@@ -134,3 +134,46 @@ static struct platform_driver pcspkr_pla
5656
};
5757
module_platform_driver(pcspkr_platform_driver);
@@ -100,8 +100,8 @@ diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c
100100
+}
101101
+KPATCH_POST_UNPATCH_CALLBACK(post_unpatch_callback);
102102
diff -Nupr src.orig/fs/aio.c src/fs/aio.c
103-
--- src.orig/fs/aio.c 2025-05-19 11:11:45.374442461 -0400
104-
+++ src/fs/aio.c 2025-05-19 11:12:03.610424561 -0400
103+
--- src.orig/fs/aio.c 2025-07-01 13:11:10.528931106 -0400
104+
+++ src/fs/aio.c 2025-07-01 13:11:22.387886513 -0400
105105
@@ -50,6 +50,50 @@
106106

107107
#define KIOCB_KEY 0

test/integration/rhel-9.7/module.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
2-
--- src.orig/fs/nfsd/export.c 2025-05-19 11:11:45.413442422 -0400
3-
+++ src/fs/nfsd/export.c 2025-05-19 11:12:07.929420322 -0400
2+
--- src.orig/fs/nfsd/export.c 2025-07-01 13:11:10.551931019 -0400
3+
+++ src/fs/nfsd/export.c 2025-07-01 13:11:24.924876973 -0400
44
@@ -1365,6 +1365,10 @@ static void exp_flags(struct seq_file *m
55
}
66
}
@@ -50,8 +50,8 @@ diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c
5050
}
5151

5252
diff -Nupr src.orig/net/netlink/af_netlink.c src/net/netlink/af_netlink.c
53-
--- src.orig/net/netlink/af_netlink.c 2025-05-19 11:11:45.963441883 -0400
54-
+++ src/net/netlink/af_netlink.c 2025-05-19 11:12:07.930420321 -0400
53+
--- src.orig/net/netlink/af_netlink.c 2025-07-01 13:11:10.866929835 -0400
54+
+++ src/net/netlink/af_netlink.c 2025-07-01 13:11:24.925876969 -0400
5555
@@ -2943,4 +2943,9 @@ panic:
5656
panic("netlink_init: Cannot allocate nl_table\n");
5757
}

test/integration/rhel-9.7/new-globals.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
2-
--- src.orig/fs/proc/cmdline.c 2025-05-19 11:11:45.434442402 -0400
3-
+++ src/fs/proc/cmdline.c 2025-05-19 11:12:12.126416203 -0400
2+
--- src.orig/fs/proc/cmdline.c 2025-07-01 13:11:10.560930986 -0400
3+
+++ src/fs/proc/cmdline.c 2025-07-01 13:11:27.541867132 -0400
44
@@ -17,3 +17,10 @@ static int __init proc_cmdline_init(void
55
return 0;
66
}
@@ -13,8 +13,8 @@ diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
1313
+ printk("hello there!\n");
1414
+}
1515
diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
16-
--- src.orig/fs/proc/meminfo.c 2025-05-19 11:11:45.435442401 -0400
17-
+++ src/fs/proc/meminfo.c 2025-05-19 11:12:12.126416203 -0400
16+
--- src.orig/fs/proc/meminfo.c 2025-07-01 13:11:10.561930982 -0400
17+
+++ src/fs/proc/meminfo.c 2025-07-01 13:11:27.541867132 -0400
1818
@@ -21,6 +21,8 @@
1919
#include <asm/page.h>
2020
#include "internal.h"

test/integration/rhel-9.7/shadow-newpid.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
2-
--- src.orig/fs/proc/array.c 2025-05-19 11:11:45.434442402 -0400
3-
+++ src/fs/proc/array.c 2025-05-19 11:12:16.200412204 -0400
2+
--- src.orig/fs/proc/array.c 2025-07-01 13:11:10.560930986 -0400
3+
+++ src/fs/proc/array.c 2025-07-01 13:11:30.138857367 -0400
44
@@ -403,12 +403,19 @@ static inline void task_seccomp(struct s
55
seq_putc(m, '\n');
66
}
@@ -22,8 +22,8 @@ diff -Nupr src.orig/fs/proc/array.c src/fs/proc/array.c
2222

2323
static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
2424
diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c
25-
--- src.orig/kernel/exit.c 2025-05-19 11:11:45.860441984 -0400
26-
+++ src/kernel/exit.c 2025-05-19 11:12:16.200412204 -0400
25+
--- src.orig/kernel/exit.c 2025-07-01 13:11:10.803930072 -0400
26+
+++ src/kernel/exit.c 2025-07-01 13:11:30.138857367 -0400
2727
@@ -767,6 +767,7 @@ static void check_stack_usage(void)
2828
static inline void check_stack_usage(void) {}
2929
#endif
@@ -42,17 +42,17 @@ diff -Nupr src.orig/kernel/exit.c src/kernel/exit.c
4242
* Flush inherited counters to the parent - before the parent
4343
* gets woken up by child-exit notifications.
4444
diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
45-
--- src.orig/kernel/fork.c 2025-05-19 11:11:45.860441984 -0400
46-
+++ src/kernel/fork.c 2025-05-19 11:12:16.201412203 -0400
47-
@@ -2809,6 +2809,7 @@ struct task_struct *create_io_thread(int
45+
--- src.orig/kernel/fork.c 2025-07-01 13:11:10.803930072 -0400
46+
+++ src/kernel/fork.c 2025-07-01 13:11:30.139857363 -0400
47+
@@ -2808,6 +2808,7 @@ struct task_struct *create_io_thread(int
4848
*
4949
* args->exit_signal is expected to be checked for sanity by the caller.
5050
*/
5151
+#include <linux/livepatch.h>
5252
pid_t kernel_clone(struct kernel_clone_args *args)
5353
{
5454
u64 clone_flags = args->flags;
55-
@@ -2817,6 +2818,8 @@ pid_t kernel_clone(struct kernel_clone_a
55+
@@ -2816,6 +2817,8 @@ pid_t kernel_clone(struct kernel_clone_a
5656
struct task_struct *p;
5757
int trace = 0;
5858
pid_t nr;
@@ -61,7 +61,7 @@ diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
6161

6262
/*
6363
* For legacy clone() calls, CLONE_PIDFD uses the parent_tid argument
64-
@@ -2856,6 +2859,11 @@ pid_t kernel_clone(struct kernel_clone_a
64+
@@ -2855,6 +2858,11 @@ pid_t kernel_clone(struct kernel_clone_a
6565
if (IS_ERR(p))
6666
return PTR_ERR(p);
6767

test/integration/rhel-9.7/special-static.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/kernel/fork.c src/kernel/fork.c
2-
--- src.orig/kernel/fork.c 2025-05-19 11:11:45.860441984 -0400
3-
+++ src/kernel/fork.c 2025-05-19 11:12:20.422408060 -0400
2+
--- src.orig/kernel/fork.c 2025-07-01 13:11:10.803930072 -0400
3+
+++ src/kernel/fork.c 2025-07-01 13:11:32.727847632 -0400
44
@@ -1877,10 +1877,18 @@ static void posix_cpu_timers_init_group(
55
posix_cputimers_group_init(pct, cpu_limit);
66
}

test/integration/rhel-9.7/syscall.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/kernel/sys.c src/kernel/sys.c
2-
--- src.orig/kernel/sys.c 2025-05-19 11:11:45.870441974 -0400
3-
+++ src/kernel/sys.c 2025-05-19 11:12:24.941403625 -0400
2+
--- src.orig/kernel/sys.c 2025-07-01 13:11:10.810930046 -0400
3+
+++ src/kernel/sys.c 2025-07-01 13:11:35.325837862 -0400
44
@@ -1291,13 +1291,15 @@ static int override_release(char __user
55
return ret;
66
}

test/integration/rhel-9.7/warn-detect-FAIL.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -Nupr src.orig/arch/x86/kvm/x86.c src/arch/x86/kvm/x86.c
2-
--- src.orig/arch/x86/kvm/x86.c 2025-05-19 11:11:43.840443967 -0400
3-
+++ src/arch/x86/kvm/x86.c 2025-05-19 11:12:29.359399288 -0400
2+
--- src.orig/arch/x86/kvm/x86.c 2025-07-01 13:11:09.646934423 -0400
3+
+++ src/arch/x86/kvm/x86.c 2025-07-01 13:11:37.943828018 -0400
44
@@ -1,4 +1,5 @@
55
// SPDX-License-Identifier: GPL-2.0-only
66
+

0 commit comments

Comments
 (0)