images: update to kernel 5.15.93

This is the newest LTS kernel release. Will also come in handy for
disaggregated memory stuff later.

images/kernel/linux-5.4.46-timers-gem5.patch → images/kernel/linux-5.15.93-timers-gem5.patch

-diff -ur linux-5.4.46/arch/x86/kernel/apic/apic.c linux-5.4.46.our/arch/x86/kernel/apic/apic.c
---- linux-5.4.46/arch/x86/kernel/apic/apic.c	2020-06-10 20:24:58.000000000 +0200
-+++ linux-5.4.46.our/arch/x86/kernel/apic/apic.c	2020-06-16 20:26:58.697157257 +0200
-@@ -1034,6 +1034,8 @@
+diff -ur linux-5.15.69.old/arch/x86/kernel/apic/apic.c linux-5.15.69/arch/x86/kernel/apic/apic.c
+--- linux-5.15.69.old/arch/x86/kernel/apic/apic.c	2022-09-20 12:39:46.000000000 +0200
++++ linux-5.15.69/arch/x86/kernel/apic/apic.c	2022-09-22 12:30:20.240719422 +0200
+@@ -1001,6 +1001,8 @@
  		return -1;
  	}
  
@@ -10,7 +10,7 @@ diff -ur linux-5.4.46/arch/x86/kernel/apic/apic.c linux-5.4.46.our/arch/x86/kern
  	return 0;
  }
  
-@@ -2916,3 +2918,13 @@
+@@ -2957,3 +2959,13 @@
  	return 0;
  }
  early_param("apic_extnmi", apic_set_extnmi);
@@ -24,10 +24,10 @@ diff -ur linux-5.4.46/arch/x86/kernel/apic/apic.c linux-5.4.46.our/arch/x86/kern
 +}
 +
 +early_param("lapic_timer_period", lapic_set_timer_period);
-diff -ur linux-5.4.46/arch/x86/kernel/tsc.c linux-5.4.46.our/arch/x86/kernel/tsc.c
---- linux-5.4.46/arch/x86/kernel/tsc.c	2020-06-10 20:24:58.000000000 +0200
-+++ linux-5.4.46.our/arch/x86/kernel/tsc.c	2020-06-16 21:07:12.652251545 +0200
-@@ -51,6 +51,8 @@
+diff -ur linux-5.15.69.old/arch/x86/kernel/tsc.c linux-5.15.69/arch/x86/kernel/tsc.c
+--- linux-5.15.69.old/arch/x86/kernel/tsc.c	2022-09-20 12:39:46.000000000 +0200
++++ linux-5.15.69/arch/x86/kernel/tsc.c	2022-09-22 12:30:20.240719422 +0200
+@@ -53,6 +53,8 @@
  static u64 art_to_tsc_offset;
  struct clocksource *art_related_clocksource;
  
@@ -35,8 +35,8 @@ diff -ur linux-5.4.46/arch/x86/kernel/tsc.c linux-5.4.46.our/arch/x86/kernel/tsc
 +
  struct cyc2ns {
  	struct cyc2ns_data data[2];	/*  0 + 2*16 = 32 */
- 	seqcount_t	   seq;		/* 32 + 4    = 36 */
-@@ -862,6 +864,8 @@
+ 	seqcount_latch_t   seq;		/* 32 + 4    = 36 */
+@@ -870,6 +872,8 @@
  {
  	unsigned long flags, fast_calibrate = cpu_khz_from_cpuid();
  
@@ -45,7 +45,7 @@ diff -ur linux-5.4.46/arch/x86/kernel/tsc.c linux-5.4.46.our/arch/x86/kernel/tsc
  	if (!fast_calibrate)
  		fast_calibrate = cpu_khz_from_msr();
  	if (!fast_calibrate) {
-@@ -869,6 +873,7 @@
+@@ -877,6 +881,7 @@
  		fast_calibrate = quick_pit_calibrate();
  		local_irq_restore(flags);
  	}
@@ -53,7 +53,7 @@ diff -ur linux-5.4.46/arch/x86/kernel/tsc.c linux-5.4.46.our/arch/x86/kernel/tsc
  	return fast_calibrate;
  }
  
-@@ -1534,3 +1539,14 @@
+@@ -1575,3 +1580,14 @@
  	return 0;
  }
  #endif

images/kernel/linux-5.4.46-new-binutils.patch

-diff -ur linux-5.4.46.old/arch/x86/entry/Makefile linux-5.4.46/arch/x86/entry/Makefile
---- linux-5.4.46.old/arch/x86/entry/Makefile	2022-05-03 14:52:37.250790352 +0000
-+++ linux-5.4.46/arch/x86/entry/Makefile	2022-05-03 14:54:39.878691437 +0000
-@@ -7,11 +7,12 @@
- 
- CFLAGS_syscall_64.o		+= $(call cc-option,-Wno-override-init,)
- CFLAGS_syscall_32.o		+= $(call cc-option,-Wno-override-init,)
--obj-y				:= entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o
-+obj-y				:= entry_$(BITS).o syscall_$(BITS).o
- obj-y				+= common.o
- 
- obj-y				+= vdso/
- obj-y				+= vsyscall/
- 
-+obj-$(CONFIG_PREEMPTION)	+= thunk_$(BITS).o
- obj-$(CONFIG_IA32_EMULATION)	+= entry_64_compat.o syscall_32.o
- 
-diff -ur linux-5.4.46.old/arch/x86/entry/thunk_32.S linux-5.4.46/arch/x86/entry/thunk_32.S
---- linux-5.4.46.old/arch/x86/entry/thunk_32.S	2022-05-03 14:52:37.250790352 +0000
-+++ linux-5.4.46/arch/x86/entry/thunk_32.S	2022-05-03 14:55:08.770668074 +0000
-@@ -34,10 +34,7 @@
- 	THUNK trace_hardirqs_off_thunk,trace_hardirqs_off_caller,1
- #endif
- 
--#ifdef CONFIG_PREEMPTION
- 	THUNK ___preempt_schedule, preempt_schedule
- 	THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
- 	EXPORT_SYMBOL(___preempt_schedule)
- 	EXPORT_SYMBOL(___preempt_schedule_notrace)
--#endif
--
-diff -ur linux-5.4.46.old/arch/x86/entry/thunk_64.S linux-5.4.46/arch/x86/entry/thunk_64.S
---- linux-5.4.46.old/arch/x86/entry/thunk_64.S	2022-05-03 14:52:37.250790352 +0000
-+++ linux-5.4.46/arch/x86/entry/thunk_64.S	2022-05-03 14:56:16.202613479 +0000
-@@ -46,16 +46,11 @@
- 	THUNK lockdep_sys_exit_thunk,lockdep_sys_exit
- #endif
- 
--#ifdef CONFIG_PREEMPTION
- 	THUNK ___preempt_schedule, preempt_schedule
- 	THUNK ___preempt_schedule_notrace, preempt_schedule_notrace
- 	EXPORT_SYMBOL(___preempt_schedule)
- 	EXPORT_SYMBOL(___preempt_schedule_notrace)
--#endif
- 
--#if defined(CONFIG_TRACE_IRQFLAGS) \
-- || defined(CONFIG_DEBUG_LOCK_ALLOC) \
-- || defined(CONFIG_PREEMPTION)
- .L_restore:
- 	popq %r11
- 	popq %r10
-@@ -69,4 +64,3 @@
- 	popq %rbp
- 	ret
- 	_ASM_NOKPROBE(.L_restore)
--#endif

images/rules.mk

@@ -23,7 +23,7 @@
 include mk/subdir_pre.mk
 
 PACKER_VERSION := 1.7.0
-KERNEL_VERSION := 5.4.46
+KERNEL_VERSION := 5.15.93
 
 BASE_IMAGE := $(d)output-base/base
 MEMCACHED_IMAGE := $(d)output-memcached/memcached
@@ -171,7 +171,6 @@ $(kernel_dir)/.config: $(kernel_pardir)/config-$(KERNEL_VERSION)
 	wget -O - https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-$(KERNEL_VERSION).tar.xz | \
 	    tar xJf - -C $(kernel_pardir)
 	cd $(kernel_dir) && patch -p1 < ../linux-$(KERNEL_VERSION)-timers-gem5.patch
-	cd $(kernel_dir) && patch -p1 < ../linux-$(KERNEL_VERSION)-new-binutils.patch
 	cp $< $@
 
 ################################################

images/scripts/install-base.sh

@@ -4,8 +4,8 @@ set -eux
 
 pushd /tmp/input
 mv guestinit.sh /home/ubuntu/guestinit.sh
-mv bzImage /boot/vmlinuz-5.4.46
-mv config-5.4.46 /boot/
+mv bzImage /boot/vmlinuz-5.15.93
+mv config-5.15.93 /boot/
 mv m5 /sbin/m5
 update-grub
 tar xf kheaders.tar.bz2 -C /