Skip to content

Commit bd2cd4a

Browse files
Florian Westphalkevmw
authored andcommitted
nbd/server: push pending frames after sending reply
qemu-nbd doesn't set TCP_NODELAY on the tcp socket. Kernel waits for more data and avoids transmission of small packets. Without TLS this is barely noticeable, but with TLS this really shows. Booting a VM via qemu-nbd on localhost (with tls) takes more than 2 minutes on my system. tcpdump shows frequent wait periods, where no packets get sent for a 40ms period. Add explicit (un)corking when processing (and responding to) requests. "TCP_CORK, &zero" after earlier "CORK, &one" will flush pending data. VM Boot time: main: no tls: 23s, with tls: 2m45s patched: no tls: 14s, with tls: 15s VM Boot time, qemu-nbd via network (same lan): main: no tls: 18s, with tls: 1m50s patched: no tls: 17s, with tls: 18s Future optimization: if we could detect if there is another pending request we could defer the uncork operation because more data would be appended. Signed-off-by: Florian Westphal <fw@strlen.de> Message-Id: <20230324104720.2498-1-fw@strlen.de> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
1 parent e3debd5 commit bd2cd4a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

nbd/server.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2667,6 +2667,8 @@ static coroutine_fn void nbd_trip(void *opaque)
26672667
goto disconnect;
26682668
}
26692669

2670+
qio_channel_set_cork(client->ioc, true);
2671+
26702672
if (ret < 0) {
26712673
/* It wasn't -EIO, so, according to nbd_co_receive_request()
26722674
* semantics, we should return the error to the client. */
@@ -2692,6 +2694,7 @@ static coroutine_fn void nbd_trip(void *opaque)
26922694
goto disconnect;
26932695
}
26942696

2697+
qio_channel_set_cork(client->ioc, false);
26952698
done:
26962699
nbd_request_put(req);
26972700
nbd_client_put(client);

0 commit comments

Comments
 (0)