Skip to content

Commit 69c5bf3

Browse files
willdeacongregkh
authored andcommitted
vsock/virtio: Allocate nonlinear SKBs for handling large transmit buffers
[Upstream commit 6693731] When transmitting a vsock packet, virtio_transport_send_pkt_info() calls virtio_transport_alloc_linear_skb() to allocate and fill SKBs with the transmit data. Unfortunately, these are always linear allocations and can therefore result in significant pressure on kmalloc() considering that the maximum packet size (VIRTIO_VSOCK_MAX_PKT_BUF_SIZE + VIRTIO_VSOCK_SKB_HEADROOM) is a little over 64KiB, resulting in a 128KiB allocation for each packet. Rework the vsock SKB allocation so that, for sizes with page order greater than PAGE_ALLOC_COSTLY_ORDER, a nonlinear SKB is allocated instead with the packet header in the SKB and the transmit data in the fragments. Note that this affects both the vhost and virtio transports. Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Signed-off-by: Will Deacon <will@kernel.org> Message-Id: <20250717090116.11987-10-will@kernel.org> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Heitor Alves de Siqueira <halves@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 65e808a commit 69c5bf3

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

net/vmw_vsock/virtio_transport_common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ static int virtio_transport_fill_skb(struct sk_buff *skb,
111111
&info->msg->msg_iter,
112112
len);
113113

114-
return memcpy_from_msg(skb_put(skb, len), info->msg, len);
114+
virtio_vsock_skb_put(skb, len);
115+
return skb_copy_datagram_from_iter(skb, 0, &info->msg->msg_iter, len);
115116
}
116117

117118
static void virtio_transport_init_hdr(struct sk_buff *skb,
@@ -263,7 +264,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
263264
if (!zcopy)
264265
skb_len += payload_len;
265266

266-
skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
267+
skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
267268
if (!skb)
268269
return NULL;
269270

0 commit comments

Comments
 (0)