Prechádzať zdrojové kódy

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>
Florian Westphal 2 rokov pred
rodič
commit
bd2cd4a441
1 zmenil súbory, kde vykonal 3 pridanie a 0 odobranie
  1. 3 0
      nbd/server.c

+ 3 - 0
nbd/server.c

@@ -2667,6 +2667,8 @@ static coroutine_fn void nbd_trip(void *opaque)
         goto disconnect;
         goto disconnect;
     }
     }
 
 
+    qio_channel_set_cork(client->ioc, true);
+
     if (ret < 0) {
     if (ret < 0) {
         /* It wasn't -EIO, so, according to nbd_co_receive_request()
         /* It wasn't -EIO, so, according to nbd_co_receive_request()
          * semantics, we should return the error to the client. */
          * semantics, we should return the error to the client. */
@@ -2692,6 +2694,7 @@ static coroutine_fn void nbd_trip(void *opaque)
         goto disconnect;
         goto disconnect;
     }
     }
 
 
+    qio_channel_set_cork(client->ioc, false);
 done:
 done:
     nbd_request_put(req);
     nbd_request_put(req);
     nbd_client_put(client);
     nbd_client_put(client);