Rebase on a v6.12.34 kernel

Makefile

@@ -1,13 +1,13 @@
-KERNEL_VERSION = linux-6.12.20
+KERNEL_VERSION = linux-6.12.34
 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 = 4
-FULL_VERSION = 4.9.0
-TIMESTAMP = "Mon Mar 24 03:50:01 PM CET 2025"
+FULL_VERSION = 4.10.0
+TIMESTAMP = "Thu Jun 26 12:45:10 CEST 2025"
 
 KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP)
 KERNEL_FLAGS += KBUILD_BUILD_USER=root

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

@@ -1,4 +1,4 @@
-From 0f7bfee47191d977261c293b878a1b719aa36ca7 Mon Sep 17 00:00:00 2001
+From c1c7696bb15ad96da859c15acc6ffe6d7b8d71ab Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@sinrega.org>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted
@@ -32,7 +32,7 @@ index b9095751e43b..9e6420d5bc66 100644
 
  	if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1))
 diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
-index 0112742e4504..84bfe596405f 100644
+index 147926c8bae0..87fd943cafa3 100644
 --- a/drivers/virtio/virtio_ring.c
 +++ b/drivers/virtio/virtio_ring.c
 @@ -6,6 +6,7 @@
@@ -54,5 +54,5 @@ index 0112742e4504..84bfe596405f 100644
  	/*
  	 * In theory, it's possible to have a buggy QEMU-supposed
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 0c7204daf3df47a35126239bd525e633f49f8a8d Mon Sep 17 00:00:00 2001
+From eb4f5e615e0a6e75515449253e4014812b8008cf Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 20 Oct 2022 10:23:16 +0200
 Subject: [PATCH 2/4] x86/sev: write AP reset vector
@@ -55,5 +55,5 @@ index de1df0cb45da..7ed486a790fb 100644
  	/* Check if AP Jump Table is page-aligned */
  	if (jump_table_addr & ~PAGE_MASK)
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 913e69fef12b332d96fadefbe8489574d5b1844f Mon Sep 17 00:00:00 2001
+From 3cf48a7455f13e02f080cbbecf87f86a59b82ea7 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Wed, 3 Aug 2022 12:35:12 +0200
 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline
@@ -290,5 +290,5 @@ index c4778edae797..a475bd3bcb34 100644
 
  /*
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From a5ac2bb45f25c15fd381af7930e3eb706125c8ff Mon Sep 17 00:00:00 2001
+From f4fa2d46824f4704ade2c6d1d42b8e1fa9eb8e4a Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Wed, 5 Jun 2024 16:20:08 +0200
 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid
@@ -16,7 +16,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  1 file changed, 3 insertions(+), 23 deletions(-)
 
 diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
-index ac33b2263a43..d894fdb89007 100644
+index b922b9fea6b6..c0de732b0121 100644
 --- a/arch/x86/mm/mem_encrypt_identity.c
 +++ b/arch/x86/mm/mem_encrypt_identity.c
 @@ -495,37 +495,17 @@ void __head sme_enable(struct boot_params *bp)
@@ -61,5 +61,5 @@ index ac33b2263a43..d894fdb89007 100644
  	/* Check the SEV MSR whether SEV or SME is enabled */
  	RIP_REL_REF(sev_status) = msr = __rdmsr(MSR_AMD64_SEV);
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From c88ba6301ded113877dad3ea177361319821bcb3 Mon Sep 17 00:00:00 2001
+From 2b3f8ccfb19e97f1ac92c1c1c7525ddac4477c52 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 2 Mar 2023 07:34:49 +0100
 Subject: [PATCH 01/21] krunfw: Don't panic when init dies
@@ -16,7 +16,7 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  2 files changed, 8 insertions(+)
 
 diff --git a/kernel/exit.c b/kernel/exit.c
-index 619f0014c33b..987bec96ebee 100644
+index 56b8bd9487b4..6e65dcb5f9dd 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -69,6 +69,8 @@
@@ -42,7 +42,7 @@ index 619f0014c33b..987bec96ebee 100644
  #ifdef CONFIG_POSIX_TIMERS
  		hrtimer_cancel(&tsk->signal->real_timer);
 diff --git a/kernel/reboot.c b/kernel/reboot.c
-index f05dbde2c93f..f047bde90c03 100644
+index d6ee090eda94..f6947c5bd671 100644
 --- a/kernel/reboot.c
 +++ b/kernel/reboot.c
 @@ -278,10 +278,12 @@ void kernel_restart(char *cmd)
@@ -59,5 +59,5 @@ index f05dbde2c93f..f047bde90c03 100644
  	machine_restart(cmd);
  }
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From c102dfd9bc07e862fb91c5c4abb83dec6e5a73ea Mon Sep 17 00:00:00 2001
+From 032a1c9438576fd209739d2f522cbe0966cadcbd Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Mon, 16 May 2022 16:04:27 +0200
 Subject: [PATCH 02/21] krunfw: Ignore run_cmd on orderly reboot
@@ -12,10 +12,10 @@ Signed-off-by: Sergio Lopez <slp@redhat.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/kernel/reboot.c b/kernel/reboot.c
-index f047bde90c03..aeea51201f90 100644
+index f6947c5bd671..5925d8fcfbfa 100644
 --- a/kernel/reboot.c
 +++ b/kernel/reboot.c
-@@ -852,7 +852,11 @@ static int __orderly_reboot(void)
+@@ -853,7 +853,11 @@ static int __orderly_reboot(void)
  {
  	int ret;
 
@@ -28,5 +28,5 @@ index f047bde90c03..aeea51201f90 100644
  	if (ret) {
  		pr_warn("Failed to start orderly reboot: forcing the issue\n");
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From fb7f60dde652bfc90b9e8b6656a9d0923c2c288b Mon Sep 17 00:00:00 2001
+From cd8a65ac0e41402e57e680a13cfa4bee3d55101e Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:28 +0000
 Subject: [PATCH 03/21] vsock/dgram: generalize recvmsg and drop
@@ -40,10 +40,10 @@ index 802153e23073..1b3e6963335b 100644
  		.stream_enqueue           = virtio_transport_stream_enqueue,
  		.stream_dequeue           = virtio_transport_stream_dequeue,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 0387d64e2c66..954c5d66f8e4 100644
+index 36fb3edfa403..44fb05e1ee75 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
-@@ -235,6 +235,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port);
+@@ -236,6 +236,9 @@ bool virtio_transport_stream_allow(u32 cid, u32 port);
  int virtio_transport_dgram_bind(struct vsock_sock *vsk,
  				struct sockaddr_vm *addr);
  bool virtio_transport_dgram_allow(u32 cid, u32 port);
@@ -81,7 +81,7 @@ index 9e85424c8343..fe0fb5c01823 100644
  	/* STREAM. */
  	/* TODO: stream_bind() */
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index eb6ea26b390e..6dc98fab6888 100644
+index d08f205b33dc..3ba57d2339a3 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -1324,10 +1324,62 @@ static int vsock_dgram_connect(struct socket *sock,
@@ -203,10 +203,10 @@ index f0e48e6911fc..c0d4f6e47cb7 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 7f7de6d88096..17e8f2078e8d 100644
+index 2c9b1011cdcc..ad4dedcfa320 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
-@@ -1050,6 +1050,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
+@@ -1054,6 +1054,24 @@ int virtio_transport_dgram_bind(struct vsock_sock *vsk,
  }
  EXPORT_SYMBOL_GPL(virtio_transport_dgram_bind);
 
@@ -348,5 +348,5 @@ index 6e78927a598e..3d5e05d8950f 100644
  		.stream_dequeue           = virtio_transport_stream_dequeue,
  		.stream_enqueue           = virtio_transport_stream_enqueue,
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 4c239c0f574faad311a0339e52596fe2af98a210 Mon Sep 17 00:00:00 2001
+From 7b1488e5e1e6de64b764544609f745ebe24f5aa0 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:29 +0000
 Subject: [PATCH 04/21] vsock: refactor transport lookup code
@@ -14,7 +14,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 6dc98fab6888..ef5ac5beca32 100644
+index 3ba57d2339a3..186e28329dd4 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -430,6 +430,22 @@ static void vsock_deassign_transport(struct vsock_sock *vsk)
@@ -57,5 +57,5 @@ index 6dc98fab6888..ef5ac5beca32 100644
  	default:
  		return -ESOCKTNOSUPPORT;
 -- 
-2.47.1
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 764265f7d0ecc0c5077783058369ab1a1711fb42 Mon Sep 17 00:00:00 2001
+From 07e9d1bdd10dc2a484a5d3b421efe184d05b4ddb Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:30 +0000
 Subject: [PATCH 05/21] vsock: support multi-transport datagrams
@@ -69,10 +69,10 @@ index 1b3e6963335b..d58be350ddca 100644
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
  		.dgram_get_port		  = virtio_transport_dgram_get_port,
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 954c5d66f8e4..741d643534f4 100644
+index 44fb05e1ee75..efb028ea6463 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
-@@ -232,8 +232,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
+@@ -233,8 +233,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
  u64 virtio_transport_stream_rcvhiwat(struct vsock_sock *vsk);
  bool virtio_transport_stream_is_active(struct vsock_sock *vsk);
  bool virtio_transport_stream_allow(u32 cid, u32 port);
@@ -82,7 +82,7 @@ index 954c5d66f8e4..741d643534f4 100644
  int virtio_transport_dgram_get_cid(struct sk_buff *skb, unsigned int *cid);
  int virtio_transport_dgram_get_port(struct sk_buff *skb, unsigned int *port);
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index ef5ac5beca32..c017b62d0783 100644
+index 186e28329dd4..8112fd22218b 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -446,6 +446,18 @@ vsock_connectible_lookup_transport(unsigned int cid, __u8 flags)
@@ -274,10 +274,10 @@ index c0d4f6e47cb7..a50c678ae1ae 100644
  		.dgram_allow              = virtio_transport_dgram_allow,
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 17e8f2078e8d..0cebeeb1c94a 100644
+index ad4dedcfa320..96b6303b24c2 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
-@@ -1043,13 +1043,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
+@@ -1047,13 +1047,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
  }
  EXPORT_SYMBOL_GPL(virtio_transport_stream_allow);
 
@@ -304,5 +304,5 @@ index 3d5e05d8950f..9e9e124f8d2b 100644
  		.dgram_allow              = virtio_transport_dgram_allow,
  		.dgram_get_cid		  = virtio_transport_dgram_get_cid,
 -- 
-2.47.1
+2.49.0
 

patches/0006-vsock-make-vsock-bind-reusable.patch

@@ -1,4 +1,4 @@
-From 9259e6e9217c5dd64ba02e28145a5b6ee6cf74ca Mon Sep 17 00:00:00 2001
+From ca7e3bce7612e1eba6e16ee8a831c32764fc1ec3 Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:31 +0000
 Subject: [PATCH 06/21] vsock: make vsock bind reusable
@@ -12,7 +12,7 @@ Signed-off-by: Bobby Eshleman <bobby.eshleman@bytedance.com>
  1 file changed, 26 insertions(+), 7 deletions(-)
 
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index c017b62d0783..6d8d9a91c510 100644
+index 8112fd22218b..68f7bc0c771a 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
 @@ -235,11 +235,12 @@ static void __vsock_remove_connected(struct vsock_sock *vsk)
@@ -102,5 +102,5 @@ index c017b62d0783..6d8d9a91c510 100644
  			      struct sockaddr_vm *addr)
  {
 -- 
-2.47.1
+2.49.0
 

patches/0007-virtio-vsock-add-VIRTIO_VSOCK_F_DGRAM-feature-bit.patch

@@ -1,4 +1,4 @@
-From c9a7d599109ccfbee9bea258fda3191f95820bd9 Mon Sep 17 00:00:00 2001
+From a12028232381a2ab434130526d20c99d1f13a8cc Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:32 +0000
 Subject: [PATCH 07/21] 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.47.1
+2.49.0