Include patchs reverting nonlinear SKBs on vsock

slp · slp · commit b1b5526cc37a · 2026-03-18T10:59:54.000+01:00
The vsock implementation in libkrun can't deal with packets splitted among multiple descriptors. Until we add support for it, let's revert the patches in the kernel triggering this behavior. Fixes: containers/libkrun#535 Signed-off-by: Sergio Lopez <slp@redhat.com>
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
@@ -1,4 +1,4 @@
-From 70b8ab2d1d4ba865efe08ba1307f694b9f154859 Mon Sep 17 00:00:00 2001
+From 18d2a787f2160edb05cd536fb74109e47ff8e2b8 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
diff --git 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 b7bfb048dc9df54f4dc742e4787766a7fd2e39f8 Mon Sep 17 00:00:00 2001
+From 84452765ffa7957a573d4782eced150043dbf7d6 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
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
@@ -1,4 +1,4 @@
-From 8dfe0e6ed7600a8cd1e2caa7b1e61116493d5001 Mon Sep 17 00:00:00 2001
+From aa4dfd6648a87fc12da362ab2381accd31ce212e 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
diff --git 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 c388e16aabfa5e989d0ca71c95ac24acfd72d2d4 Mon Sep 17 00:00:00 2001
+From d0d3b5b18f81c9660e201b056909e0f52c519546 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
diff --git 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 817f5791591a123e06fa85993aa24f2e4367c506 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/22] krunfw: Don't panic when init dies
+Subject: [PATCH 01/25] 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
@@ -1,7 +1,7 @@
 From db750d64e3f36576b667b67e979ec800a1eec872 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/22] krunfw: Ignore run_cmd on orderly reboot
+Subject: [PATCH 02/25] 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
@@ -1,7 +1,7 @@
 From 56ef3652b6666b91c1c66fa94aedac70a934bfb2 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/22] vsock/dgram: generalize recvmsg and drop
+Subject: [PATCH 03/25] 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
@@ -1,7 +1,7 @@
 From 385e0bdc508313f07f59bbe26cf91ed6d97eaf39 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/22] vsock: refactor transport lookup code
+Subject: [PATCH 04/25] 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
@@ -1,7 +1,7 @@
 From 774a9ccd77a3adb0f736f3f2323bde3d0b06b210 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/22] vsock: support multi-transport datagrams
+Subject: [PATCH 05/25] 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
@@ -1,7 +1,7 @@
 From 4038db5595d575390c8a0d283ae647bf9d3e96c9 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/22] vsock: make vsock bind reusable
+Subject: [PATCH 06/25] 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
@@ -1,7 +1,7 @@
 From 881d7e95e6f0e8dae002a32a2a88d7c08b083b54 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/22] virtio/vsock: add VIRTIO_VSOCK_F_DGRAM feature bit
+Subject: [PATCH 07/25] 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
@@ -1,7 +1,7 @@
 From 518275adea4e66da9b19bff00439b127926692e6 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/22] virtio/vsock: support dgrams
+Subject: [PATCH 08/25] virtio/vsock: support dgrams
 
 This commit adds support for datagrams over virtio/vsock.
 
diff --git a/patches/0009-Transparent-Socket-Impersonation-implementation.patch b/patches/0009-Transparent-Socket-Impersonation-implementation.patch
@@ -1,7 +1,7 @@
 From 338b7e34b57dfb82129ec2b022735c3e3f71ef59 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/22] Transparent Socket Impersonation implementation
+Subject: [PATCH 09/25] Transparent Socket Impersonation implementation
 
 Transparent Socket Impersonation (AF_TSI) is an address family that
 provides sockets presenting two simultaneous personalities, one of
diff --git a/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch b/patches/0010-tsi-allow-hijacking-sockets-tsi_hijack.patch
@@ -1,7 +1,7 @@
 From 936b1f01fece38e5c2c2038c9fdd50214fb08ec9 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/22] tsi: allow hijacking sockets (tsi_hijack)
+Subject: [PATCH 10/25] 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)
diff --git 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,7 +1,7 @@
 From 84ed5b2bc46d5022f246c55aa06922551f83cda3 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/22] arm64: cpufeature: Unify SCOPE_LOCAL_CPU early & late
+Subject: [PATCH 11/25] 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/0012-prctl-Introduce-PR_-SET-GET-_MEM_MODEL.patch
@@ -1,7 +1,7 @@
 From 313af1b4bd78ce8673610442a39a1311b8bd3b1d 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/22] prctl: Introduce PR_{SET,GET}_MEM_MODEL
+Subject: [PATCH 12/25] 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/0013-arm64-Implement-PR_-GET-SET-_MEM_MODEL-for-always-TS.patch
@@ -1,7 +1,7 @@
 From 0d269370cdb6cb89f683528f6b28e08a5c9da7cf 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/22] arm64: Implement PR_{GET,SET}_MEM_MODEL for always-TSO
+Subject: [PATCH 13/25] 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/0014-arm64-Introduce-scaffolding-to-add-ACTLR_EL1-to-thre.patch
@@ -1,7 +1,7 @@
 From 2cd2b566c238c1c120cc17a1c20bcfa17a8b69b8 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/22] arm64: Introduce scaffolding to add ACTLR_EL1 to thread
+Subject: [PATCH 14/25] 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/0015-arm64-Implement-Apple-IMPDEF-TSO-memory-model-contro.patch
@@ -1,7 +1,7 @@
 From 0ff74dd6e1a08b75f7c45d3b792dc7a47e18fe97 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/22] arm64: Implement Apple IMPDEF TSO memory model control
+Subject: [PATCH 15/25] 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/0016-drm-virtio-Support-fence-passing-feature.patch
@@ -1,7 +1,7 @@
 From 58c83b2acea8f37909ae2e12928ad652fd8ce522 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/22] drm/virtio: Support fence-passing feature
+Subject: [PATCH 16/25] 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/0017-Enable-64-bit-processes-to-use-compat-input-syscalls.patch
@@ -1,7 +1,7 @@
 From 8932f5b0d9d9923a2ac2b09f8b17d3255d04ce09 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/22] Enable 64 bit processes to use compat input syscalls
+Subject: [PATCH 17/25] 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/0018-dax-Allow-block-size-PAGE_SIZE.patch
@@ -1,7 +1,7 @@
 From d56d9ed7805cfda7e9abf484cdc0de2771566c08 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/22] dax: Allow block size > PAGE_SIZE
+Subject: [PATCH 18/25] 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/0019-mm-Fix-__wp_page_copy_user-fallback-path-for-remote-.patch
@@ -1,7 +1,7 @@
 From 5b2548b89b041ae10a33cc5a19d87a2cb71647be 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/22] mm: Fix __wp_page_copy_user fallback path for remote mm
+Subject: [PATCH 19/25] 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/0020-virtgpu-gem-partial-map.patch
@@ -1,7 +1,7 @@
 From f43b1aa436d0f7b4bf02f85a12fcebc74c052743 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/22] virtgpu: gem partial map
+Subject: [PATCH 20/25] 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/0021-virtgpu-mixed-page-size.patch
@@ -1,7 +1,7 @@
 From 0d62c564ec641c16079f6a2bfccf2ea983cad594 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/22] virtgpu: mixed page size
+Subject: [PATCH 21/25] 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/0022-fuse-mark-DAX-inode-releases-as-blocking.patch
@@ -1,7 +1,7 @@
 From 96fb35fd5e6840e1563bf9f56c488af396020c8a Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <slp@redhat.com>
 Date: Sun, 18 Jan 2026 23:37:30 +0100
-Subject: [PATCH 22/22] fuse: mark DAX inode releases as blocking
+Subject: [PATCH 22/25] 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/0023-Revert-vsock-virtio-Fix-message-iterator-handling-on.patch
@@ -0,0 +1,37 @@
+From f1ce09fd1d1ee16731ae8809d019ec4caba9d896 Mon Sep 17 00:00:00 2001
+From: Sergio Lopez <slp@redhat.com>
+Date: Tue, 10 Mar 2026 13:33:02 +0100
+Subject: [PATCH 23/25] Revert "vsock/virtio: Fix message iterator handling on
+ transmit path"
+
+This reverts commit e6cee5d4a122ca9d6b7bb8fa09e498c60b9f208c.
+---
+ net/vmw_vsock/virtio_transport_common.c | 8 +++-----
+ 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
+--- 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,
+ 				     size_t len,
+ 				     bool zcopy)
+ {
+-	struct msghdr *msg = info->msg;
+-
+ 	if (zcopy)
+-		return __zerocopy_sg_from_iter(msg, NULL, skb,
+-					       &msg->msg_iter,
++		return __zerocopy_sg_from_iter(info->msg, NULL, skb,
++					       &info->msg->msg_iter,
+ 					       len);
+ 
+ 	virtio_vsock_skb_put(skb, len);
+-	return skb_copy_datagram_from_iter_full(skb, 0, &msg->msg_iter, len);
++	return skb_copy_datagram_from_iter(skb, 0, &info->msg->msg_iter, len);
+ }
+ 
+ static void virtio_transport_init_hdr(struct sk_buff *skb,
+-- 
+2.52.0
+
diff --git a/patches/0024-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch b/patches/0024-Revert-vsock-virtio-Allocate-nonlinear-SKBs-for-hand.patch
@@ -0,0 +1,37 @@
+From 6e47c66e5e9c4278cb27e501d3ad2824092445fe Mon Sep 17 00:00:00 2001
+From: Sergio Lopez <slp@redhat.com>
+Date: Tue, 10 Mar 2026 13:33:11 +0100
+Subject: [PATCH 24/25] Revert "vsock/virtio: Allocate nonlinear SKBs for
+ handling large transmit buffers"
+
+This reverts commit 69c5bf306115e6047e0d902f8c6551fff74a71ff.
+---
+ net/vmw_vsock/virtio_transport_common.c | 5 ++---
+ 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
+--- 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,
+ 					       &info->msg->msg_iter,
+ 					       len);
+ 
+-	virtio_vsock_skb_put(skb, len);
+-	return skb_copy_datagram_from_iter(skb, 0, &info->msg->msg_iter, len);
++	return memcpy_from_msg(skb_put(skb, len), info->msg, len);
+ }
+ 
+ static void virtio_transport_init_hdr(struct sk_buff *skb,
+@@ -295,7 +294,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
+ 	if (!zcopy)
+ 		skb_len += payload_len;
+ 
+-	skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
++	skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
+ 	if (!skb)
+ 		return NULL;
+ 
+-- 
+2.52.0
+
diff --git a/patches/0025-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch b/patches/0025-Revert-vhost-vsock-Allocate-nonlinear-SKBs-for-handl.patch
@@ -0,0 +1,97 @@
+From a5d4bbafb75eba1205fb00b4ba8073f7461954de Mon Sep 17 00:00:00 2001
+From: Sergio Lopez <slp@redhat.com>
+Date: Tue, 10 Mar 2026 13:33:20 +0100
+Subject: [PATCH 25/25] Revert "vhost/vsock: Allocate nonlinear SKBs for
+ handling large receive buffers"
+
+This reverts commit 65e808a6023f883f298db734444a9c38e45af740.
+---
+ drivers/vhost/vsock.c        |  8 +++++---
+ include/linux/virtio_vsock.h | 32 +++-----------------------------
+ 2 files changed, 8 insertions(+), 32 deletions(-)
+
+diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
+index deaadc2503a2..ad89ee3676db 100644
+--- a/drivers/vhost/vsock.c
++++ b/drivers/vhost/vsock.c
+@@ -352,7 +352,7 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq,
+ 		return NULL;
+ 
+ 	/* len contains both payload and hdr */
+-	skb = virtio_vsock_alloc_skb(len, GFP_KERNEL);
++	skb = virtio_vsock_alloc_linear_skb(len, GFP_KERNEL);
+ 	if (!skb)
+ 		return NULL;
+ 
+@@ -381,8 +381,10 @@ vhost_vsock_alloc_skb(struct vhost_virtqueue *vq,
+ 
+ 	virtio_vsock_skb_put(skb, payload_len);
+ 
+-	if (skb_copy_datagram_from_iter(skb, 0, &iov_iter, payload_len)) {
+-		vq_err(vq, "Failed to copy %zu byte payload\n", payload_len);
++	nbytes = copy_from_iter(skb->data, payload_len, &iov_iter);
++	if (nbytes != payload_len) {
++		vq_err(vq, "Expected %zu byte payload, got %zu bytes\n",
++		       payload_len, nbytes);
+ 		kfree_skb(skb);
+ 		return NULL;
+ 	}
+diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
+index e3d7afa29894..1ff7389ed244 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)
+ 
+ static inline void virtio_vsock_skb_put(struct sk_buff *skb, u32 len)
+ {
+-	DEBUG_NET_WARN_ON_ONCE(skb->len);
+-
+-	if (skb_is_nonlinear(skb))
+-		skb->len = len;
+-	else
+-		skb_put(skb, len);
++	skb_put(skb, len);
+ }
+ 
+ static inline struct sk_buff *
+-__virtio_vsock_alloc_skb_with_frags(unsigned int header_len,
+-				    unsigned int data_len,
+-				    gfp_t mask)
++virtio_vsock_alloc_linear_skb(unsigned int size, gfp_t mask)
+ {
+ 	struct sk_buff *skb;
+-	int err;
+ 
+-	skb = alloc_skb_with_frags(header_len, data_len,
+-				   PAGE_ALLOC_COSTLY_ORDER, &err, mask);
++	skb = alloc_skb(size, mask);
+ 	if (!skb)
+ 		return NULL;
+ 
+ 	skb_reserve(skb, VIRTIO_VSOCK_SKB_HEADROOM);
+-	skb->data_len = data_len;
+ 	return skb;
+ }
+ 
+-static inline struct sk_buff *
+-virtio_vsock_alloc_linear_skb(unsigned int size, gfp_t mask)
+-{
+-	return __virtio_vsock_alloc_skb_with_frags(size, 0, mask);
+-}
+-
+-static inline struct sk_buff *virtio_vsock_alloc_skb(unsigned int size, gfp_t mask)
+-{
+-	if (size <= SKB_WITH_OVERHEAD(PAGE_SIZE << PAGE_ALLOC_COSTLY_ORDER))
+-		return virtio_vsock_alloc_linear_skb(size, mask);
+-
+-	size -= VIRTIO_VSOCK_SKB_HEADROOM;
+-	return __virtio_vsock_alloc_skb_with_frags(VIRTIO_VSOCK_SKB_HEADROOM,
+-						   size, mask);
+-}
+-
+ static inline void
+ virtio_vsock_skb_queue_head(struct sk_buff_head *list, struct sk_buff *skb)
+ {
+-- 
+2.52.0
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 70b8ab2d1d4ba865efe08ba1307f694b9f154859 Mon Sep 17 00:00:00 2001`
	`1`	`+From 18d2a787f2160edb05cd536fb74109e47ff8e2b8 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Sergio Lopez <slp@sinrega.org>`
`3`	`3`	`Date: Fri, 10 Sep 2021 13:05:01 +0200`
`4`	`4`	`Subject: [PATCH 1/4] virtio: enable DMA API if memory is restricted`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From b7bfb048dc9df54f4dc742e4787766a7fd2e39f8 Mon Sep 17 00:00:00 2001`
	`1`	`+From 84452765ffa7957a573d4782eced150043dbf7d6 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Sergio Lopez <slp@redhat.com>`
`3`	`3`	`Date: Thu, 20 Oct 2022 10:23:16 +0200`
`4`	`4`	`Subject: [PATCH 2/4] x86/sev: write AP reset vector`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From 8dfe0e6ed7600a8cd1e2caa7b1e61116493d5001 Mon Sep 17 00:00:00 2001`
	`1`	`+From aa4dfd6648a87fc12da362ab2381accd31ce212e Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Sergio Lopez <slp@redhat.com>`
`3`	`3`	`Date: Wed, 3 Aug 2022 12:35:12 +0200`
`4`	`4`	`Subject: [PATCH 3/4] Implement driver to retrieve secrets from cmdline`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-From c388e16aabfa5e989d0ca71c95ac24acfd72d2d4 Mon Sep 17 00:00:00 2001`
	`1`	`+From d0d3b5b18f81c9660e201b056909e0f52c519546 Mon Sep 17 00:00:00 2001`
`2`	`2`	`From: Sergio Lopez <slp@redhat.com>`
`3`	`3`	`Date: Wed, 5 Jun 2024 16:20:08 +0200`
`4`	`4`	`Subject: [PATCH 4/4] x86/sev: Avoid using native_cpuid`