Skip to content

Commit 0386bd3

Browse files
mmhalkuba-moo
authored andcommitted
vsock/virtio: Coalesce only linear skb
vsock/virtio common tries to coalesce buffers in rx queue: if a linear skb (with a spare tail room) is followed by a small skb (length limited by GOOD_COPY_LEN = 128), an attempt is made to join them. Since the introduction of MSG_ZEROCOPY support, assumption that a small skb will always be linear is incorrect. In the zerocopy case, data is lost and the linear skb is appended with uninitialized kernel memory. Of all 3 supported virtio-based transports, only loopback-transport is affected. G2H virtio-transport rx queue operates on explicitly linear skbs; see virtio_vsock_alloc_linear_skb() in virtio_vsock_rx_fill(). H2G vhost-transport may allocate non-linear skbs, but only for sizes that are not considered for coalescence; see PAGE_ALLOC_COSTLY_ORDER in virtio_vsock_alloc_skb(). Ensure only linear skbs are coalesced. Note that skb_tailroom(last_skb) > 0 guarantees last_skb is linear. Fixes: 581512a ("vsock/virtio: MSG_ZEROCOPY flag support") Signed-off-by: Michal Luczaj <mhal@rbox.co> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Link: https://patch.msgid.link/20260113-vsock-recv-coalescence-v2-1-552b17837cf4@rbox.co Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent c4efd7a commit 0386bd3

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

net/vmw_vsock/virtio_transport_common.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,9 +1359,11 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
13591359

13601360
/* Try to copy small packets into the buffer of last packet queued,
13611361
* to avoid wasting memory queueing the entire buffer with a small
1362-
* payload.
1362+
* payload. Skip non-linear (e.g. zerocopy) skbs; these carry payload
1363+
* in skb_shinfo.
13631364
*/
1364-
if (len <= GOOD_COPY_LEN && !skb_queue_empty(&vvs->rx_queue)) {
1365+
if (len <= GOOD_COPY_LEN && !skb_queue_empty(&vvs->rx_queue) &&
1366+
!skb_is_nonlinear(skb)) {
13651367
struct virtio_vsock_hdr *last_hdr;
13661368
struct sk_buff *last_skb;
13671369

0 commit comments

Comments
 (0)