Skip to content

Commit 6693731

Browse files
willdeaconmstsirkin
authored andcommitted
vsock/virtio: Allocate nonlinear SKBs for handling large transmit buffers
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 <[email protected]> Signed-off-by: Will Deacon <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 8ca7615 commit 6693731

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

net/vmw_vsock/virtio_transport_common.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ static int virtio_transport_fill_skb(struct sk_buff *skb,
109109
return __zerocopy_sg_from_iter(info->msg, NULL, skb,
110110
&info->msg->msg_iter, len, NULL);
111111

112-
return memcpy_from_msg(skb_put(skb, len), info->msg, len);
112+
virtio_vsock_skb_put(skb, len);
113+
return skb_copy_datagram_from_iter(skb, 0, &info->msg->msg_iter, len);
113114
}
114115

115116
static void virtio_transport_init_hdr(struct sk_buff *skb,
@@ -261,7 +262,7 @@ static struct sk_buff *virtio_transport_alloc_skb(struct virtio_vsock_pkt_info *
261262
if (!zcopy)
262263
skb_len += payload_len;
263264

264-
skb = virtio_vsock_alloc_linear_skb(skb_len, GFP_KERNEL);
265+
skb = virtio_vsock_alloc_skb(skb_len, GFP_KERNEL);
265266
if (!skb)
266267
return NULL;
267268

0 commit comments

Comments
 (0)