diff --git a/Makefile b/Makefile index 5f9f6b3..df3c206 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -KERNEL_VERSION = linux-6.6.32 +KERNEL_VERSION = linux-6.6.44 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) @@ -6,8 +6,8 @@ KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort) KERNEL_C_BUNDLE = kernel.c ABI_VERSION = 4 -FULL_VERSION = 4.2.0 -TIMESTAMP = "Wed Jun 5 12:25:26 CEST 2024" +FULL_VERSION = 4.3.0 +TIMESTAMP = "Mon Aug 5 10:53:49 CEST 2024" 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 index 9917529..1648244 100644 --- 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 d93ce33345c5f2b98dd9755305b0d9d398700a82 Mon Sep 17 00:00:00 2001 +From aa2644a251efee27236a017487fc30f82227cb1e Mon Sep 17 00:00:00 2001 From: Sergio Lopez 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 6f7e5010a673..d40dbac45284 100644 /* * In theory, it's possible to have a buggy QEMU-supposed -- -2.45.1 +2.45.2 diff --git a/patches-sev/0013-x86-sev-write-AP-reset-vector.patch b/patches-sev/0013-x86-sev-write-AP-reset-vector.patch index 2668e8f..8d51606 100644 --- 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 6aa274f70051eb95674044157079ca13fa701a0f Mon Sep 17 00:00:00 2001 +From ba40cb466eac33c12dc2d285f7af8f45e0cfbfd7 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 20 Oct 2022 10:23:16 +0200 Subject: [PATCH 13/15] x86/sev: write AP reset vector @@ -55,5 +55,5 @@ index 9905dc0e0b09..38df85fd1324 100644 /* Check if AP Jump Table is page-aligned */ if (jump_table_addr & ~PAGE_MASK) -- -2.45.1 +2.45.2 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 index 928d536..0f8989d 100644 --- 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 6430fda28a91d4b96e7da41fc61e3469ded4d272 Mon Sep 17 00:00:00 2001 +From 49e3dd72da01fff91a85f4d4bc0e705dbde9ae67 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 3 Aug 2022 12:35:12 +0200 Subject: [PATCH 14/15] Implement driver to retrieve secrets from cmdline @@ -261,7 +261,7 @@ index 01b52c9c7526..889a0cf32832 100644 /* used by init/main.c */ diff --git a/init/main.c b/init/main.c -index b25c779e93ac..fd0066bc5894 100644 +index c787e94cc898..2fb8a8af9af6 100644 --- a/init/main.c +++ b/init/main.c @@ -147,6 +147,11 @@ static char *extra_command_line; @@ -276,7 +276,7 @@ index b25c779e93ac..fd0066bc5894 100644 #ifdef CONFIG_BOOT_CONFIG /* Is bootconfig on command line? */ static bool bootconfig_found; -@@ -671,6 +676,14 @@ static void __init setup_command_line(char *command_line) +@@ -670,6 +675,14 @@ static void __init setup_command_line(char *command_line) } saved_command_line_len = strlen(saved_command_line); @@ -292,5 +292,5 @@ index b25c779e93ac..fd0066bc5894 100644 /* -- -2.45.1 +2.45.2 diff --git a/patches-sev/0015-x86-sev-Avoid-using-native_cpuid.patch b/patches-sev/0015-x86-sev-Avoid-using-native_cpuid.patch index 0e82f13..9d23f29 100644 --- 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 8e06ee2bf8580e382b58434d69dc6ea3697bb34d Mon Sep 17 00:00:00 2001 +From 3fcf7bfe438218d884d8aa36159bcf6ec37e23eb Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 5 Jun 2024 16:20:08 +0200 Subject: [PATCH 15/15] x86/sev: Avoid using native_cpuid @@ -61,5 +61,5 @@ index cc47a818a640..a2b5b08eee23 100644 /* Check the SEV MSR whether SEV or SME is enabled */ RIP_REL_REF(sev_status) = msr = __rdmsr(MSR_AMD64_SEV); -- -2.45.1 +2.45.2 diff --git a/patches/0001-krunfw-Don-t-panic-when-init-dies.patch b/patches/0001-krunfw-Don-t-panic-when-init-dies.patch index 7d38603..95df744 100644 --- 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 9b38520109ca41f4a24a808b6d828773d8be1e3f Mon Sep 17 00:00:00 2001 +From 2b01861f2623f4434d90e484448e8c9e45c1242c Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 2 Mar 2023 07:34:49 +0100 Subject: [PATCH 01/15] krunfw: Don't panic when init dies @@ -16,7 +16,7 @@ Signed-off-by: Sergio Lopez 2 files changed, 7 insertions(+) diff --git a/kernel/exit.c b/kernel/exit.c -index 21a59a6e1f2e..614cb2ae23dc 100644 +index 3540b2c9b1b6..8348e9825945 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -69,6 +69,7 @@ @@ -27,7 +27,7 @@ index 21a59a6e1f2e..614cb2ae23dc 100644 #include #include -@@ -838,8 +839,12 @@ void __noreturn do_exit(long code) +@@ -840,8 +841,12 @@ void __noreturn do_exit(long code) * immediately to get a useable coredump. */ if (unlikely(is_global_init(tsk))) @@ -58,5 +58,5 @@ index 6ebef11c8876..4323caa5b871 100644 machine_restart(cmd); } -- -2.45.1 +2.45.2 diff --git a/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch b/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch index 99f2018..0126b37 100644 --- 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 3f52a9c872f08a1bd8cceb91d26256bafad0ae67 Mon Sep 17 00:00:00 2001 +From 887e1f887d0c04fe8ccf511a9521c38e2a817a2d Mon Sep 17 00:00:00 2001 From: Sergio Lopez 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 4323caa5b871..d9d6f0dd2ebc 100644 if (ret) { pr_warn("Failed to start orderly reboot: forcing the issue\n"); -- -2.45.1 +2.45.2 diff --git a/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch b/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch index f71c843..3d350f2 100644 --- a/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch +++ b/patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch @@ -1,4 +1,4 @@ -From 915fb507c6b714320a1880a07447ce008ddbc409 Mon Sep 17 00:00:00 2001 +From 0334eb653db47ada29d2e523b2e7651dee2fb4e2 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:28 +0000 Subject: [PATCH 03/15] vsock/dgram: generalize recvmsg and drop @@ -23,7 +23,7 @@ Signed-off-by: Bobby Eshleman 9 files changed, 132 insertions(+), 50 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c -index 61255855d490..a6b8316331ca 100644 +index d94a06008ff6..549158375086 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -410,9 +410,11 @@ static struct virtio_transport vhost_transport = { @@ -352,5 +352,5 @@ index 0ce65d0a4a44..6b19e308a140 100644 .stream_dequeue = virtio_transport_stream_dequeue, .stream_enqueue = virtio_transport_stream_enqueue, -- -2.45.1 +2.45.2 diff --git a/patches/0004-vsock-refactor-transport-lookup-code.patch b/patches/0004-vsock-refactor-transport-lookup-code.patch index 990114c..e6e87fa 100644 --- a/patches/0004-vsock-refactor-transport-lookup-code.patch +++ b/patches/0004-vsock-refactor-transport-lookup-code.patch @@ -1,4 +1,4 @@ -From 7edf115e626ba445d3c371911820cdf3b779179d Mon Sep 17 00:00:00 2001 +From 5981f2c4b9ec44a6195d2ba892100e1cdbe80d24 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:29 +0000 Subject: [PATCH 04/15] vsock: refactor transport lookup code @@ -57,5 +57,5 @@ index c66d3def5e6e..813588bee10f 100644 default: return -ESOCKTNOSUPPORT; -- -2.45.1 +2.45.2 diff --git a/patches/0005-vsock-support-multi-transport-datagrams.patch b/patches/0005-vsock-support-multi-transport-datagrams.patch index 5be7454..61d5f88 100644 --- a/patches/0005-vsock-support-multi-transport-datagrams.patch +++ b/patches/0005-vsock-support-multi-transport-datagrams.patch @@ -1,4 +1,4 @@ -From 1c6ba81a2fc7eacfc8622eab862fe34154526f6a Mon Sep 17 00:00:00 2001 +From 0eca7ac3da42ac518e6410fa91d754ee40371886 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:30 +0000 Subject: [PATCH 05/15] vsock: support multi-transport datagrams @@ -57,7 +57,7 @@ Signed-off-by: Bobby Eshleman 7 files changed, 60 insertions(+), 36 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c -index a6b8316331ca..ccbc186727b2 100644 +index 549158375086..ea093563b96b 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -410,7 +410,6 @@ static struct virtio_transport vhost_transport = { @@ -304,5 +304,5 @@ index 6b19e308a140..21a4debde550 100644 .dgram_allow = virtio_transport_dgram_allow, .dgram_get_cid = virtio_transport_dgram_get_cid, -- -2.45.1 +2.45.2 diff --git a/patches/0006-vsock-make-vsock-bind-reusable.patch b/patches/0006-vsock-make-vsock-bind-reusable.patch index 5aa54e7..2632b1e 100644 --- a/patches/0006-vsock-make-vsock-bind-reusable.patch +++ b/patches/0006-vsock-make-vsock-bind-reusable.patch @@ -1,4 +1,4 @@ -From 9b5fadb3aa13c529323c684c6b7e9f91d184f43e Mon Sep 17 00:00:00 2001 +From a01abc12504a5819737fc8dcb6026eb2c52e67de Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:31 +0000 Subject: [PATCH 06/15] vsock: make vsock bind reusable @@ -102,5 +102,5 @@ index 2567641a829f..034c3db91fc3 100644 struct sockaddr_vm *addr) { -- -2.45.1 +2.45.2 diff --git a/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch b/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch index 631fe20..98545d2 100644 --- a/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch +++ b/patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch @@ -1,4 +1,4 @@ -From 53285b9ceaab26da36945e7a60fb5397acd2f02d Mon Sep 17 00:00:00 2001 +From db9dd067e0ef890d720617635023919a106ac70e Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:32 +0000 Subject: [PATCH 07/15] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit @@ -24,5 +24,5 @@ index 64738838bee5..9c25f267bbc0 100644 struct virtio_vsock_config { __le64 guest_cid; -- -2.45.1 +2.45.2 diff --git a/patches/0008-virtio-vsock-support-dgrams.patch b/patches/0008-virtio-vsock-support-dgrams.patch index 1fdf5eb..e1bac9a 100644 --- a/patches/0008-virtio-vsock-support-dgrams.patch +++ b/patches/0008-virtio-vsock-support-dgrams.patch @@ -1,4 +1,4 @@ -From fffe341670a4c18182d59ce9e0c415c8e83dd7e9 Mon Sep 17 00:00:00 2001 +From 49d36822cfdca63ffbb3b1632cf613eb20a2a02c Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:33 +0000 Subject: [PATCH 08/15] virtio/vsock: support dgrams @@ -36,7 +36,7 @@ Signed-off-by: Bobby Eshleman 8 files changed, 264 insertions(+), 66 deletions(-) diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c -index ccbc186727b2..5f38bd389bf4 100644 +index ea093563b96b..a3fea3cd2603 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -32,7 +32,8 @@ @@ -102,8 +102,8 @@ index ccbc186727b2..5f38bd389bf4 100644 { struct vhost_vsock *vsock; @@ -803,6 +823,9 @@ static int vhost_vsock_set_features(struct vhost_vsock *vsock, u64 features) - if (features & (1ULL << VIRTIO_VSOCK_F_SEQPACKET)) - vsock->seqpacket_allow = true; + + vsock->seqpacket_allow = features & (1ULL << VIRTIO_VSOCK_F_SEQPACKET); + if (features & (1ULL << VIRTIO_VSOCK_F_DGRAM)) + vsock->dgram_allow = true; @@ -741,5 +741,5 @@ index 21a4debde550..20f5b123bde5 100644 { return true; -- -2.45.1 +2.45.2 diff --git a/patches/0009-tests-add-vsock-dgram-tests.patch b/patches/0009-tests-add-vsock-dgram-tests.patch index b5f0f73..9ff1c80 100644 --- a/patches/0009-tests-add-vsock-dgram-tests.patch +++ b/patches/0009-tests-add-vsock-dgram-tests.patch @@ -1,4 +1,4 @@ -From 167a4eb71c30486127dbdffd91d525ba374a1302 Mon Sep 17 00:00:00 2001 +From 6befcab4d48cb38c8e34f13a6f5f1b7b45c5449e Mon Sep 17 00:00:00 2001 From: Jiang Wang Date: Sat, 10 Jun 2023 00:58:35 +0000 Subject: [PATCH 09/15] tests: add vsock dgram tests @@ -667,5 +667,5 @@ index 5dc7767039f6..7c66e934341a 100644 {}, }; -- -2.45.1 +2.45.2 diff --git a/patches/0010-Transparent-Socket-Impersonation-implementation.patch b/patches/0010-Transparent-Socket-Impersonation-implementation.patch index c7b1d29..ab4e6c7 100644 --- a/patches/0010-Transparent-Socket-Impersonation-implementation.patch +++ b/patches/0010-Transparent-Socket-Impersonation-implementation.patch @@ -1,4 +1,4 @@ -From 38ff31352b912b6fb8facebc6d56f257dfb4142f Mon Sep 17 00:00:00 2001 +From 399d3ee078cad45dafe6c00d17edfb31377963c6 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:38:26 +0200 Subject: [PATCH 10/15] Transparent Socket Impersonation implementation @@ -1508,5 +1508,5 @@ index 000000000000..cf381734bebe + +#endif -- -2.45.1 +2.45.2 diff --git a/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch b/patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch index 3c1b52b..adc5439 100644 --- 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 c06716b09e9f021cc0a66ded750a6daee3cd1a0f Mon Sep 17 00:00:00 2001 +From 1d7f6a16e8494cecaff51fb653eb1c0fe6def05d Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:42:01 +0200 Subject: [PATCH 11/15] tsi: allow hijacking sockets (tsi_hijack) @@ -69,5 +69,5 @@ index eda6c4ba7961..6cf01d7ce8f5 100644 int err; -- -2.45.1 +2.45.2