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

[linux-2.6-block.git] / drivers / vhost / vsock.c

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