Merge pull request #1174 from joe-lawrence/rhel-8.4-support

Additional rhel 8.4 support

Author: joe-lawrence

kpatch-build/kpatch-build

@@ -203,6 +203,21 @@ use_klp_arch()
 	fi
 }
 
+rhel_kernel_version_gte() {
+        [  "${ARCHVERSION}" = "$(echo -e "${ARCHVERSION}\\n$1" | sort -rV | head -n1)" ]
+}
+
+# klp.arch relocations were supported prior to v5.8
+# and prior to 4.18.0-284.el8
+use_klp_arch()
+{
+	if kernel_is_rhel; then
+		! rhel_kernel_version_gte 4.18.0-284.el8
+	else
+		! kernel_version_gte 5.8.0
+	fi
+}
+
 find_dirs() {
 	if [[ -e "$SCRIPTDIR/create-diff-object" ]]; then
 		# git repo

test/integration/rhel-8.4/bug-table-section.patch

@@ -0,0 +1,12 @@
+diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
+--- src.orig/fs/proc/proc_sysctl.c	2021-04-20 11:04:26.717100594 -0400
++++ src/fs/proc/proc_sysctl.c	2021-04-20 11:04:27.636102900 -0400
+@@ -338,6 +338,8 @@ static void start_unregistering(struct c
+ 
+ static struct ctl_table_header *sysctl_head_grab(struct ctl_table_header *head)
+ {
++	if (jiffies == 0)
++		printk("kpatch-test: testing __bug_table section changes\n");
+ 	BUG_ON(!head);
+ 	spin_lock(&sysctl_lock);
+ 	if (!use_table(head))

test/integration/rhel-8.4/cmdline-string-LOADED.test

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep kpatch=1 /proc/cmdline

test/integration/rhel-8.4/cmdline-string.patch

@@ -0,0 +1,13 @@
+diff -Nupr src.orig/fs/proc/cmdline.c src/fs/proc/cmdline.c
+--- src.orig/fs/proc/cmdline.c	2021-04-20 11:04:26.717100594 -0400
++++ src/fs/proc/cmdline.c	2021-04-20 11:04:30.118109128 -0400
+@@ -6,8 +6,7 @@
+ 
+ static int cmdline_proc_show(struct seq_file *m, void *v)
+ {
+-	seq_puts(m, saved_command_line);
+-	seq_putc(m, '\n');
++	seq_printf(m, "%s kpatch=1\n", saved_command_line);
+ 	return 0;
+ }
+ 

test/integration/rhel-8.4/data-new-LOADED.test

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+grep "kpatch:         5" /proc/meminfo

test/integration/rhel-8.4/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	2021-04-20 11:04:26.717100594 -0400
++++ src/fs/proc/meminfo.c	2021-04-20 11:04:32.584115315 -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;
+@@ -146,6 +148,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);
+ 
+ 	hugetlb_report_meminfo(m);
+ 

test/integration/rhel-8.4/data-read-mostly.patch

@@ -0,0 +1,11 @@
+diff -Nupr src.orig/net/core/dev.c src/net/core/dev.c
+--- src.orig/net/core/dev.c	2021-04-20 11:04:27.355102195 -0400
++++ src/net/core/dev.c	2021-04-20 11:04:34.800120875 -0400
+@@ -5058,6 +5058,7 @@ skip_classify:
+ 		case RX_HANDLER_PASS:
+ 			break;
+ 		default:
++			printk("BUG!\n");
+ 			BUG();
+ 		}
+ 	}

test/integration/rhel-8.4/fixup-section.patch

@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/readdir.c src/fs/readdir.c
+--- src.orig/fs/readdir.c	2021-04-20 11:04:26.675100489 -0400
++++ src/fs/readdir.c	2021-04-20 11:04:36.984126354 -0400
+@@ -189,6 +189,7 @@ static int filldir(struct dir_context *c
+ 			goto efault;
+ 	}
+ 	dirent = buf->current_dir;
++	asm("nop");
+ 	if (__put_user(d_ino, &dirent->d_ino))
+ 		goto efault;
+ 	if (__put_user(reclen, &dirent->d_reclen))

test/integration/rhel-8.4/gcc-constprop.patch

@@ -0,0 +1,13 @@
+diff -Nupr src.orig/kernel/time/timekeeping.c src/kernel/time/timekeeping.c
+--- src.orig/kernel/time/timekeeping.c	2021-04-20 11:04:27.325102120 -0400
++++ src/kernel/time/timekeeping.c	2021-04-20 11:04:39.253132047 -0400
+@@ -1231,6 +1231,9 @@ void do_gettimeofday(struct timeval *tv)
+ {
+ 	struct timespec64 now;
+ 
++	if (!tv)
++		return;
++
+ 	getnstimeofday64(&now);
+ 	tv->tv_sec = now.tv_sec;
+ 	tv->tv_usec = now.tv_nsec/1000;

test/integration/rhel-8.4/gcc-isra.patch

@@ -0,0 +1,11 @@
+diff -Nupr src.orig/fs/proc/proc_sysctl.c src/fs/proc/proc_sysctl.c
+--- src.orig/fs/proc/proc_sysctl.c	2021-04-20 11:04:26.717100594 -0400
++++ src/fs/proc/proc_sysctl.c	2021-04-20 11:04:41.824138498 -0400
+@@ -53,6 +53,7 @@ void proc_sys_poll_notify(struct ctl_tab
+ 	if (!poll)
+ 		return;
+ 
++	printk("kpatch-test: testing gcc .isra function name mangling\n");
+ 	atomic_inc(&poll->event);
+ 	wake_up_interruptible(&poll->wait);
+ }