diff --git a/Makefile b/Makefile index 14b8d99..49288b2 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort) KERNEL_C_BUNDLE = kernel.c ABI_VERSION = 5 -FULL_VERSION = 5.4.0 -TIMESTAMP = "Fri May 8 14:25:15 CEST 2026" +FULL_VERSION = 5.4.1 +TIMESTAMP = "Mon May 18 08:49:58 CEST 2026" KERNEL_FLAGS = KBUILD_BUILD_TIMESTAMP=$(TIMESTAMP) KERNEL_FLAGS += KBUILD_BUILD_USER=root diff --git 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 index 0621115..44961a1 100644 --- 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 ff5dbd901b0688a006fafcba07449d4a116b7317 Mon Sep 17 00:00:00 2001 +From 1b8951549a0a2f83eaad338de50b91294cfbeb13 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Fri, 10 Sep 2021 13:05:01 +0200 Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted diff --git a/patches-tee/0002-x86-sev-write-AP-reset-vector.patch b/patches-tee/0002-x86-sev-write-AP-reset-vector.patch index bcb5d27..f4f541e 100644 --- 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 dd2119161ec3510a5ca2946dcadd5043f19ff4ed Mon Sep 17 00:00:00 2001 +From a8f382f4f103c2b8407877982c3259d95bc32a01 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 20 Oct 2022 10:23:16 +0200 Subject: [PATCH 2/4] x86/sev: write AP reset vector diff --git a/patches-tee/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch b/patches-tee/0003-Implement-driver-to-retrieve-secrets-from-cmdline.patch index 707ce06..e874dd1 100644 --- 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 45bce0f81b5111fac6e6979a8709e8bd87661ef4 Mon Sep 17 00:00:00 2001 +From 4147420d99395414ccf3daa60c83462d21246a03 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 3 Aug 2022 12:35:12 +0200 Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline diff --git a/patches-tee/0004-x86-sev-Avoid-using-native_cpuid.patch b/patches-tee/0004-x86-sev-Avoid-using-native_cpuid.patch index bab05b0..7d9144b 100644 --- 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 126c045600e62f2e1bda8568cee52de30b6d0aff Mon Sep 17 00:00:00 2001 +From 9929b02ac95570117dc150386109a2a23538ceba Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Wed, 5 Jun 2024 16:20:08 +0200 Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid 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 2b0c15b..c492159 100644 --- a/patches/0001-krunfw-Don-t-panic-when-init-dies.patch +++ b/patches/0001-krunfw-Don-t-panic-when-init-dies.patch @@ -1,7 +1,7 @@ From db20a79e5810bc9fc77655acde5c8e13e7942ba9 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 2 Mar 2023 07:34:49 +0100 -Subject: [PATCH 01/32] krunfw: Don't panic when init dies +Subject: [PATCH 01/34] krunfw: Don't panic when init dies In libkrun, the isolated process runs as PID 1. When it exits, trigger an orderly reboot instead of panic'ing. 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 c9be62a..7e8b8fd 100644 --- a/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch +++ b/patches/0002-krunfw-Ignore-run_cmd-on-orderly-reboot.patch @@ -1,7 +1,7 @@ From 2e7df3e03121c97e16bb72de31e8b5ba9908971a Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Mon, 16 May 2022 16:04:27 +0200 -Subject: [PATCH 02/32] krunfw: Ignore run_cmd on orderly reboot +Subject: [PATCH 02/34] krunfw: Ignore run_cmd on orderly reboot We don't really support restarting the conventional way, so ignore "run_cmd" so we can fall back to an emergency sync and reboot. 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 e2ebe07..1009700 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,7 +1,7 @@ From 8ca8db16da5001752ca7d782a60d9af85e7899b7 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:28 +0000 -Subject: [PATCH 03/32] vsock/dgram: generalize recvmsg and drop +Subject: [PATCH 03/34] vsock/dgram: generalize recvmsg and drop transport->dgram_dequeue This commit drops the transport->dgram_dequeue callback and makes diff --git a/patches/0004-vsock-refactor-transport-lookup-code.patch b/patches/0004-vsock-refactor-transport-lookup-code.patch index b9a0afa..bcc6798 100644 --- a/patches/0004-vsock-refactor-transport-lookup-code.patch +++ b/patches/0004-vsock-refactor-transport-lookup-code.patch @@ -1,7 +1,7 @@ From 0530d4f1e7c9112d492330d74bab3426ef4f5cf6 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:29 +0000 -Subject: [PATCH 04/32] vsock: refactor transport lookup code +Subject: [PATCH 04/34] vsock: refactor transport lookup code Introduce new reusable function vsock_connectible_lookup_transport() that performs the transport lookup logic. diff --git a/patches/0005-vsock-support-multi-transport-datagrams.patch b/patches/0005-vsock-support-multi-transport-datagrams.patch index 3c2773c..4101970 100644 --- a/patches/0005-vsock-support-multi-transport-datagrams.patch +++ b/patches/0005-vsock-support-multi-transport-datagrams.patch @@ -1,7 +1,7 @@ From 365643863f3166d827024d4b6067222a6453d015 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:30 +0000 -Subject: [PATCH 05/32] vsock: support multi-transport datagrams +Subject: [PATCH 05/34] vsock: support multi-transport datagrams This patch adds support for multi-transport datagrams. diff --git a/patches/0006-vsock-make-vsock-bind-reusable.patch b/patches/0006-vsock-make-vsock-bind-reusable.patch index df16bd1..a9f6a69 100644 --- a/patches/0006-vsock-make-vsock-bind-reusable.patch +++ b/patches/0006-vsock-make-vsock-bind-reusable.patch @@ -1,7 +1,7 @@ From cc6d6e946fdfd0e5aa2e1a9a1c6f4ecc199c2181 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:31 +0000 -Subject: [PATCH 06/32] vsock: make vsock bind reusable +Subject: [PATCH 06/34] vsock: make vsock bind reusable This commit makes the bind table management functions in vsock usable for different bind tables. For use by datagrams in a future patch. 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 8b9b301..0fa608a 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,7 +1,7 @@ From 33ddfd0056365235338e46e289657fc1c1355bc2 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:32 +0000 -Subject: [PATCH 07/32] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit +Subject: [PATCH 07/34] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit This commit adds a feature bit for virtio vsock to support datagrams. diff --git a/patches/0008-virtio-vsock-support-dgrams.patch b/patches/0008-virtio-vsock-support-dgrams.patch index 8e70699..c1cf39f 100644 --- a/patches/0008-virtio-vsock-support-dgrams.patch +++ b/patches/0008-virtio-vsock-support-dgrams.patch @@ -1,7 +1,7 @@ From 2883434bdf71f2441c1d34788fb138c010533254 Mon Sep 17 00:00:00 2001 From: Bobby Eshleman Date: Sat, 10 Jun 2023 00:58:33 +0000 -Subject: [PATCH 08/32] virtio/vsock: support dgrams +Subject: [PATCH 08/34] virtio/vsock: support dgrams This commit adds support for datagrams over virtio/vsock. diff --git a/patches/0009-vsock-Add-support-for-SIOCINQ-ioctl.patch b/patches/0009-vsock-Add-support-for-SIOCINQ-ioctl.patch new file mode 100644 index 0000000..22d9a25 --- /dev/null +++ b/patches/0009-vsock-Add-support-for-SIOCINQ-ioctl.patch @@ -0,0 +1,55 @@ +From 43fbbbc07f1ababcbfb305548aacdb5711dacf80 Mon Sep 17 00:00:00 2001 +From: Xuewei Niu +Date: Tue, 8 Jul 2025 14:36:12 +0800 +Subject: [PATCH 09/34] vsock: Add support for SIOCINQ ioctl + +Add support for SIOCINQ ioctl, indicating the length of bytes unread in the +socket. The value is obtained from `vsock_stream_has_data()`. + +Signed-off-by: Xuewei Niu +Reviewed-by: Stefano Garzarella +Reviewed-by: Luigi Leonardi +Link: https://patch.msgid.link/20250708-siocinq-v6-2-3775f9a9e359@antgroup.com +Signed-off-by: Jakub Kicinski +(cherry picked from commit f7c72265927540fb24c99fee8a54da7db537656c) +Signed-off-by: Sergio Lopez +--- + net/vmw_vsock/af_vsock.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c +index e949c9892c2c..23700ee6d732 100644 +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -1545,6 +1545,28 @@ static int vsock_do_ioctl(struct socket *sock, unsigned int cmd, + vsk = vsock_sk(sk); + + switch (cmd) { ++ case SIOCINQ: { ++ ssize_t n_bytes; ++ ++ if (!vsk->transport) { ++ ret = -EOPNOTSUPP; ++ break; ++ } ++ ++ if (sock_type_connectible(sk->sk_type) && ++ sk->sk_state == TCP_LISTEN) { ++ ret = -EINVAL; ++ break; ++ } ++ ++ n_bytes = vsock_stream_has_data(vsk); ++ if (n_bytes < 0) { ++ ret = n_bytes; ++ break; ++ } ++ ret = put_user(n_bytes, arg); ++ break; ++ } + case SIOCOUTQ: { + ssize_t n_bytes; + +-- +2.54.0 + diff --git a/patches/0010-virtio-vsock-implement-has_data-for-DGRAM.patch b/patches/0010-virtio-vsock-implement-has_data-for-DGRAM.patch new file mode 100644 index 0000000..3edcd95 --- /dev/null +++ b/patches/0010-virtio-vsock-implement-has_data-for-DGRAM.patch @@ -0,0 +1,133 @@ +From dcebe73b6fe14c1eb1c098c58dbcac9edc1df508 Mon Sep 17 00:00:00 2001 +From: Sergio Lopez +Date: Thu, 28 May 2026 11:43:46 +0200 +Subject: [PATCH 10/34] virtio/vsock: implement has_data for DGRAM + +Signed-off-by: Sergio Lopez +--- + include/linux/virtio_vsock.h | 1 + + include/net/af_vsock.h | 2 ++ + net/vmw_vsock/af_vsock.c | 15 ++++++++++++++- + net/vmw_vsock/virtio_transport.c | 1 + + net/vmw_vsock/virtio_transport_common.c | 15 +++++++++++++++ + net/vmw_vsock/vsock_loopback.c | 1 + + 6 files changed, 34 insertions(+), 1 deletion(-) + +diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h +index e3d7afa29894..34220effc4b0 100644 +--- a/include/linux/virtio_vsock.h ++++ b/include/linux/virtio_vsock.h +@@ -215,6 +215,7 @@ ssize_t + virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, + struct msghdr *msg, + int flags); ++s64 virtio_transport_dgram_has_data(struct vsock_sock *vsk); + s64 virtio_transport_stream_has_data(struct vsock_sock *vsk); + s64 virtio_transport_stream_has_space(struct vsock_sock *vsk); + u32 virtio_transport_seqpacket_has_data(struct vsock_sock *vsk); +diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h +index 5f93bb290a83..45469aa8cf60 100644 +--- a/include/net/af_vsock.h ++++ b/include/net/af_vsock.h +@@ -76,6 +76,7 @@ struct vsock_sock { + }; + + s64 vsock_connectible_has_data(struct vsock_sock *vsk); ++s64 vsock_dgram_has_data(struct vsock_sock *vsk); + s64 vsock_stream_has_data(struct vsock_sock *vsk); + s64 vsock_stream_has_space(struct vsock_sock *vsk); + struct sock *vsock_create_connected(struct sock *parent); +@@ -134,6 +135,7 @@ struct vsock_transport { + * header. + */ + const size_t dgram_payload_offset; ++ s64 (*dgram_has_data)(struct vsock_sock *); + + /* STREAM. */ + /* TODO: stream_bind() */ +diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c +index 23700ee6d732..ebd995fc6f5d 100644 +--- a/net/vmw_vsock/af_vsock.c ++++ b/net/vmw_vsock/af_vsock.c +@@ -1007,6 +1007,15 @@ s64 vsock_stream_has_data(struct vsock_sock *vsk) + } + EXPORT_SYMBOL_GPL(vsock_stream_has_data); + ++s64 vsock_dgram_has_data(struct vsock_sock *vsk) ++{ ++ if (WARN_ON(!vsk->transport)) ++ return 0; ++ ++ return vsk->transport->dgram_has_data(vsk); ++} ++EXPORT_SYMBOL_GPL(vsock_dgram_has_data); ++ + s64 vsock_connectible_has_data(struct vsock_sock *vsk) + { + struct sock *sk = sk_vsock(vsk); +@@ -1559,7 +1568,11 @@ static int vsock_do_ioctl(struct socket *sock, unsigned int cmd, + break; + } + +- n_bytes = vsock_stream_has_data(vsk); ++ if (sk->sk_type == SOCK_DGRAM) ++ n_bytes = vsock_dgram_has_data(vsk); ++ else ++ n_bytes = vsock_stream_has_data(vsk); ++ + if (n_bytes < 0) { + ret = n_bytes; + break; +diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c +index 58d15edd296e..43eeeb32a318 100644 +--- a/net/vmw_vsock/virtio_transport.c ++++ b/net/vmw_vsock/virtio_transport.c +@@ -558,6 +558,7 @@ static struct virtio_transport virtio_transport = { + .dgram_get_cid = virtio_transport_dgram_get_cid, + .dgram_get_port = virtio_transport_dgram_get_port, + .dgram_get_length = virtio_transport_dgram_get_length, ++ .dgram_has_data = virtio_transport_dgram_has_data, + + .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 b3ee9ce90b5d..2cae5e2295b1 100644 +--- a/net/vmw_vsock/virtio_transport_common.c ++++ b/net/vmw_vsock/virtio_transport_common.c +@@ -907,6 +907,21 @@ int virtio_transport_dgram_get_length(struct sk_buff *skb, size_t *len) + } + EXPORT_SYMBOL_GPL(virtio_transport_dgram_get_length); + ++s64 virtio_transport_dgram_has_data(struct vsock_sock *vsk) ++{ ++ struct sock *sk = sk_vsock(vsk); ++ struct sk_buff *skb; ++ s64 bytes = 0; ++ ++ spin_lock_bh(&sk->sk_receive_queue.lock); ++ skb_queue_walk(&sk->sk_receive_queue, skb) ++ bytes += skb->len; ++ spin_unlock_bh(&sk->sk_receive_queue.lock); ++ ++ return bytes; ++} ++EXPORT_SYMBOL_GPL(virtio_transport_dgram_has_data); ++ + s64 virtio_transport_stream_has_data(struct vsock_sock *vsk) + { + struct virtio_vsock_sock *vvs = vsk->trans; +diff --git a/net/vmw_vsock/vsock_loopback.c b/net/vmw_vsock/vsock_loopback.c +index b3066c854bb9..09e6162030b0 100644 +--- a/net/vmw_vsock/vsock_loopback.c ++++ b/net/vmw_vsock/vsock_loopback.c +@@ -71,6 +71,7 @@ static struct virtio_transport loopback_transport = { + .dgram_get_cid = virtio_transport_dgram_get_cid, + .dgram_get_port = virtio_transport_dgram_get_port, + .dgram_get_length = virtio_transport_dgram_get_length, ++ .dgram_has_data = virtio_transport_dgram_has_data, + + .stream_dequeue = virtio_transport_stream_dequeue, + .stream_enqueue = virtio_transport_stream_enqueue, +-- +2.54.0 + diff --git a/patches/0009-Transparent-Socket-Impersonation-implementation.patch b/patches/0011-Transparent-Socket-Impersonation-implementation.patch similarity index 99% rename from patches/0009-Transparent-Socket-Impersonation-implementation.patch rename to patches/0011-Transparent-Socket-Impersonation-implementation.patch index 7ddfe4d..f32738f 100644 --- a/patches/0009-Transparent-Socket-Impersonation-implementation.patch +++ b/patches/0011-Transparent-Socket-Impersonation-implementation.patch @@ -1,7 +1,7 @@ -From 2afce693dedb3bc54648665488d346bbc17ab73a Mon Sep 17 00:00:00 2001 +From acc54e7a37c7bdf21f7d6da1cd1462c134484f37 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:38:26 +0200 -Subject: [PATCH 09/32] Transparent Socket Impersonation implementation +Subject: [PATCH 11/34] Transparent Socket Impersonation implementation Transparent Socket Impersonation (AF_TSI) is an address family that provides sockets presenting two simultaneous personalities, one of @@ -31,11 +31,11 @@ Signed-off-by: Matej Hrica net/socket.c | 3 + net/tsi/Kconfig | 7 + net/tsi/Makefile | 4 + - net/tsi/af_tsi.c | 1571 +++++++++++++++++++++++++++ + net/tsi/af_tsi.c | 1577 +++++++++++++++++++++++++++ net/tsi/af_tsi.h | 107 ++ security/selinux/hooks.c | 8 +- security/selinux/include/classmap.h | 3 +- - 10 files changed, 1710 insertions(+), 3 deletions(-) + 10 files changed, 1716 insertions(+), 3 deletions(-) create mode 100644 net/tsi/Kconfig create mode 100644 net/tsi/Makefile create mode 100644 net/tsi/af_tsi.c @@ -128,10 +128,10 @@ index 000000000000..8b3cf74116a5 +tsi-y := af_tsi.o diff --git a/net/tsi/af_tsi.c b/net/tsi/af_tsi.c new file mode 100644 -index 000000000000..e266f968405b +index 000000000000..3d2bcd8d2ba4 --- /dev/null +++ b/net/tsi/af_tsi.c -@@ -0,0 +1,1571 @@ +@@ -0,0 +1,1577 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Transparent Socket Impersonation Driver @@ -908,11 +908,13 @@ index 000000000000..e266f968405b + struct sock *sk = sock->sk; + struct tsi_sock *tsk; + struct socket *isocket; ++ struct socket *vsocket; + int err; + + lock_sock(sk); + tsk = tsi_sk(sock->sk); + isocket = tsk->isocket; ++ vsocket = tsk->vsocket; + + switch (tsk->status) { + case S_HYBRID: @@ -924,7 +926,11 @@ index 000000000000..e266f968405b + } + break; + case S_VSOCK: -+ err = -EOPNOTSUPP; ++ if (vsocket) { ++ err = vsocket->ops->ioctl(vsocket, cmd, arg); ++ } else { ++ err = -EOPNOTSUPP; ++ } + break; + } + diff --git a/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch b/patches/0012-tsi-allow-hijacking-sockets-tsi_hijack.patch similarity index 93% rename from patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch rename to patches/0012-tsi-allow-hijacking-sockets-tsi_hijack.patch index cab8206..877a8b9 100644 --- a/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch +++ b/patches/0012-tsi-allow-hijacking-sockets-tsi_hijack.patch @@ -1,7 +1,7 @@ -From 11f6bba30167239d54f27fccbeb3ddb319fb360f Mon Sep 17 00:00:00 2001 +From 7ba69a39a7184bd593b5c633ea870903fbedeb5d Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Thu, 19 May 2022 22:42:01 +0200 -Subject: [PATCH 10/32] tsi: allow hijacking sockets (tsi_hijack) +Subject: [PATCH 12/34] tsi: allow hijacking sockets (tsi_hijack) Add a kernel command line option (tsi_hijack) enabling users to request the kernel to hijack AF_INET(SOCK_STREAM || SOCK_DGRAM) @@ -68,7 +68,7 @@ index f317719ee75c..0d3d172fceec 100644 pf = rcu_dereference(net_families[family]); err = -EAFNOSUPPORT; diff --git a/net/tsi/af_tsi.c b/net/tsi/af_tsi.c -index e266f968405b..a8940e3e98a5 100644 +index 3d2bcd8d2ba4..bd3dc75b3129 100644 --- a/net/tsi/af_tsi.c +++ b/net/tsi/af_tsi.c @@ -547,7 +547,7 @@ static int tsi_accept(struct socket *sock, struct socket *newsock, diff --git a/patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch b/patches/0013-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch similarity index 95% rename from patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch rename to patches/0013-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch index cb64d05..88f91dc 100644 --- a/patches/0011-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch +++ b/patches/0013-arm64-cpufeature-Unify-SCOPE_LOCAL_CPU-early-late-be.patch @@ -1,7 +1,7 @@ -From 995eef6ce4407bc20831b242c77ee011d84fea4d Mon Sep 17 00:00:00 2001 +From 13804d0a9d630bdca8ac1f4dea14d0261eaf9eb7 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Wed, 25 Sep 2024 16:35:34 +0200 -Subject: [PATCH 11/32] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late +Subject: [PATCH 13/34] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late behavior SCOPE_LOCAL_CPU is mostly used for CPU errata. The early feature logic diff --git a/patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch b/patches/0014-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch similarity index 97% rename from patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch rename to patches/0014-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch index a99eb05..cfcdd1e 100644 --- a/patches/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch +++ b/patches/0014-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch @@ -1,7 +1,7 @@ -From 582250ebe10df99415a233af1f40384004594d3b Mon Sep 17 00:00:00 2001 +From 8e65f9b0a12d8a2dbafcd6b61972ee6aac16e21c Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:20 +0900 -Subject: [PATCH 12/32] prctl: Introduce PR_{SET,GET}_MEM_MODEL +Subject: [PATCH 14/34] prctl: Introduce PR_{SET,GET}_MEM_MODEL On some architectures, it is possible to query and/or change the CPU memory model. This allows userspace to switch to a stricter memory model diff --git a/patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch b/patches/0015-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch similarity index 98% rename from patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch rename to patches/0015-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch index cadd627..93d0bee 100644 --- a/patches/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch +++ b/patches/0015-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch @@ -1,7 +1,7 @@ -From 16bd1b5e032b16031d54e0215d475cf3cc0d0dcc Mon Sep 17 00:00:00 2001 +From 70a9efbbe8fea5c2a167a3ecd1bb97fdba479c7a Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:21 +0900 -Subject: [PATCH 13/32] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO +Subject: [PATCH 15/34] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO CPUs Some ARM64 implementations are known to always use the TSO memory model. diff --git a/patches/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch b/patches/0016-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch similarity index 97% rename from patches/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch rename to patches/0016-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch index 8dd35d1..783c783 100644 --- a/patches/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch +++ b/patches/0016-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch @@ -1,7 +1,7 @@ -From adf176e37a3d9f6a6b75b7dd27fcaa72d27d1e40 Mon Sep 17 00:00:00 2001 +From ff6a8afce82d72c22b8e320232d959d70e16c306 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:22 +0900 -Subject: [PATCH 14/32] arm64: Introduce scaffolding to add ACTLR_EL1 to thread +Subject: [PATCH 16/34] arm64: Introduce scaffolding to add ACTLR_EL1 to thread state Some CPUs expose IMPDEF features in ACTLR_EL1 that can be meaningfully diff --git a/patches/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch b/patches/0017-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch similarity index 98% rename from patches/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch rename to patches/0017-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch index 5b8bc6b..2afa841 100644 --- a/patches/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch +++ b/patches/0017-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch @@ -1,7 +1,7 @@ -From 30860087dc858a4fba76ecb6bc7de1025a6774b4 Mon Sep 17 00:00:00 2001 +From 9161539a310c798b58feba980796ac73021ec220 Mon Sep 17 00:00:00 2001 From: Hector Martin Date: Thu, 11 Apr 2024 09:51:23 +0900 -Subject: [PATCH 15/32] arm64: Implement Apple IMPDEF TSO memory model control +Subject: [PATCH 17/34] arm64: Implement Apple IMPDEF TSO memory model control Apple CPUs may implement the TSO memory model as an optional configurable mode. This allows x86 emulators to simplify their diff --git a/patches/0016-drm-virtio-Support-fence-passing-feature.patch b/patches/0018-drm-virtio-Support-fence-passing-feature.patch similarity index 99% rename from patches/0016-drm-virtio-Support-fence-passing-feature.patch rename to patches/0018-drm-virtio-Support-fence-passing-feature.patch index 7c647af..6cc58a5 100644 --- a/patches/0016-drm-virtio-Support-fence-passing-feature.patch +++ b/patches/0018-drm-virtio-Support-fence-passing-feature.patch @@ -1,7 +1,7 @@ -From 7ed1f847f1751a2f5fec84776c80c983822ca453 Mon Sep 17 00:00:00 2001 +From f20abbb6f9399941cba777bea3cb424d3a745f49 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Sat, 7 Oct 2023 22:47:47 +0300 -Subject: [PATCH 16/32] drm/virtio: Support fence-passing feature +Subject: [PATCH 18/34] drm/virtio: Support fence-passing feature Support extended version of VIRTIO_GPU_CMD_SUBMIT_3D command that allows passing in-fence IDs to host for waiting, removing need to do expensive diff --git a/patches/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch b/patches/0019-Enable-64-bit-processes-to-use-compat-input-syscalls.patch similarity index 97% rename from patches/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch rename to patches/0019-Enable-64-bit-processes-to-use-compat-input-syscalls.patch index 4832fa7..606642d 100644 --- a/patches/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch +++ b/patches/0019-Enable-64-bit-processes-to-use-compat-input-syscalls.patch @@ -1,7 +1,7 @@ -From 1aa58a85e45d6fb4e0736ae1a606d68373d3fabc Mon Sep 17 00:00:00 2001 +From 6244f74ac041eac2f4b12ae99369830ff687d14b Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 8 Oct 2024 11:24:25 +0200 -Subject: [PATCH 17/32] Enable 64 bit processes to use compat input syscalls +Subject: [PATCH 19/34] Enable 64 bit processes to use compat input syscalls The compat variant of input syscalls is only enabled for 32 bit tasks, but in some cases, such as userspace emulation, it's useful to diff --git a/patches/0018-dax-Allow-block-size-PAGE_SIZE.patch b/patches/0020-dax-Allow-block-size-PAGE_SIZE.patch similarity index 91% rename from patches/0018-dax-Allow-block-size-PAGE_SIZE.patch rename to patches/0020-dax-Allow-block-size-PAGE_SIZE.patch index a3f0f96..e853037 100644 --- a/patches/0018-dax-Allow-block-size-PAGE_SIZE.patch +++ b/patches/0020-dax-Allow-block-size-PAGE_SIZE.patch @@ -1,7 +1,7 @@ -From 24ed7b49b6b12d383db2cd4b649cf5c624afd3fa Mon Sep 17 00:00:00 2001 +From 100bc7b43a320b73d880781259576f928fb88178 Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Sun, 20 Oct 2024 01:23:41 +0900 -Subject: [PATCH 18/32] dax: Allow block size > PAGE_SIZE +Subject: [PATCH 20/34] dax: Allow block size > PAGE_SIZE For virtio-dax, the file/FS blocksize is irrelevant. FUSE always uses large DAX blocks (2MiB), which will work with all host page sizes. Since diff --git a/patches/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch b/patches/0021-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch similarity index 96% rename from patches/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch rename to patches/0021-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch index 346ef68..938f432 100644 --- a/patches/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch +++ b/patches/0021-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch @@ -1,7 +1,7 @@ -From da19784d49ca9e3f45fb0180036a45a25822f4f4 Mon Sep 17 00:00:00 2001 +From f0d73a8b36caa430d70d245c21eb653063316c5d Mon Sep 17 00:00:00 2001 From: Asahi Lina Date: Mon, 21 Oct 2024 23:21:16 +0900 -Subject: [PATCH 19/32] mm: Fix __wp_page_copy_user fallback path for remote mm +Subject: [PATCH 21/34] mm: Fix __wp_page_copy_user fallback path for remote mm If the source page is a PFN mapping, we copy back from userspace. However, if this fault is a remote access, we cannot use diff --git a/patches/0020-virtgpu-gem-partial-map.patch b/patches/0022-virtgpu-gem-partial-map.patch similarity index 90% rename from patches/0020-virtgpu-gem-partial-map.patch rename to patches/0022-virtgpu-gem-partial-map.patch index 34da08a..58b1db4 100644 --- a/patches/0020-virtgpu-gem-partial-map.patch +++ b/patches/0022-virtgpu-gem-partial-map.patch @@ -1,7 +1,7 @@ -From 8e920d63a7d31f4f1a339be60d4cc181ce270431 Mon Sep 17 00:00:00 2001 +From 60dc05c78ee9cabbb2d638d9830263f082dee415 Mon Sep 17 00:00:00 2001 From: Sasha Finkelstein Date: Fri, 17 Jan 2025 12:34:23 +0100 -Subject: [PATCH 20/32] virtgpu: gem partial map +Subject: [PATCH 22/34] virtgpu: gem partial map Those are useful to implement coherent cross-vm mmap. diff --git a/patches/0021-virtgpu-mixed-page-size.patch b/patches/0023-virtgpu-mixed-page-size.patch similarity index 92% rename from patches/0021-virtgpu-mixed-page-size.patch rename to patches/0023-virtgpu-mixed-page-size.patch index 16ffaff..613c0f1 100644 --- a/patches/0021-virtgpu-mixed-page-size.patch +++ b/patches/0023-virtgpu-mixed-page-size.patch @@ -1,7 +1,7 @@ -From f7e3016d46bf6c4fa63e610c193372a965155e9c Mon Sep 17 00:00:00 2001 +From c458e379352be09c767341cdd5961edbde5f104b Mon Sep 17 00:00:00 2001 From: Sasha Finkelstein Date: Fri, 17 Jan 2025 12:34:28 +0100 -Subject: [PATCH 21/32] virtgpu: mixed page size +Subject: [PATCH 23/34] virtgpu: mixed page size This allows running different page sizes between host and guest on platforms that support mixed page sizes. diff --git a/patches/0022-fuse-mark-DAX-inode-releases-as-blocking.patch b/patches/0024-fuse-mark-DAX-inode-releases-as-blocking.patch similarity index 95% rename from patches/0022-fuse-mark-DAX-inode-releases-as-blocking.patch rename to patches/0024-fuse-mark-DAX-inode-releases-as-blocking.patch index a08af38..7b0ce58 100644 --- a/patches/0022-fuse-mark-DAX-inode-releases-as-blocking.patch +++ b/patches/0024-fuse-mark-DAX-inode-releases-as-blocking.patch @@ -1,7 +1,7 @@ -From 26235146da7324da362c0eccbc80c859dd2f57c9 Mon Sep 17 00:00:00 2001 +From e6906aec14c722b9feda60cddbbf3d8068e3ba20 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Sun, 18 Jan 2026 23:37:30 +0100 -Subject: [PATCH 22/32] fuse: mark DAX inode releases as blocking +Subject: [PATCH 24/34] fuse: mark DAX inode releases as blocking Commit 26e5c67deb2e ("fuse: fix livelock in synchronous file put from fuseblk workers") made fputs on closing files always asynchronous. diff --git a/patches/0023-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch b/patches/0025-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch similarity index 86% rename from patches/0023-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch rename to patches/0025-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch index a62d222..769e10d 100644 --- a/patches/0023-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch +++ b/patches/0025-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch @@ -1,7 +1,7 @@ -From 8128cde157db4b71f26e1176ec5239dc836b5a9f Mon Sep 17 00:00:00 2001 +From be0f0f9bd3a497111f28d833364ac7d95ac72703 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 10 Mar 2026 13:33:02 +0100 -Subject: [PATCH 23/32] Revert "vsock/virtio: Fix message iterator handling on +Subject: [PATCH 25/34] Revert "vsock/virtio: Fix message iterator handling on transmit path" This reverts commit e6cee5d4a122ca9d6b7bb8fa09e498c60b9f208c. @@ -10,7 +10,7 @@ This reverts commit e6cee5d4a122ca9d6b7bb8fa09e498c60b9f208c. 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c -index b3ee9ce90b5d..f274cde784f7 100644 +index 2cae5e2295b1..44da05eb62c7 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -106,15 +106,13 @@ static int virtio_transport_fill_skb(struct sk_buff *skb, diff --git a/patches/0024-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch b/patches/0026-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch similarity index 87% rename from patches/0024-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch rename to patches/0026-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch index eb1c2f1..4701632 100644 --- a/patches/0024-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch +++ b/patches/0026-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch @@ -1,7 +1,7 @@ -From 3a04da8c906e94b8f9e392885f7b6571c44d27b9 Mon Sep 17 00:00:00 2001 +From 66e0500ef1da76ece09fcdc9f4630620c9e4d182 Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 10 Mar 2026 13:33:11 +0100 -Subject: [PATCH 24/32] Revert "vsock/virtio: Allocate nonlinear SKBs for +Subject: [PATCH 26/34] Revert "vsock/virtio: Allocate nonlinear SKBs for handling large transmit buffers" This reverts commit 69c5bf306115e6047e0d902f8c6551fff74a71ff. @@ -10,7 +10,7 @@ This reverts commit 69c5bf306115e6047e0d902f8c6551fff74a71ff. 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c -index f274cde784f7..4733c1d234d5 100644 +index 44da05eb62c7..3e731d94e834 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -111,8 +111,7 @@ static int virtio_transport_fill_skb(struct sk_buff *skb, diff --git a/patches/0025-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch b/patches/0027-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch similarity index 94% rename from patches/0025-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch rename to patches/0027-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch index 91c2fec..4a83428 100644 --- a/patches/0025-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch +++ b/patches/0027-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch @@ -1,7 +1,7 @@ -From 8c59c976fb5a6c89af9474b347c90141f103ee3e Mon Sep 17 00:00:00 2001 +From e81b5ec90b1a441493ccab02134137977a4a900d Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 10 Mar 2026 13:33:20 +0100 -Subject: [PATCH 25/32] Revert "vhost/vsock: Allocate nonlinear SKBs for +Subject: [PATCH 27/34] Revert "vhost/vsock: Allocate nonlinear SKBs for handling large receive buffers" This reverts commit 65e808a6023f883f298db734444a9c38e45af740. @@ -37,7 +37,7 @@ index deaadc2503a2..ad89ee3676db 100644 return NULL; } diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h -index e3d7afa29894..1ff7389ed244 100644 +index 34220effc4b0..357e0604c17c 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -49,48 +49,22 @@ static inline void virtio_vsock_skb_clear_tap_delivered(struct sk_buff *skb) diff --git a/patches/0026-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch b/patches/0028-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch similarity index 87% rename from patches/0026-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch rename to patches/0028-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch index 985fa6a..482fab7 100644 --- a/patches/0026-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch +++ b/patches/0028-Revert-vsock-virtio-cap-TX-credit-to-local-buffer-si.patch @@ -1,7 +1,7 @@ -From 55f776caa30a3c78e799e407cc78c765dd0fce66 Mon Sep 17 00:00:00 2001 +From 6c7dab60e089e894ce9e810c42e02676c5f9cc6b Mon Sep 17 00:00:00 2001 From: Sergio Lopez Date: Tue, 10 Mar 2026 16:00:26 +0100 -Subject: [PATCH 26/32] Revert "vsock/virtio: cap TX credit to local buffer +Subject: [PATCH 28/34] Revert "vsock/virtio: cap TX credit to local buffer size" This reverts commit c0e42fb0e054c2b2ec4ee80f48ccd256ae0227ce. @@ -10,7 +10,7 @@ This reverts commit c0e42fb0e054c2b2ec4ee80f48ccd256ae0227ce. 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c -index 4733c1d234d5..bed7fe5a7203 100644 +index 3e731d94e834..bb8407b3d593 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -850,15 +850,6 @@ virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk, @@ -38,7 +38,7 @@ index 4733c1d234d5..bed7fe5a7203 100644 spin_unlock_bh(&vvs->tx_lock); return -EMSGSIZE; } -@@ -938,8 +929,7 @@ static s64 virtio_transport_has_space(struct virtio_vsock_sock *vvs) +@@ -953,8 +944,7 @@ static s64 virtio_transport_has_space(struct virtio_vsock_sock *vvs) * we have bytes in flight (tx_cnt - peer_fwd_cnt), the subtraction * does not underflow. */ diff --git a/patches/0027-can-virtio-Add-virtio-CAN-driver.patch b/patches/0029-can-virtio-Add-virtio-CAN-driver.patch similarity index 99% rename from patches/0027-can-virtio-Add-virtio-CAN-driver.patch rename to patches/0029-can-virtio-Add-virtio-CAN-driver.patch index 336807d..e0dc5e3 100644 --- a/patches/0027-can-virtio-Add-virtio-CAN-driver.patch +++ b/patches/0029-can-virtio-Add-virtio-CAN-driver.patch @@ -1,7 +1,7 @@ -From 7915f0f9e54178cdff02144a32e08d686372922d Mon Sep 17 00:00:00 2001 +From 98691aa8c63a330e261d8c4690bbfe5fcc462f43 Mon Sep 17 00:00:00 2001 From: Matias Ezequiel Vara Larsen Date: Fri, 8 May 2026 14:23:37 +0200 -Subject: [PATCH 27/32] can: virtio: Add virtio CAN driver +Subject: [PATCH 29/34] can: virtio: Add virtio CAN driver Add virtio CAN driver based on Virtio 1.4 specification (see https://github.com/oasis-tcs/virtio-spec/tree/virtio-1.4). The driver diff --git a/patches/0028-virtio_rtc-Add-module-and-driver-core.patch b/patches/0030-virtio_rtc-Add-module-and-driver-core.patch similarity index 99% rename from patches/0028-virtio_rtc-Add-module-and-driver-core.patch rename to patches/0030-virtio_rtc-Add-module-and-driver-core.patch index 4771447..844b312 100644 --- a/patches/0028-virtio_rtc-Add-module-and-driver-core.patch +++ b/patches/0030-virtio_rtc-Add-module-and-driver-core.patch @@ -1,7 +1,7 @@ -From d24ea54a0709d75d0d68d43ac98c13616e804d05 Mon Sep 17 00:00:00 2001 +From 4882237ee50eb5545ab67cc39181a19045d92fa9 Mon Sep 17 00:00:00 2001 From: Peter Hilber Date: Fri, 9 May 2025 18:07:22 +0200 -Subject: [PATCH 28/32] virtio_rtc: Add module and driver core +Subject: [PATCH 30/34] virtio_rtc: Add module and driver core Add the virtio_rtc module and driver core. The virtio_rtc module implements a driver compatible with the proposed Virtio RTC device specification. diff --git a/patches/0029-virtio_rtc-Add-PTP-clocks.patch b/patches/0031-virtio_rtc-Add-PTP-clocks.patch similarity index 99% rename from patches/0029-virtio_rtc-Add-PTP-clocks.patch rename to patches/0031-virtio_rtc-Add-PTP-clocks.patch index a545b58..18c0d3b 100644 --- a/patches/0029-virtio_rtc-Add-PTP-clocks.patch +++ b/patches/0031-virtio_rtc-Add-PTP-clocks.patch @@ -1,7 +1,7 @@ -From fb9be033bb51cff396159c297c344e69288dfee2 Mon Sep 17 00:00:00 2001 +From ebd63f2973abe020f0693072dba11294d957540b Mon Sep 17 00:00:00 2001 From: Peter Hilber Date: Fri, 9 May 2025 18:07:23 +0200 -Subject: [PATCH 29/32] virtio_rtc: Add PTP clocks +Subject: [PATCH 31/34] virtio_rtc: Add PTP clocks Expose the virtio_rtc clocks as PTP clocks to userspace, similar to ptp_kvm. virtio_rtc can expose multiple clocks, e.g. a UTC clock and a diff --git a/patches/0030-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch b/patches/0032-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch similarity index 95% rename from patches/0030-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch rename to patches/0032-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch index 5047c38..8acdd4e 100644 --- a/patches/0030-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch +++ b/patches/0032-virtio_rtc-Add-Arm-Generic-Timer-cross-timestamping.patch @@ -1,7 +1,7 @@ -From 6efb22c8522df0587669065dc5ecc0aea9e19468 Mon Sep 17 00:00:00 2001 +From 22d1aeb70c898338e96f5db3573f4181a767238b Mon Sep 17 00:00:00 2001 From: Peter Hilber Date: Fri, 9 May 2025 18:07:24 +0200 -Subject: [PATCH 30/32] virtio_rtc: Add Arm Generic Timer cross-timestamping +Subject: [PATCH 32/34] virtio_rtc: Add Arm Generic Timer cross-timestamping For platforms using the Arm Generic Timer, add precise cross-timestamping support to virtio_rtc. diff --git a/patches/0031-virtio_rtc-Add-RTC-class-driver.patch b/patches/0033-virtio_rtc-Add-RTC-class-driver.patch similarity index 99% rename from patches/0031-virtio_rtc-Add-RTC-class-driver.patch rename to patches/0033-virtio_rtc-Add-RTC-class-driver.patch index f5a9591..80c9f46 100644 --- a/patches/0031-virtio_rtc-Add-RTC-class-driver.patch +++ b/patches/0033-virtio_rtc-Add-RTC-class-driver.patch @@ -1,7 +1,7 @@ -From 2afb9a58200ff74af3ad3df97609016d7a0993de Mon Sep 17 00:00:00 2001 +From 86616410154ce8baf16131ffc626174c32c79763 Mon Sep 17 00:00:00 2001 From: Peter Hilber Date: Fri, 9 May 2025 18:07:25 +0200 -Subject: [PATCH 31/32] virtio_rtc: Add RTC class driver +Subject: [PATCH 33/34] virtio_rtc: Add RTC class driver Expose the virtio-rtc UTC-like clock as an RTC clock to userspace - if it is present, and if it does not step on leap seconds. The RTC class enables diff --git a/patches/0032-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch b/patches/0034-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch similarity index 91% rename from patches/0032-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch rename to patches/0034-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch index 9f86e4d..0e8b812 100644 --- a/patches/0032-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch +++ b/patches/0034-virtio_rtc-Fix-compatibility-for-kernel-6.12.patch @@ -1,7 +1,7 @@ -From 61f88b799c18ac2f5a3814e19388309e19c821ff Mon Sep 17 00:00:00 2001 +From 2b9731591960d97b4672968ceb5a91fa3bdf117b Mon Sep 17 00:00:00 2001 From: Dorinda Bassey Date: Wed, 29 Apr 2026 11:35:00 +0200 -Subject: [PATCH 32/32] virtio_rtc: Fix compatibility for kernel 6.12 +Subject: [PATCH 34/34] virtio_rtc: Fix compatibility for kernel 6.12 Backport virtio_rtc driver to kernel 6.12 by fixing API differences: