Skip to content

Commit 8cc7ebf

Browse files
authored
Merge pull request #1137 from joe-lawrence/integration-tests-rhel-7.9
test/integration: add rhel-7.9
2 parents e0f0f98 + eccf6bf commit 8cc7ebf

34 files changed

Lines changed: 893 additions & 0 deletions
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
2+
--- src.orig/fs/proc/proc_sysctl.c 2020-09-03 11:48:30.497726123 -0400
3+
+++ src/fs/proc/proc_sysctl.c 2020-09-03 11:48:31.009727724 -0400
4+
@@ -331,6 +331,8 @@ static void start_unregistering(struct c
5+
6+
static struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *head)
7+
{
8+
+ if (jiffies == 0)
9+
+ printk("kpatch-test: testing __bug_table section changes\n");
10+
BUG_ON(!head);
11+
spin_lock(&sysctl_lock);
12+
if (!use_table(head))
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
grep kpatch=1 /proc/cmdline
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
2+
--- src.orig/fs/proc/cmdline.c 2020-09-03 11:48:30.496726119 -0400
3+
+++ src/fs/proc/cmdline.c 2020-09-03 11:48:33.073734181 -0400
4+
@@ -5,7 +5,7 @@
5+
6+
static int cmdline_proc_show(struct seq_file *m, void *v)
7+
{
8+
- seq_printf(m, "%s\n", saved_command_line);
9+
+ seq_printf(m, "%s kpatch=1\n", saved_command_line);
10+
return 0;
11+
}
12+
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
grep "kpatch: 5" /proc/meminfo
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
diff -Nupr src.orig/fs/proc/meminfo.c src/fs/proc/meminfo.c
2+
--- src.orig/fs/proc/meminfo.c 2020-09-03 11:48:30.497726123 -0400
3+
+++ src/fs/proc/meminfo.c 2020-09-03 11:48:35.069740426 -0400
4+
@@ -21,6 +21,8 @@ void __attribute__((weak)) arch_report_m
5+
{
6+
}
7+
8+
+static int foo = 5;
9+
+
10+
static int meminfo_proc_show(struct seq_file *m, void *v)
11+
{
12+
struct sysinfo i;
13+
@@ -112,6 +114,7 @@ static int meminfo_proc_show(struct seq_
14+
"CmaTotal: %8lu kB\n"
15+
"CmaFree: %8lu kB\n"
16+
#endif
17+
+ "kpatch: %d"
18+
,
19+
K(i.totalram),
20+
K(i.freeram),
21+
@@ -178,6 +181,7 @@ static int meminfo_proc_show(struct seq_
22+
, K(totalcma_pages)
23+
, K(global_page_state(NR_FREE_CMA_PAGES))
24+
#endif
25+
+ ,foo
26+
);
27+
28+
hugetlb_report_meminfo(m);
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -Nupr src.orig/net/core/dev.c src/net/core/dev.c
2+
--- src.orig/net/core/dev.c 2020-09-03 11:48:30.763726955 -0400
3+
+++ src/net/core/dev.c 2020-09-03 11:49:21.514885728 -0400
4+
@@ -4327,6 +4327,7 @@ skip_classify:
5+
case RX_HANDLER_PASS:
6+
break;
7+
default:
8+
+ printk("BUG!\n");
9+
BUG();
10+
}
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
2+
--- src.orig/fs/readdir.c 2020-09-03 11:48:30.499726129 -0400
3+
+++ src/fs/readdir.c 2020-09-03 11:48:37.119746839 -0400
4+
@@ -176,6 +176,7 @@ static int filldir(void * __buf, const c
5+
goto efault;
6+
}
7+
dirent = buf->current_dir;
8+
+ asm("nop");
9+
if (__put_user(d_ino, &dirent->d_ino))
10+
goto efault;
11+
if (__put_user(reclen, &dirent->d_reclen))
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff -Nupr src.orig/kernel/time/timekeeping.c src/kernel/time/timekeeping.c
2+
--- src.orig/kernel/time/timekeeping.c 2020-09-03 11:48:30.726726839 -0400
3+
+++ src/kernel/time/timekeeping.c 2020-09-03 11:49:23.433891731 -0400
4+
@@ -852,6 +852,9 @@ void do_gettimeofday(struct timeval *tv)
5+
{
6+
struct timespec64 now;
7+
8+
+ if (!tv)
9+
+ return;
10+
+
11+
getnstimeofday64(&now);
12+
tv->tv_sec = now.tv_sec;
13+
tv->tv_usec = now.tv_nsec/1000;
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
2+
--- src.orig/fs/proc/proc_sysctl.c 2020-09-03 11:48:30.497726123 -0400
3+
+++ src/fs/proc/proc_sysctl.c 2020-09-03 11:48:39.089753002 -0400
4+
@@ -46,6 +46,7 @@ void proc_sys_poll_notify(struct ctl_tab
5+
if (!poll)
6+
return;
7+
8+
+ printk("kpatch-test: testing gcc .isra function name mangling\n");
9+
atomic_inc(&poll->event);
10+
wake_up_interruptible(&poll->wait);
11+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff -Nupr src.orig/mm/slub.c src/mm/slub.c
2+
--- src.orig/mm/slub.c 2020-09-03 11:48:30.747726905 -0400
3+
+++ src/mm/slub.c 2020-09-03 11:48:41.106759312 -0400
4+
@@ -5716,6 +5716,9 @@ void get_slabinfo(struct kmem_cache *s,
5+
unsigned long nr_free = 0;
6+
int node;
7+
8+
+ if (!jiffies)
9+
+ printk("slabinfo\n");
10+
+
11+
for_each_online_node(node) {
12+
struct kmem_cache_node *n = get_node(s, node);
13+

0 commit comments

Comments
 (0)