vsock/virtio/vhost: read data from non-linear skb

This is preparation patch for MSG_ZEROCOPY support. It adds handling of
non-linear skbs by replacing direct calls of 'memcpy_to_msg()' with
'skb_copy_datagram_iter()'. Main advantage of the second one is that it
can handle paged part of the skb by using 'kmap()' on each page, but if
there are no pages in the skb, it behaves like simple copying to iov
iterator. This patch also adds new field to the control block of skb -
this value shows current offset in the skb to read next portion of data
(it doesn't matter linear it or not). Idea behind this field is that
'skb_copy_datagram_iter()' handles both types of skb internally - it
just needs an offset from which to copy data from the given skb. This
offset is incremented on each read from skb. This approach allows to
simplify handling of both linear and non-linear skbs, because for
linear skb we need to call 'skb_pull()' after reading data from it,
while in non-linear case we need to update 'data_len'.

Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 817d377a3f360f6cd87f4da1d02debaac4d34545..83711aad855c421bf82fcc8cb1c87861d2e35bef 100644 (file)
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -114,6 +114,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
                struct sk_buff *skb;
                unsigned out, in;
                size_t nbytes;
+               u32 offset;
                int head;
 
                skb = virtio_vsock_skb_dequeue(&vsock->send_pkt_queue);
@@ -156,7 +157,8 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
                }
 
                iov_iter_init(&iov_iter, ITER_DEST, &vq->iov[out], in, iov_len);
-               payload_len = skb->len;
+               offset = VIRTIO_VSOCK_SKB_CB(skb)->offset;
+               payload_len = skb->len - offset;
                hdr = virtio_vsock_hdr(skb);
 
                /* If the packet is greater than the space available in the
@@ -197,8 +199,10 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
                        break;
                }
 
-               nbytes = copy_to_iter(skb->data, payload_len, &iov_iter);
-               if (nbytes != payload_len) {
+               if (skb_copy_datagram_iter(skb,
+                                          offset,
+                                          &iov_iter,
+                                          payload_len)) {
                        kfree_skb(skb);
                        vq_err(vq, "Faulted on copying pkt buf\n");
                        break;
@@ -212,13 +216,13 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
                vhost_add_used(vq, head, sizeof(*hdr) + payload_len);
                added = true;
 
-               skb_pull(skb, payload_len);
+               VIRTIO_VSOCK_SKB_CB(skb)->offset += payload_len;
                total_len += payload_len;
 
                /* If we didn't send all the payload we can requeue the packet
                 * to send it with the next available buffer.
                 */
-               if (skb->len > 0) {
+               if (VIRTIO_VSOCK_SKB_CB(skb)->offset < skb->len) {
                        hdr->flags |= cpu_to_le32(flags_to_restore);
 
                        /* We are queueing the same skb to handle

diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
index c58453699ee9878168f97a4037894944b02e6008..a91fbdf233e4f82e2a39c794f42b6771d0fd7167 100644 (file)
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -12,6 +12,7 @@
 struct virtio_vsock_skb_cb {
        bool reply;
        bool tap_delivered;
+       u32 offset;
 };
 
 #define VIRTIO_VSOCK_SKB_CB(skb) ((struct virtio_vsock_skb_cb *)((skb)->cb))

diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index 352d042b130b54cdc074915e17f4627bb4d8c58f..3e08d52a9355bfd94cd97ff2c0abd6ea0111a527 100644 (file)
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -364,9 +364,10 @@ virtio_transport_stream_do_peek(struct vsock_sock *vsk,
                spin_unlock_bh(&vvs->rx_lock);
 
                /* sk_lock is held by caller so no one else can dequeue.
-                * Unlock rx_lock since memcpy_to_msg() may sleep.
+                * Unlock rx_lock since skb_copy_datagram_iter() may sleep.
                 */
-               err = memcpy_to_msg(msg, skb->data, bytes);
+               err = skb_copy_datagram_iter(skb, VIRTIO_VSOCK_SKB_CB(skb)->offset,
+                                            &msg->msg_iter, bytes);
                if (err)
                        goto out;
 
@@ -410,25 +411,27 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,
        while (total < len && !skb_queue_empty(&vvs->rx_queue)) {
                skb = skb_peek(&vvs->rx_queue);
 
-               bytes = len - total;
-               if (bytes > skb->len)
-                       bytes = skb->len;
+               bytes = min_t(size_t, len - total,
+                             skb->len - VIRTIO_VSOCK_SKB_CB(skb)->offset);
 
                /* sk_lock is held by caller so no one else can dequeue.
-                * Unlock rx_lock since memcpy_to_msg() may sleep.
+                * Unlock rx_lock since skb_copy_datagram_iter() may sleep.
                 */
                spin_unlock_bh(&vvs->rx_lock);
 
-               err = memcpy_to_msg(msg, skb->data, bytes);
+               err = skb_copy_datagram_iter(skb,
+                                            VIRTIO_VSOCK_SKB_CB(skb)->offset,
+                                            &msg->msg_iter, bytes);
                if (err)
                        goto out;
 
                spin_lock_bh(&vvs->rx_lock);
 
                total += bytes;
-               skb_pull(skb, bytes);
 
-               if (skb->len == 0) {
+               VIRTIO_VSOCK_SKB_CB(skb)->offset += bytes;
+
+               if (skb->len == VIRTIO_VSOCK_SKB_CB(skb)->offset) {
                        u32 pkt_len = le32_to_cpu(virtio_vsock_hdr(skb)->len);
 
                        virtio_transport_dec_rx_pkt(vvs, pkt_len);
@@ -492,9 +495,10 @@ virtio_transport_seqpacket_do_peek(struct vsock_sock *vsk,
                        spin_unlock_bh(&vvs->rx_lock);
 
                        /* sk_lock is held by caller so no one else can dequeue.
-                        * Unlock rx_lock since memcpy_to_msg() may sleep.
+                        * Unlock rx_lock since skb_copy_datagram_iter() may sleep.
                         */
-                       err = memcpy_to_msg(msg, skb->data, bytes);
+                       err = skb_copy_datagram_iter(skb, VIRTIO_VSOCK_SKB_CB(skb)->offset,
+                                                    &msg->msg_iter, bytes);
                        if (err)
                                return err;
 
@@ -553,11 +557,13 @@ static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk,
                                int err;
 
                                /* sk_lock is held by caller so no one else can dequeue.
-                                * Unlock rx_lock since memcpy_to_msg() may sleep.
+                                * Unlock rx_lock since skb_copy_datagram_iter() may sleep.
                                 */
                                spin_unlock_bh(&vvs->rx_lock);
 
-                               err = memcpy_to_msg(msg, skb->data, bytes_to_copy);
+                               err = skb_copy_datagram_iter(skb, 0,
+                                                            &msg->msg_iter,
+                                                            bytes_to_copy);
                                if (err) {
                                        /* Copy of message failed. Rest of
                                         * fragments will be freed without copy.