[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] nbd: do not hang nbd_wr_syncv if outside a coro
Daniel P. Berrange
Re: [Qemu-devel] [PATCH] nbd: do not hang nbd_wr_syncv if outside a coroutine and no available data
Thu, 7 Apr 2016 14:45:50 +0100
On Thu, Apr 07, 2016 at 01:44:55PM +0200, Paolo Bonzini wrote:
> Until commit 1c778ef7 ("nbd: convert to using I/O channels for actual
> socket I/O", 2016-02-16), nbd_wr_sync returned -EAGAIN this scenario.
> nbd_reply_ready required these semantics because it has two conflicting
> 1) if a reply can be received on the socket, nbd_reply_ready needs
> to read the header outside coroutine context to identify _which_
> coroutine to enter to process the rest of the reply
> 2) on the other hand, nbd_reply_ready can find a false positive if
> another thread (e.g. a VCPU thread running aio_poll) sneaks in and
> calls nbd_reply_ready too. In this case nbd_reply_ready does nothing
> and expects nbd_wr_syncv to return -EAGAIN.
> Currently, the solution to the first requirement is to wait in the very
> rare case of a read() that doesn't retrieve the reply header in its
> entirety; this is what nbd_wr_syncv does by calling qio_channel_wait().
> However, the unconditional call to qio_channel_wait() breaks the second
> requirement. To fix this, the patch makes nbd_wr_syncv return -EAGAIN
> if done is zero, similar to the code before commit 1c778ef7.
> This is okay because NBD client-side negotiation is the only other case
> that calls nbd_wr_syncv outside a coroutine, and it places the socket
> in blocking mode. On the other hand, it is a bit unpleasant to put
> this in nbd_wr_syncv(), because the function is used by both client
> and server.
> The full fix would be to add a counter to NbdClientSession for how
> many bytes have been filled in s->reply. Then a reply can be filled
> by multiple separate invocations of nbd_reply_ready and the
> qio_channel_wait() call can be removed completely. Something to
> consider for 2.7...
> Reported-by: Changlong Xie <address@hidden>
> Cc: Daniel P. Berrange <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
> nbd/common.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Reviewed-by: Daniel P. berrange <address@hidden>
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|