Rebase kernel on v6.2.14

Relatively small jump from 6.2.9 to 6.2.14. No significant changes required on the downstream patches. Bump minor version to reflect the newer kernel, now at 3.12.0. Signed-off-by: Sergio Lopez <[email protected]>
containers · May 9, 2023 · b23ecf4 · b23ecf4
1 parent 5cbdeea
commit b23ecf4
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
-KERNEL_VERSION = linux-6.2.9
+KERNEL_VERSION = linux-6.2.14
 KERNEL_REMOTE = https://cdn.kernel.org/pub/linux/kernel/v6.x/$(KERNEL_VERSION).tar.xz
 KERNEL_TARBALL = tarballs/$(KERNEL_VERSION).tar.xz
 KERNEL_SOURCES = $(KERNEL_VERSION)
 KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort)
 KERNEL_C_BUNDLE = kernel.c
 
 ABI_VERSION = 3
-FULL_VERSION = 3.11.0
-TIMESTAMP = "Mon Apr  3 04:28:59 PM CEST 2023"
+FULL_VERSION = 3.12.0
+TIMESTAMP = "Tue May  9 05:06:07 PM CEST 2023"
 
 KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
 KERNEL_FLAGS += KBUILD_BUILD_USER=root

diff --git a/patches-sev/0012-virtio-enable-DMA-API-if-memory-is-restricted.patch b/patches-sev/0012-virtio-enable-DMA-API-if-memory-is-restricted.patch
@@ -1,4 +1,4 @@
-From 9fa36ea0f90061f387dd9d68bf2a20ff9d8ac53a Mon Sep 17 00:00:00 2001
+From 085e37bf809ebcc443d16740666a8e65afd8515d Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 12/15] virtio: enable DMA API if memory is restricted
@@ -54,5 +54,5 @@ index 723c4e29e1d3..cb8a213e3412 100644
  	/*
  	 * In theory, it's possible to have a buggy QEMU-supposed
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches-sev/0013-x86-sev-write-AP-reset-vector.patch b/patches-sev/0013-x86-sev-write-AP-reset-vector.patch
@@ -1,4 +1,4 @@
-From a4853e8c504fb0f19ba731c068ec9e680338e9f9 Mon Sep 17 00:00:00 2001
+From 50749f9c7408f3bb4ce7f0151457b6ea7abad62c Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 20 Oct 2022 10:23:16 +0200
 Subject: [PATCH 13/15] x86/sev: write AP reset vector
@@ -55,5 +55,5 @@ index 3f664ab277c4..8770bdbdf1e2 100644
  	/* Check if AP Jump Table is page-aligned */
  	if (jump_table_addr & ~PAGE_MASK)
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches-sev/0014-Implement-driver-to-retrieve-secrets-from-cmdline.patch b/patches-sev/0014-Implement-driver-to-retrieve-secrets-from-cmdline.patch
@@ -1,4 +1,4 @@
-From e43f174c9736d474b4b2e353198378f3947df320 Mon Sep 17 00:00:00 2001
+From 299a5c09e6d5b0c78329340ea3aac91682eecd60 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 2 Mar 2023 12:06:44 +0100
 Subject: [PATCH 14/15] Implement driver to retrieve secrets from cmdline
@@ -293,5 +293,5 @@ index e1c3911d7c70..d38f44330a89 100644
 
  /*
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches-sev/0015-x86-sev-Avoid-using-native_cpuid.patch b/patches-sev/0015-x86-sev-Avoid-using-native_cpuid.patch
@@ -1,4 +1,4 @@
-From bc5d592e5820c6a949fabc196d81404bb824630f Mon Sep 17 00:00:00 2001
+From f068769b62bd01fafe0b58f0bdc9aefbb2a5eae8 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 20 Oct 2022 14:26:54 +0200
 Subject: [PATCH 15/15] x86/sev: Avoid using native_cpuid
@@ -162,5 +162,5 @@ index c6efcf559d88..471ebf438010 100644
  }
 +
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0001-krunfw-Don-t-panic-when-init-dies.patch b/patches/0001-krunfw-Don-t-panic-when-init-dies.patch
@@ -1,4 +1,4 @@
-From df778bb2679379cb35d7d08179df16676a8fef6a Mon Sep 17 00:00:00 2001
+From 8af9d24d0e6c3c0f8744c183faeff4785855201d Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 2 Mar 2023 07:34:49 +0100
 Subject: [PATCH 01/15] krunfw: Don't panic when init dies
@@ -58,5 +58,5 @@ index 3bba88c7ffc6..a08a8a9b4d88 100644
  	machine_restart(cmd);
  }
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch b/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch
@@ -1,4 +1,4 @@
-From 3fd0df5d88d3f10a45dd309c09be923d33f08eb3 Mon Sep 17 00:00:00 2001
+From 70263a10005754f67a2c63ee32df4940b785f334 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Mon, 16 May 2022 16:04:27 +0200
 Subject: [PATCH 02/15] krunfw: Ignore run_cmd on orderly reboot
@@ -28,5 +28,5 @@ index a08a8a9b4d88..838b7a293e43 100644
  	if (ret) {
  		pr_warn("Failed to start orderly reboot: forcing the issue\n");
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0003-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch b/patches/0003-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch
@@ -1,4 +1,4 @@
-From 331696dfb23c11b1906bc26f4202d5c3294b5bfa Mon Sep 17 00:00:00 2001
+From 951968bfafe3fca9d9ff71ec05663f4a46b20ea6 Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Tue, 6 Apr 2021 23:22:06 +0000
 Subject: [PATCH 03/15] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit
@@ -207,5 +207,5 @@ index ad64f403536a..3e157a62a9b1 100644
 
  static struct virtio_driver virtio_vsock_driver = {
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0004-virtio-vsock-add-support-for-virtio-datagram.patch b/patches/0004-virtio-vsock-add-support-for-virtio-datagram.patch
@@ -1,4 +1,4 @@
-From b9710e9fbfd9375bbfa3c556cc9d85e77c91d5de Mon Sep 17 00:00:00 2001
+From 3e0dfc83865387a819bd30338f85034aa0bc7b21 Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Thu, 26 May 2022 18:43:37 +0200
 Subject: [PATCH 04/15] virtio/vsock: add support for virtio datagram
@@ -954,5 +954,5 @@ index a9980e9b9304..06d4b89c597a 100644
 
  	/* Release refcnt obtained when we fetched this socket out of the
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0005-vhost-vsock-add-support-for-vhost-dgram.patch b/patches/0005-vhost-vsock-add-support-for-vhost-dgram.patch
@@ -1,4 +1,4 @@
-From 40a5baa7dbd9521b5ac2253d90962d4b98fe24df Mon Sep 17 00:00:00 2001
+From f0b3fd4469435ac5dfc208ad8a032222e7f5e64e Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Fri, 10 Dec 2021 12:42:16 +0100
 Subject: [PATCH 05/15] vhost/vsock: add support for vhost dgram.
@@ -434,5 +434,5 @@ index c2353f2ac4e1..64fd52182ce8 100644
  		return ret;
 
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0006-vsock_test-add-tests-for-vsock-dgram.patch b/patches/0006-vsock_test-add-tests-for-vsock-dgram.patch
@@ -1,4 +1,4 @@
-From 6234999f64582a4b9015192f3bbc8e27d33eb1c0 Mon Sep 17 00:00:00 2001
+From 26ba237a264ab6d70c3c67a0a88ce500372b089d Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Fri, 9 Apr 2021 18:32:20 +0000
 Subject: [PATCH 06/15] vsock_test: add tests for vsock dgram
@@ -373,5 +373,5 @@ index bb6d691cb30d..c3003adda639 100644
  };
 
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0007-virtio-vsock-add-sysfs-for-rx-buf-len-for-dgram.patch b/patches/0007-virtio-vsock-add-sysfs-for-rx-buf-len-for-dgram.patch
@@ -1,4 +1,4 @@
-From 9684168326cde58f09e178ca6c20294622b21dba Mon Sep 17 00:00:00 2001
+From 18b3daa1dd3e1094abb9f35e9707c74df04a5557 Mon Sep 17 00:00:00 2001
 From: Jiang Wang <[email protected]>
 Date: Thu, 26 May 2022 18:46:09 +0200
 Subject: [PATCH 07/15] virtio/vsock: add sysfs for rx buf len for dgram
@@ -97,5 +97,5 @@ index abaae264453b..5e78e9ca3e2b 100644
 
  module_init(virtio_vsock_init);
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0008-virtio-vsock-Fix-DGRAM-polling.patch b/patches/0008-virtio-vsock-Fix-DGRAM-polling.patch
@@ -1,4 +1,4 @@
-From ed69499bfaa9d8b444461850158c5acd3c8213e8 Mon Sep 17 00:00:00 2001
+From bbeef5894f73357653229313db77b6d24a7dabb5 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:31:03 +0200
 Subject: [PATCH 08/15] virtio/vsock: Fix DGRAM polling
@@ -49,5 +49,5 @@ index 0fd3df91f52f..d4210968809b 100644
  		}
 
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0009-virtio-vsock-add-DGRAM-to-virtio_transport_get_type.patch b/patches/0009-virtio-vsock-add-DGRAM-to-virtio_transport_get_type.patch
@@ -1,4 +1,4 @@
-From efc884f6fe884e002e1037d43548a0711f8689ba Mon Sep 17 00:00:00 2001
+From b4aa45c4e63f69900894e1d9938e91943b9ac715 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:34:49 +0200
 Subject: [PATCH 09/15] virtio/vsock: add DGRAM to virtio_transport_get_type
@@ -27,5 +27,5 @@ index 06d4b89c597a..5e31e789b007 100644
 
  /* This function can only be used on connecting/connected sockets,
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0010-Transparent-Socket-Impersonation-implementation.patch b/patches/0010-Transparent-Socket-Impersonation-implementation.patch
@@ -1,4 +1,4 @@
-From 467ec769367a4b35a8cd790a24e61e5b860842a1 Mon Sep 17 00:00:00 2001
+From 045ca038d53899620e63ab7b56c72158896f3f3e Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:38:26 +0200
 Subject: [PATCH 10/15] Transparent Socket Impersonation implementation
@@ -1510,5 +1510,5 @@ index 000000000000..cf381734bebe
 +
 +#endif
 -- 
-2.39.2
+2.40.1
 
diff --git a/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch b/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch
@@ -1,4 +1,4 @@
-From dc48dc6f33b5d84cf2b2ee2e1fcd69a4236ed7be Mon Sep 17 00:00:00 2001
+From 83a69bebc152bb5023ec56af9297d2bd6be0c28f Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:42:01 +0200
 Subject: [PATCH 11/15] tsi: allow hijacking sockets (tsi_hijack)
@@ -69,5 +69,5 @@ index 38a383634ccd..91c9c5cb2285 100644
  	int err;
 
 -- 
-2.39.2
+2.40.1