Add riscv64 support

Co-authored-by: Sergio Lopez <slp@redhat.com> Signed-off-by: Xeonacid <h.dwwwwww@gmail.com>
Rebase on a v6.12.34 kernel
2025-06-30 13:41:55 +01:00 · 2025-06-26 21:17:17 -04:00 · 2025-06-25 22:20:21 -04:00 · 2025-06-12 11:44:57 +01:00
33 changed files with 6162 additions and 104 deletions
--- a/.github/workflows/cross-build-riscv64.yml
+++ b/.github/workflows/cross-build-riscv64.yml
@ -0,0 +1,17 @@
+name: Cross-build riscv64 kernel
+on: [pull_request, create]
+
+jobs:
+  build:
+    if: github.event_name == 'pull_request'
+    name: Cross-build riscv64 kernel
+    runs-on: ubuntu-latest
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: sudo apt-get install -y make gcc bc bison flex elfutils python3-pyelftools curl patch libelf-dev gcc-riscv64-linux-gnu
+
+      - name: Build riscv64 kernel
+        run: make ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu-
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,7 @@
 __pycache__
 *.pyc
 *~
-libkrunfw.so
+libkrunfw.so*
 kernel.c
 vmlinux
 /tarballs
--- a/36
+++ b/36
@ -1,4 +1,4 @@
-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)
@ -6,8 +6,8 @@ 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
@ -15,7 +15,11 @@ KERNEL_FLAGS += KBUILD_BUILD_HOST=libkrunfw

 ifeq ($(SEV),1)
    VARIANT = -sev
-    KERNEL_PATCHES += $(shell find patches-sev/ -name "0*.patch" | sort)
+    KERNEL_PATCHES += $(shell find patches-tee/ -name "0*.patch" | sort)
+endif
+ifeq ($(TDX),1)
+    VARIANT = -tdx
+    KERNEL_PATCHES += $(shell find patches-tee/ -name "0*.patch" | sort)
 endif

 HOSTARCH = $(shell uname -m)
@ -27,6 +31,10 @@ else ifeq ($(ARCH),arm64)
 	GUESTARCH := aarch64
 	CC := $(CROSS_COMPILE)gcc
 	STRIP := $(CROSS_COMPILE)strip
+else ifeq ($(ARCH),riscv)
+	GUESTARCH := riscv64
+	CC := $(CROSS_COMPILE)gcc
+	STRIP := $(CROSS_COMPILE)strip
 else
 	GUESTARCH := $(ARCH)
 	CC := $(CROSS_COMPILE)gcc
@ -35,9 +43,11 @@ endif

 KBUNDLE_TYPE_x86_64 = vmlinux
 KBUNDLE_TYPE_aarch64 = Image
+KBUNDLE_TYPE_riscv64 = Image

 KERNEL_BINARY_x86_64 = $(KERNEL_SOURCES)/vmlinux
 KERNEL_BINARY_aarch64 = $(KERNEL_SOURCES)/arch/arm64/boot/Image
+KERNEL_BINARY_riscv64 = $(KERNEL_SOURCES)/arch/riscv/boot/Image

 KRUNFW_BINARY_Linux = libkrunfw$(VARIANT).so.$(FULL_VERSION)
 KRUNFW_SONAME_Linux = libkrunfw$(VARIANT).so.$(ABI_VERSION)
@ -57,7 +67,13 @@ ifeq ($(PREFIX),)
 endif

 ifeq ($(SEV),1)
-    QBOOT_BINARY = qboot/bios.bin
+    QBOOT_BINARY = qboot/sev/bios.bin
+    QBOOT_C_BUNDLE = qboot.c
+    INITRD_BINARY = initrd/initrd.gz
+    INITRD_C_BUNDLE = initrd.c
+endif
+ifeq ($(TDX),1)
+    QBOOT_BINARY = qboot/tdx/bios.bin
    QBOOT_C_BUNDLE = qboot.c
    INITRD_BINARY = initrd/initrd.gz
    INITRD_C_BUNDLE = initrd.c
@ -100,6 +116,16 @@ $(INITRD_C_BUNDLE): $(INITRD_BINARY)
 	@python3 bin2cbundle.py -t initrd $(INITRD_BINARY) initrd.c
 endif

+ifeq ($(TDX),1)
+$(QBOOT_C_BUNDLE): $(QBOOT_BINARY)
+	@echo "Generating $(QBOOT_C_BUNDLE) from $(QBOOT_BINARY)..."
+	@python3 bin2cbundle.py -t qboot $(QBOOT_BINARY) qboot.c
+
+$(INITRD_C_BUNDLE): $(INITRD_BINARY)
+	@echo "Generating $(INITRD_C_BUNDLE) from $(INITRD_BINARY)..."
+	@python3 bin2cbundle.py -t initrd $(INITRD_BINARY) initrd.c
+endif
+
 $(KRUNFW_BINARY_$(OS)): $(KERNEL_C_BUNDLE) $(QBOOT_C_BUNDLE) $(INITRD_C_BUNDLE)
 	$(CC) -fPIC -DABI_VERSION=$(ABI_VERSION) -shared $(SONAME_$(OS)) -o $@ $(KERNEL_C_BUNDLE) $(QBOOT_C_BUNDLE) $(INITRD_C_BUNDLE)
 ifeq ($(OS),Linux)
--- a/2807
+++ b/2807
--- a/3206
+++ b/3206
--- a/8
+++ b/8
@ -1335,9 +1335,11 @@ CONFIG_BCMA_POSSIBLE=y
 #
 # Graphics support
 #
-# CONFIG_AUXDISPLAY is not set
-# CONFIG_DRM is not set
-# CONFIG_DRM_DEBUG_MODESET_LOCK is not set
+CONFIG_DRM=y
+CONFIG_DRM_KMS_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU_KMS=y

 #
 # Frame buffer Devices
--- a/patches-tee/0001-virtio-enable-DMA-API-if-memory-is-restricted.patch
+++ b/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

--- a/patches-tee/0002-x86-sev-write-AP-reset-vector.patch
+++ b/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

--- a/patches-tee/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch
+++ b/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

--- a/patches-tee/0004-x86-sev-Avoid-using-native_cpuid.patch
+++ b/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

--- 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 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

--- 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 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

--- 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 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

--- a/patches/0004-vsock-refactor-transport-lookup-code.patch
+++ b/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

--- a/patches/0005-vsock-support-multi-transport-datagrams.patch
+++ b/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

--- a/patches/0006-vsock-make-vsock-bind-reusable.patch
+++ b/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

--- 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 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

--- a/patches/0008-virtio-vsock-support-dgrams.patch
+++ b/patches/0008-virtio-vsock-support-dgrams.patch
@ -1,4 +1,4 @@
-From a2268ce05b7de1ed4e970cbbe7390691e541eff2 Mon Sep 17 00:00:00 2001
+From 11edfc45450ed7eb5e4478352b8a4a2d3d917edd Mon Sep 17 00:00:00 2001
 From: Bobby Eshleman <bobby.eshleman () bytedance ! com>
 Date: Sat, 10 Jun 2023 00:58:33 +0000
 Subject: [PATCH 08/21] virtio/vsock: support dgrams
@ -112,10 +112,10 @@ index d58be350ddca..e5469c367a0f 100644
 		vq = &vsock->vqs[i];
 		mutex_lock(&vq->mutex);
 diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
-index 741d643534f4..bd6864bc82a3 100644
+index efb028ea6463..9e9287933fc0 100644
 --- a/include/linux/virtio_vsock.h
 +++ b/include/linux/virtio_vsock.h
-@@ -232,7 +232,6 @@ void virtio_transport_notify_buffer_size(struct vsock_sock *vsk, u64 *val);
+@@ -233,7 +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);
@ -123,7 +123,7 @@ index 741d643534f4..bd6864bc82a3 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);
 int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len);
-@@ -264,4 +263,8 @@ void virtio_transport_deliver_tap_pkt(struct sk_buff *skb);
+@@ -265,4 +264,8 @@ void virtio_transport_deliver_tap_pkt(struct sk_buff *skb);
 int virtio_transport_purge_skbs(void *vsk, struct sk_buff_head *list);
 int virtio_transport_read_skb(struct vsock_sock *vsk, skb_read_actor_t read_actor);
 int virtio_transport_notify_set_rcvlowat(struct vsock_sock *vsk, int val);
@ -157,7 +157,7 @@ index 9c25f267bbc0..27b4b2b8bf13 100644
 
 enum virtio_vsock_op {
 diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 6d8d9a91c510..6c4a065a8f70 100644
+index 68f7bc0c771a..cf8cb43922ba 100644
 --- a/net/vmw_vsock/af_vsock.c
 +++ b/net/vmw_vsock/af_vsock.c
@@ -118,6 +118,7 @@ static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
@ -349,7 +349,7 @@ index a50c678ae1ae..b3565bf5c8f7 100644
 
 static struct virtio_driver virtio_vsock_driver = {
 diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
-index 0cebeeb1c94a..5cd569dae7ca 100644
+index 96b6303b24c2..0cb9261e433d 100644
 --- a/net/vmw_vsock/virtio_transport_common.c
 +++ b/net/vmw_vsock/virtio_transport_common.c
@@ -136,6 +136,35 @@ static void virtio_transport_init_hdr(struct sk_buff *skb,
@ -399,7 +399,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 		return VIRTIO_VSOCK_TYPE_STREAM;
 	else
 		return VIRTIO_VSOCK_TYPE_SEQPACKET;
-@@ -836,14 +867,30 @@ virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk,
+@@ -840,14 +871,30 @@ virtio_transport_seqpacket_enqueue(struct vsock_sock *vsk,
 }
 EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_enqueue);
 
@ -436,7 +436,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 
 s64 virtio_transport_stream_has_data(struct vsock_sock *vsk)
 {
-@@ -1043,30 +1090,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
+@@ -1047,30 +1094,6 @@ bool virtio_transport_stream_allow(u32 cid, u32 port)
 }
 EXPORT_SYMBOL_GPL(virtio_transport_stream_allow);
 
@ -467,7 +467,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 int virtio_transport_connect(struct vsock_sock *vsk)
 {
 	struct virtio_vsock_pkt_info info = {
-@@ -1099,7 +1122,33 @@ virtio_transport_dgram_enqueue(struct vsock_sock *vsk,
+@@ -1103,7 +1126,33 @@ virtio_transport_dgram_enqueue(struct vsock_sock *vsk,
 			       struct msghdr *msg,
 			       size_t dgram_len)
 {
@ -502,7 +502,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 }
 EXPORT_SYMBOL_GPL(virtio_transport_dgram_enqueue);
 
-@@ -1172,6 +1221,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
+@@ -1176,6 +1225,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
 		.reply = true,
 	};
 	struct sk_buff *reply;
@ -510,7 +510,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 
 	/* Send RST only if the original pkt is not a RST pkt */
 	if (le16_to_cpu(hdr->op) == VIRTIO_VSOCK_OP_RST)
-@@ -1186,7 +1236,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
+@@ -1190,7 +1240,7 @@ static int virtio_transport_reset_no_sock(const struct virtio_transport *t,
 					   le64_to_cpu(hdr->src_cid),
 					   le32_to_cpu(hdr->src_port));
 	if (!reply)
@ -519,7 +519,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 
 	return t->send_pkt(reply);
 }
-@@ -1414,6 +1464,21 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
+@@ -1418,6 +1468,21 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
 		kfree_skb(skb);
 }
 
@ -541,7 +541,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 static int
 virtio_transport_recv_connected(struct sock *sk,
 				struct sk_buff *skb)
-@@ -1591,7 +1656,8 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
+@@ -1595,7 +1660,8 @@ virtio_transport_recv_listen(struct sock *sk, struct sk_buff *skb,
 static bool virtio_transport_valid_type(u16 type)
 {
 	return (type == VIRTIO_VSOCK_TYPE_STREAM) ||
@ -551,7 +551,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 }
 
 /* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex
-@@ -1605,40 +1671,52 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1609,40 +1675,52 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
 	struct vsock_sock *vsk;
 	struct sock *sk;
 	bool space_available;
@ -614,7 +614,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 		sock_put(sk);
 		goto free_pkt;
 	}
-@@ -1657,12 +1735,18 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1661,12 +1739,18 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
 	 */
 	if (sock_flag(sk, SOCK_DONE) ||
 	    (sk->sk_state != TCP_LISTEN && vsk->transport != &t->transport)) {
@ -634,7 +634,7 @@ index 0cebeeb1c94a..5cd569dae7ca 100644
 	space_available = virtio_transport_space_update(sk, skb);
 
 	/* Update CID in case it has changed after a transport reset event */
-@@ -1694,6 +1778,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
+@@ -1698,6 +1782,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
 		break;
 	}
 
@ -676,5 +676,5 @@ index 9e9e124f8d2b..b3066c854bb9 100644
 {
 	return true;
 -- 
-2.47.1
+2.49.0

--- a/patches/0009-Transparent-Socket-Impersonation-implementation.patch
+++ b/patches/0009-Transparent-Socket-Impersonation-implementation.patch
@ -1,4 +1,4 @@
-From 62b9c45c773a76ad4e1388c46cb4cde20bb26874 Mon Sep 17 00:00:00 2001
+From e65e052341afe0e53a64e380cf48fd51ee061053 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 19 May 2022 22:38:26 +0200
 Subject: [PATCH 09/21] Transparent Socket Impersonation implementation
@ -1545,5 +1545,5 @@ index 7229c9bf6c27..065d9b85693f 100644
 #error New address family defined, please update secclass_map.
 #endif
 -- 
-2.47.1
+2.49.0

--- a/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch
+++ b/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch
@ -1,4 +1,4 @@
-From eb0cd5fc92f61469853543db7db6db9cb36aec21 Mon Sep 17 00:00:00 2001
+From 522e468a0680c0242172ccb1dd336224b5391594 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Thu, 19 May 2022 22:42:01 +0200
 Subject: [PATCH 10/21] tsi: allow hijacking sockets (tsi_hijack)
@ -69,5 +69,5 @@ index f43a17cff3a3..ef1552862253 100644
 	int err;
 
 -- 
-2.47.1
+2.49.0

--- a/patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch
+++ b/patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch
@ -1,4 +1,4 @@
-From ae378f0539b60aad8fd028377489fdc31d5d03c4 Mon Sep 17 00:00:00 2001
+From 6cd6813018d12ecf1da19b5101c041ea7d1cab34 Mon Sep 17 00:00:00 2001
 From: Asahi Lina <lina@asahilina.net>
 Date: Wed, 25 Sep 2024 16:35:34 +0200
 Subject: [PATCH 11/21] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late
@ -35,10 +35,10 @@ Signed-off-by: Asahi Lina <lina@asahilina.net>
 1 file changed, 31 insertions(+), 3 deletions(-)

 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
-index 709f2b51be6d..da0fed77220f 100644
+index 05ccf4ec278f..ab0b8ab2e72b 100644
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c
-@@ -3169,10 +3169,38 @@ static void update_cpu_capabilities(u16 scope_mask)
+@@ -3176,10 +3176,38 @@ static void update_cpu_capabilities(u16 scope_mask)
 
 	scope_mask &= ARM64_CPUCAP_SCOPE_MASK;
 	for (i = 0; i < ARM64_NCAPS; i++) {
@ -81,5 +81,5 @@ index 709f2b51be6d..da0fed77220f 100644
 
 		if (caps->desc && !caps->cpus)
 -- 
-2.47.1
+2.49.0

--- a/patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch
+++ b/patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch
@ -1,4 +1,4 @@
-From ca9ab4175d5a9b6a7e781ffd871221ebb4c7c83f Mon Sep 17 00:00:00 2001
+From 0ee81bb453100f4d329846ef3205c7256da0fd1d Mon Sep 17 00:00:00 2001
 From: Hector Martin <marcan@marcan.st>
 Date: Thu, 11 Apr 2024 09:51:20 +0900
 Subject: [PATCH 12/21] prctl: Introduce PR_{SET,GET}_MEM_MODEL
@ -119,5 +119,5 @@ index 4da31f28fda8..83da58930513 100644
 		error = -EINVAL;
 		break;
 -- 
-2.47.1
+2.49.0

--- a/patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch
+++ b/patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch
@ -1,4 +1,4 @@
-From 1bdcbb921561f905a4053f1261206a7c4df9e7c4 Mon Sep 17 00:00:00 2001
+From 8d3fb19fd331e7d6032eedf3aea6f50ae145c253 Mon Sep 17 00:00:00 2001
 From: Hector Martin <marcan@marcan.st>
 Date: Thu, 11 Apr 2024 09:51:21 +0900
 Subject: [PATCH 13/21] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO
@ -27,7 +27,7 @@ Reviewed-by: Neal Gompa <neal@gompa.dev>
 create mode 100644 arch/arm64/kernel/cpufeature_impdef.c

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index a11a7a42edbf..dee1e752cf55 100644
+index 7887d18cce3e..ab6ecb52a73d 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -2261,6 +2261,15 @@ config ARM64_DEBUG_PRIORITY_MASKING
@ -76,10 +76,10 @@ index 2b112f3b7510..2a11cdefbe04 100644
 obj-$(CONFIG_COMPAT)			+= sys32.o signal32.o			\
 					   sys_compat.o
 diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
-index da0fed77220f..e3a933f6b44b 100644
+index ab0b8ab2e72b..4bd0c9641f3a 100644
 --- a/arch/arm64/kernel/cpufeature.c
 +++ b/arch/arm64/kernel/cpufeature.c
-@@ -1032,7 +1032,7 @@ static void init_cpu_ftr_reg(u32 sys_reg, u64 new)
+@@ -1039,7 +1039,7 @@ static void init_cpu_ftr_reg(u32 sys_reg, u64 new)
 extern const struct arm64_cpu_capabilities arm64_errata[];
 static const struct arm64_cpu_capabilities arm64_features[];
 
@ -88,7 +88,7 @@ index da0fed77220f..e3a933f6b44b 100644
 init_cpucap_indirect_list_from_array(const struct arm64_cpu_capabilities *caps)
 {
 	for (; caps->matches; caps++) {
-@@ -1531,8 +1531,8 @@ has_always(const struct arm64_cpu_capabilities *entry, int scope)
+@@ -1538,8 +1538,8 @@ has_always(const struct arm64_cpu_capabilities *entry, int scope)
 	return true;
 }
 
@ -99,7 +99,7 @@ index da0fed77220f..e3a933f6b44b 100644
 {
 	int val, min, max;
 	u64 tmp;
-@@ -1585,14 +1585,14 @@ has_user_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
+@@ -1592,14 +1592,14 @@ has_user_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)
 	if (!mask)
 		return false;
 
@ -116,7 +116,7 @@ index da0fed77220f..e3a933f6b44b 100644
 }
 
 const struct cpumask *system_32bit_el0_cpumask(void)
-@@ -3548,6 +3548,7 @@ void __init setup_boot_cpu_features(void)
+@@ -3555,6 +3555,7 @@ void __init setup_boot_cpu_features(void)
 	 * handle the boot CPU.
 	 */
 	init_cpucap_indirect_list();
@ -230,5 +230,5 @@ index eedb5acc21ed..bca63481e0cf 100644
 HAS_VIRT_HOST_EXTN
 HAS_WFXT
 -- 
-2.47.1
+2.49.0

--- a/patches/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch
+++ b/patches/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch
@ -1,4 +1,4 @@
-From 4fefb67da29d15570cf319c9e8ea5e392af425a1 Mon Sep 17 00:00:00 2001
+From 53a222e5421780174a29fe6cb18d78e3a959d5d6 Mon Sep 17 00:00:00 2001
 From: Hector Martin <marcan@marcan.st>
 Date: Thu, 11 Apr 2024 09:51:22 +0900
 Subject: [PATCH 14/21] arm64: Introduce scaffolding to add ACTLR_EL1 to thread
@ -24,7 +24,7 @@ Reviewed-by: Neal Gompa <neal@gompa.dev>
 5 files changed, 44 insertions(+)

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index dee1e752cf55..7023615aac6e 100644
+index ab6ecb52a73d..a30f30fd7e67 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -428,6 +428,9 @@ config KASAN_SHADOW_OFFSET
@ -137,5 +137,5 @@ index 87f61fd6783c..8fb0c20959bf 100644
 	if (boot_args[1] || boot_args[2] || boot_args[3]) {
 		pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n"
 -- 
-2.47.1
+2.49.0

--- a/patches/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch
+++ b/patches/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch
@ -1,4 +1,4 @@
-From 78d9a1696fcb4f5798de6163c15ff73ee746ca1d Mon Sep 17 00:00:00 2001
+From 0516cf426ccdb7529eb1365ae6a4bad639ca10bf Mon Sep 17 00:00:00 2001
 From: Hector Martin <marcan@marcan.st>
 Date: Thu, 11 Apr 2024 09:51:23 +0900
 Subject: [PATCH 15/21] arm64: Implement Apple IMPDEF TSO memory model control
@ -27,7 +27,7 @@ Reviewed-by: Neal Gompa <neal@gompa.dev>
 create mode 100644 arch/arm64/include/asm/apple_cpufeature.h

 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 7023615aac6e..c90800ec7097 100644
+index a30f30fd7e67..01a421166a0c 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
@@ -2266,6 +2266,8 @@ endif # ARM64_PSEUDO_NMI
@ -208,5 +208,5 @@ index bca63481e0cf..8b809992a9ee 100644
 HAS_VA52
 HAS_VIRT_HOST_EXTN
 -- 
-2.47.1
+2.49.0

--- a/patches/0016-drm-virtio-Support-fence-passing-feature.patch
+++ b/patches/0016-drm-virtio-Support-fence-passing-feature.patch
@ -1,4 +1,4 @@
-From 6361dc5e5abd5fe983ae4b7c9ea9c3f3f2a94316 Mon Sep 17 00:00:00 2001
+From a109de3759b7d022692cc05b80cca896a463db62 Mon Sep 17 00:00:00 2001
 From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
 Date: Sat, 7 Oct 2023 22:47:47 +0300
 Subject: [PATCH 16/21] drm/virtio: Support fence-passing feature
@ -450,5 +450,5 @@ index bf2c9cabd207..ceb656264aa0 100644
 
 #define VIRTIO_GPU_CAPSET_VIRGL 1
 -- 
-2.47.1
+2.49.0

--- a/patches/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch
+++ b/patches/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch
@ -1,4 +1,4 @@
-From cc1a30862f3cf046bf75f750e07e0601e5796238 Mon Sep 17 00:00:00 2001
+From 7c3e268f22043f1a672f3964781c75acd56b816d Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Tue, 8 Oct 2024 11:24:25 +0200
 Subject: [PATCH 17/21] Enable 64 bit processes to use compat input syscalls
@ -120,5 +120,5 @@ index 83da58930513..24dd021a1592 100644
 		error = -EINVAL;
 		break;
 -- 
-2.47.1
+2.49.0

--- a/patches/0018-dax-Allow-block-size-PAGE_SIZE.patch
+++ b/patches/0018-dax-Allow-block-size-PAGE_SIZE.patch
@ -1,4 +1,4 @@
-From 46d62d4ef2fba354a72f685bbfdab381d1dbe61d Mon Sep 17 00:00:00 2001
+From 618802e746e0fcec7295bb499562e6182202cfe8 Mon Sep 17 00:00:00 2001
 From: Asahi Lina <lina@asahilina.net>
 Date: Sun, 20 Oct 2024 01:23:41 +0900
 Subject: [PATCH 18/21] dax: Allow block size > PAGE_SIZE
@ -35,5 +35,5 @@ index 21b47402b3dc..b0950164d8ee 100644
 
 	if (mapping_empty(mapping) || wbc->sync_mode != WB_SYNC_ALL)
 -- 
-2.47.1
+2.49.0

--- a/patches/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch
+++ b/patches/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch
@ -1,4 +1,4 @@
-From f73098e15ee9aaf89403bd5a41c1dc79ddbdd85e Mon Sep 17 00:00:00 2001
+From e328dffff1c65e4483453e0300375a334f4a6f9c Mon Sep 17 00:00:00 2001
 From: Asahi Lina <lina@asahilina.net>
 Date: Mon, 21 Oct 2024 23:21:16 +0900
 Subject: [PATCH 19/21] mm: Fix __wp_page_copy_user fallback path for remote mm
@ -58,10 +58,10 @@ Signed-off-by: Asahi Lina <lina@asahilina.net>
 1 file changed, 6 insertions(+), 1 deletion(-)

 diff --git a/mm/memory.c b/mm/memory.c
-index 525f96ad65b8..cfd73a1531a5 100644
+index b6daa0e673a5..52ce79cc238d 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -3083,13 +3083,18 @@ static inline int __wp_page_copy_user(struct page *dst, struct page *src,
+@@ -3080,13 +3080,18 @@ static inline int __wp_page_copy_user(struct page *dst, struct page *src,
 			update_mmu_cache_range(vmf, vma, addr, vmf->pte, 1);
 	}
 
@ -82,5 +82,5 @@ index 525f96ad65b8..cfd73a1531a5 100644
 			goto warn;
 
 -- 
-2.47.1
+2.49.0

--- a/patches/0020-virtgpu-gem-partial-map.patch
+++ b/patches/0020-virtgpu-gem-partial-map.patch
@ -1,4 +1,4 @@
-From 368a606185e6bb276747c90d0127e471f9457771 Mon Sep 17 00:00:00 2001
+From c83a0290dee16856d070084d9a1026fe0881bb1d Mon Sep 17 00:00:00 2001
 From: Sasha Finkelstein <fnkl.kernel@gmail.com>
 Date: Fri, 17 Jan 2025 12:34:23 +0100
 Subject: [PATCH 20/21] virtgpu: gem partial map
@ -30,5 +30,5 @@ index 25df81c02783..64e2c6dbdd67 100644
 	return ret;
 }
 -- 
-2.47.1
+2.49.0

--- a/patches/0021-virtgpu-mixed-page-size.patch
+++ b/patches/0021-virtgpu-mixed-page-size.patch
@ -1,4 +1,4 @@
-From bccabda5868107eb02c38322c7b79161f5e27511 Mon Sep 17 00:00:00 2001
+From 703a11fd69a51cdc20adb2866e359c20ebcfaaaf Mon Sep 17 00:00:00 2001
 From: Sasha Finkelstein <fnkl.kernel@gmail.com>
 Date: Fri, 17 Jan 2025 12:34:28 +0100
 Subject: [PATCH 21/21] virtgpu: mixed page size
@ -40,5 +40,5 @@ index 64e2c6dbdd67..cbadcba2c773 100644
 
 	if (ret)
 -- 
-2.47.1
+2.49.0

--- a/qboot/sev/bios.bin
+++ b/qboot/sev/bios.bin
--- a/qboot/tdx/bios.bin
+++ b/qboot/tdx/bios.bin
Author	SHA1	Message	Date
Xeonacid	79d9ff95eb	Add riscv64 support Co-authored-by: Sergio Lopez <slp@redhat.com> Signed-off-by: Xeonacid <h.dwwwwww@gmail.com>	2025-06-30 13:41:55 +01:00
Sergio Lopez	3d07dc3482	Rebase on a v6.12.34 kernel Rebase on the latest stable kernel. No changes were needed in the downstream patches. Signed-off-by: Sergio Lopez <slp@redhat.com>	2025-06-26 21:17:17 -04:00
Sergio Lopez	e2bbc35b0e	x86_64: enable VIRTIO_GPU Enable VIRTIO_GPU to support GPU acceleration on x86_64 hosts too. Signed-off-by: Sergio Lopez <slp@redhat.com>	2025-06-25 22:20:21 -04:00
Jake Correnti	a70c65d97e	Add TDX support Adds support for a TDX flavor. Additionally adjusts the qboot binary locations such that SEV has a different binary than TDX. Signed-off-by: Jake Correnti <jakecorrenti+github@proton.me>	2025-06-12 11:44:57 +01:00