Skip to content

Commit 69fba43

Browse files
slptylerfanelli
authored andcommitted
Rebase on a 6.12.87 kernel
Rebase on the latest LTS 6.12.x kernel. No changes needed in the downstream patches. Signed-off-by: Sergio Lopez <slp@redhat.com>
1 parent 7d995aa commit 69fba43

37 files changed

Lines changed: 175 additions & 524 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
KERNEL_VERSION = linux-6.12.76
1+
KERNEL_VERSION = linux-6.12.87
22
KERNEL_REMOTE = https://cdn.kernel.org/pub/linux/kernel/v6.x/$(KERNEL_VERSION).tar.xz
33
KERNEL_TARBALL = tarballs/$(KERNEL_VERSION).tar.xz
44
KERNEL_SOURCES = $(KERNEL_VERSION)
55
KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort)
66
KERNEL_C_BUNDLE = kernel.c
77

88
ABI_VERSION = 5
9-
FULL_VERSION = 5.3.0
10-
TIMESTAMP = "Tue Mar 10 13:28:56 CET 2026"
9+
FULL_VERSION = 5.4.0
10+
TIMESTAMP = "Fri May 8 14:25:15 CEST 2026"
1111

1212
KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
1313
KERNEL_FLAGS += KBUILD_BUILD_USER=root

patches-tee/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 657f3ea1bfeb76ddc6bc4af9eb23dc77a1ff8a1a Mon Sep 17 00:00:00 2001
1+
From ff5dbd901b0688a006fafcba07449d4a116b7317 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@sinrega.org>
33
Date: Fri, 10 Sep 2021 13:05:01 +0200
44
Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted
@@ -54,5 +54,5 @@ index c0276979675d..1d5b988e4452 100644
5454
/*
5555
* In theory, it's possible to have a buggy QEMU-supposed
5656
--
57-
2.52.0
57+
2.54.0
5858

patches-tee/0002-x86-sev-write-AP-reset-vector.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 85875d63186b73e8b524204ee10385f979f49d48 Mon Sep 17 00:00:00 2001
1+
From dd2119161ec3510a5ca2946dcadd5043f19ff4ed Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Thu, 20 Oct 2022 10:23:16 +0200
44
Subject: [PATCH 2/4] x86/sev: write AP reset vector
@@ -12,10 +12,10 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
1212
1 file changed, 24 insertions(+), 1 deletion(-)
1313

1414
diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c
15-
index de1df0cb45da..7ed486a790fb 100644
15+
index 2be730765f83..aff0f627c3bd 100644
1616
--- a/arch/x86/coco/sev/core.c
1717
+++ b/arch/x86/coco/sev/core.c
18-
@@ -1266,6 +1266,29 @@ void __init snp_set_wakeup_secondary_cpu(void)
18+
@@ -1273,6 +1273,29 @@ void __init snp_set_wakeup_secondary_cpu(void)
1919
apic_update_callback(wakeup_secondary_cpu, wakeup_cpu_via_vmgexit);
2020
}
2121

@@ -45,7 +45,7 @@ index de1df0cb45da..7ed486a790fb 100644
4545
int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)
4646
{
4747
u16 startup_cs, startup_ip;
48-
@@ -1277,7 +1300,7 @@ int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)
48+
@@ -1284,7 +1307,7 @@ int __init sev_es_setup_ap_jump_table(struct real_mode_header *rmh)
4949

5050
/* On UP guests there is no jump table so this is not a failure */
5151
if (!jump_table_addr)
@@ -55,5 +55,5 @@ index de1df0cb45da..7ed486a790fb 100644
5555
/* Check if AP Jump Table is page-aligned */
5656
if (jump_table_addr & ~PAGE_MASK)
5757
--
58-
2.52.0
58+
2.54.0
5959

patches-tee/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 702d45def09ba1783735f654a6686c1aa1f601e9 Mon Sep 17 00:00:00 2001
1+
From 45bce0f81b5111fac6e6979a8709e8bd87661ef4 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Wed, 3 Aug 2022 12:35:12 +0200
44
Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline
@@ -259,7 +259,7 @@ index ee1309473bc6..96c0f3c72395 100644
259259

260260
/* used by init/main.c */
261261
diff --git a/init/main.c b/init/main.c
262-
index 821df1f05e9c..04f8f5a6389d 100644
262+
index dca88ac54c43..0336c3b27043 100644
263263
--- a/init/main.c
264264
+++ b/init/main.c
265265
@@ -149,6 +149,11 @@ static char *extra_command_line;
@@ -290,5 +290,5 @@ index 821df1f05e9c..04f8f5a6389d 100644
290290

291291
/*
292292
--
293-
2.52.0
293+
2.54.0
294294

patches-tee/0004-x86-sev-Avoid-using-native_cpuid.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3b114c42aaf912e8da93252c5562f7635a8b2199 Mon Sep 17 00:00:00 2001
1+
From 126c045600e62f2e1bda8568cee52de30b6d0aff Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Wed, 5 Jun 2024 16:20:08 +0200
44
Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid
@@ -61,5 +61,5 @@ index b922b9fea6b6..c0de732b0121 100644
6161
/* Check the SEV MSR whether SEV or SME is enabled */
6262
RIP_REL_REF(sev_status) = msr = __rdmsr(MSR_AMD64_SEV);
6363
--
64-
2.52.0
64+
2.54.0
6565

patches/0001-krunfw-Don-t-panic-when-init-dies.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 817f5791591a123e06fa85993aa24f2e4367c506 Mon Sep 17 00:00:00 2001
1+
From db20a79e5810bc9fc77655acde5c8e13e7942ba9 Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Thu, 2 Mar 2023 07:34:49 +0100
4-
Subject: [PATCH 01/26] krunfw: Don't panic when init dies
4+
Subject: [PATCH 01/32] krunfw: Don't panic when init dies
55

66
In libkrun, the isolated process runs as PID 1. When it exits,
77
trigger an orderly reboot instead of panic'ing.
@@ -59,5 +59,5 @@ index d6ee090eda94..f6947c5bd671 100644
5959
machine_restart(cmd);
6060
}
6161
--
62-
2.52.0
62+
2.54.0
6363

patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From db750d64e3f36576b667b67e979ec800a1eec872 Mon Sep 17 00:00:00 2001
1+
From 2e7df3e03121c97e16bb72de31e8b5ba9908971a Mon Sep 17 00:00:00 2001
22
From: Sergio Lopez <slp@redhat.com>
33
Date: Mon, 16 May 2022 16:04:27 +0200
4-
Subject: [PATCH 02/26] krunfw: Ignore run_cmd on orderly reboot
4+
Subject: [PATCH 02/32] krunfw: Ignore run_cmd on orderly reboot
55

66
We don't really support restarting the conventional way, so ignore
77
"run_cmd" so we can fall back to an emergency sync and reboot.
@@ -28,5 +28,5 @@ index f6947c5bd671..5925d8fcfbfa 100644
2828
if (ret) {
2929
pr_warn("Failed to start orderly reboot: forcing the issue\n");
3030
--
31-
2.52.0
31+
2.54.0
3232

patches/0003-vsock-dgram-generalize-recvmsg-and-drop-transport-dg.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 56ef3652b6666b91c1c66fa94aedac70a934bfb2 Mon Sep 17 00:00:00 2001
1+
From 8ca8db16da5001752ca7d782a60d9af85e7899b7 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:28 +0000
4-
Subject: [PATCH 03/26] vsock/dgram: generalize recvmsg and drop
4+
Subject: [PATCH 03/32] vsock/dgram: generalize recvmsg and drop
55
transport->dgram_dequeue
66

77
This commit drops the transport->dgram_dequeue callback and makes
@@ -348,5 +348,5 @@ index 6e78927a598e..3d5e05d8950f 100644
348348
.stream_dequeue = virtio_transport_stream_dequeue,
349349
.stream_enqueue = virtio_transport_stream_enqueue,
350350
--
351-
2.52.0
351+
2.54.0
352352

patches/0004-vsock-refactor-transport-lookup-code.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 385e0bdc508313f07f59bbe26cf91ed6d97eaf39 Mon Sep 17 00:00:00 2001
1+
From 0530d4f1e7c9112d492330d74bab3426ef4f5cf6 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:29 +0000
4-
Subject: [PATCH 04/26] vsock: refactor transport lookup code
4+
Subject: [PATCH 04/32] vsock: refactor transport lookup code
55

66
Introduce new reusable function vsock_connectible_lookup_transport()
77
that performs the transport lookup logic.
@@ -57,5 +57,5 @@ index fccb4761b8af..4a8f62e7520d 100644
5757
default:
5858
ret = -ESOCKTNOSUPPORT;
5959
--
60-
2.52.0
60+
2.54.0
6161

patches/0005-vsock-support-multi-transport-datagrams.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From 774a9ccd77a3adb0f736f3f2323bde3d0b06b210 Mon Sep 17 00:00:00 2001
1+
From 365643863f3166d827024d4b6067222a6453d015 Mon Sep 17 00:00:00 2001
22
From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
33
Date: Sat, 10 Jun 2023 00:58:30 +0000
4-
Subject: [PATCH 05/26] vsock: support multi-transport datagrams
4+
Subject: [PATCH 05/32] vsock: support multi-transport datagrams
55

66
This patch adds support for multi-transport datagrams.
77

@@ -304,5 +304,5 @@ index 3d5e05d8950f..9e9e124f8d2b 100644
304304
.dgram_allow = virtio_transport_dgram_allow,
305305
.dgram_get_cid = virtio_transport_dgram_get_cid,
306306
--
307-
2.52.0
307+
2.54.0
308308

0 commit comments

Comments
 (0)