mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stefano Garzarella <sgarzare@redhat.com>
To: netdev@vger.kernel.org
Cc: Jason Wang <jasowang@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org,
	"David S. Miller" <davem@davemloft.net>
Subject: [PATCH RFC 2/4] vhost/vsock: split packets to send using multiple buffers
Date: Thu,  4 Apr 2019 12:58:36 +0200	[thread overview]
Message-ID: <20190404105838.101559-3-sgarzare@redhat.com> (raw)
In-Reply-To: <20190404105838.101559-1-sgarzare@redhat.com>

If the packets to sent to the guest are bigger than the buffer
available, we can split them, using multiple buffers and fixing
the length in the packet header.
This is safe since virtio-vsock supports only stream sockets.

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
 drivers/vhost/vsock.c | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index bb5fc0e9fbc2..9951b7e661f6 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -94,7 +94,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 		struct iov_iter iov_iter;
 		unsigned out, in;
 		size_t nbytes;
-		size_t len;
+		size_t iov_len, payload_len;
 		int head;
 
 		spin_lock_bh(&vsock->send_pkt_list_lock);
@@ -139,8 +139,18 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 			break;
 		}
 
-		len = iov_length(&vq->iov[out], in);
-		iov_iter_init(&iov_iter, READ, &vq->iov[out], in, len);
+		payload_len = pkt->len - pkt->off;
+		iov_len = iov_length(&vq->iov[out], in);
+		iov_iter_init(&iov_iter, READ, &vq->iov[out], in, iov_len);
+
+		/* If the packet is greater than the space available in the
+		 * buffer, we split it using multiple buffers.
+		 */
+		if (payload_len > iov_len - sizeof(pkt->hdr))
+			payload_len = iov_len - sizeof(pkt->hdr);
+
+		/* Set the correct length in the header */
+		pkt->hdr.len = cpu_to_le32(payload_len);
 
 		nbytes = copy_to_iter(&pkt->hdr, sizeof(pkt->hdr), &iov_iter);
 		if (nbytes != sizeof(pkt->hdr)) {
@@ -149,16 +159,29 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 			break;
 		}
 
-		nbytes = copy_to_iter(pkt->buf, pkt->len, &iov_iter);
-		if (nbytes != pkt->len) {
+		nbytes = copy_to_iter(pkt->buf + pkt->off, payload_len,
+				      &iov_iter);
+		if (nbytes != payload_len) {
 			virtio_transport_free_pkt(pkt);
 			vq_err(vq, "Faulted on copying pkt buf\n");
 			break;
 		}
 
-		vhost_add_used(vq, head, sizeof(pkt->hdr) + pkt->len);
+		vhost_add_used(vq, head, sizeof(pkt->hdr) + payload_len);
 		added = true;
 
+		pkt->off += payload_len;
+
+		/* If we didn't send all the payload we can requeue the packet
+		 * to send it with the next available buffer.
+		 */
+		if (pkt->off < pkt->len) {
+			spin_lock_bh(&vsock->send_pkt_list_lock);
+			list_add(&pkt->list, &vsock->send_pkt_list);
+			spin_unlock_bh(&vsock->send_pkt_list_lock);
+			continue;
+		}
+
 		if (pkt->reply) {
 			int val;
 
-- 
2.20.1


  parent reply	other threads:[~2019-04-04 10:58 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-04 10:58 [PATCH RFC 0/4] vsock/virtio: optimizations to increase the throughput Stefano Garzarella
2019-04-04 10:58 ` [PATCH RFC 1/4] vsock/virtio: reduce credit update messages Stefano Garzarella
2019-04-04 19:15   ` Stefan Hajnoczi
2019-04-05  8:16     ` Stefano Garzarella
2019-04-08  9:25       ` Stefan Hajnoczi
2019-04-04 10:58 ` Stefano Garzarella [this message]
2019-04-05  8:13   ` [PATCH RFC 2/4] vhost/vsock: split packets to send using multiple buffers Stefan Hajnoczi
2019-04-05  9:36     ` Stefano Garzarella
2019-04-08  9:28       ` Stefan Hajnoczi
2019-04-04 10:58 ` [PATCH RFC 3/4] vsock/virtio: change the maximum packet size allowed Stefano Garzarella
2019-04-05  8:24   ` Stefan Hajnoczi
2019-04-05 10:07     ` Stefano Garzarella
2019-04-08  9:37       ` Stefan Hajnoczi
2019-04-08 14:55         ` Stefano Garzarella
2019-04-08 14:57           ` Michael S. Tsirkin
2019-04-08 15:17             ` Stefano Garzarella
2019-04-08 15:45               ` Stefan Hajnoczi
2019-04-04 10:58 ` [PATCH RFC 4/4] vsock/virtio: increase RX buffer size to 64 KiB Stefano Garzarella
2019-04-05  8:44   ` Stefan Hajnoczi
2019-04-08  6:35     ` Jason Wang
2019-04-04 14:14 ` [PATCH RFC 0/4] vsock/virtio: optimizations to increase the throughput Stefan Hajnoczi
2019-04-04 15:44   ` Stefano Garzarella
2019-04-04 15:52 ` Michael S. Tsirkin
2019-04-04 16:47   ` Stefano Garzarella
2019-04-04 18:04     ` Michael S. Tsirkin
2019-04-05  7:49       ` Stefano Garzarella
2019-04-08  9:23         ` Stefan Hajnoczi
2019-04-08  6:43 ` Jason Wang
2019-04-08  9:44   ` Stefan Hajnoczi
2019-04-09  8:36     ` Jason Wang
2019-04-09  9:13   ` Stefano Garzarella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190404105838.101559-3-sgarzare@redhat.com \
    --to=sgarzare@redhat.com \
    --cc=davem@davemloft.net \
    --cc=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=stefanha@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®