From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCKr-00018z-T5 for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:30:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTCKn-0006Aa-5T for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:30:45 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:52167) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTCKm-0006AK-Vk for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:30:41 -0400 Received: by mail-ee0-f53.google.com with SMTP id d17so1119798eek.12 for ; Fri, 19 Apr 2013 07:30:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 19 Apr 2013 16:30:29 +0200 Message-Id: <1366381830-11267-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1366381830-11267-1-git-send-email-pbonzini@redhat.com> References: <1366381830-11267-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] nbd: use TCP_CORK in nbd_co_send_request() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com From: Stefan Hajnoczi Use TCP_CORK to defer packet transmission until both the header and the payload have been written. Suggested-by: Nick Thomas Signed-off-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- block/nbd.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 662df16..485bbf0 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -334,13 +334,23 @@ static int nbd_co_send_request(BDRVNBDState *s, struct nbd_request *request, s->send_coroutine = qemu_coroutine_self(); qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, nbd_restart_write, nbd_have_request, s); - rc = nbd_send_request(s->sock, request); - if (rc >= 0 && qiov) { - ret = qemu_co_sendv(s->sock, qiov->iov, qiov->niov, - offset, request->len); - if (ret != request->len) { - rc = -EIO; + if (qiov) { + if (!s->is_unix) { + socket_set_cork(s->sock, 1); } + rc = nbd_send_request(s->sock, request); + if (rc >= 0) { + ret = qemu_co_sendv(s->sock, qiov->iov, qiov->niov, + offset, request->len); + if (ret != request->len) { + rc = -EIO; + } + } + if (!s->is_unix) { + socket_set_cork(s->sock, 0); + } + } else { + rc = nbd_send_request(s->sock, request); } qemu_aio_set_fd_handler(s->sock, nbd_reply_ready, NULL, nbd_have_request, s); -- 1.8.1.4