nbd: make nbd_read* return -EIO on error
commit5082fc82a6bc3fc06a04be47d39777c7cff61e5b
authorRoman Kagan <rvkagan@yandex-team.ru>
Fri, 29 Jan 2021 07:38:59 +0000 (29 10:38 +0300)
committerEric Blake <eblake@redhat.com>
Wed, 3 Feb 2021 14:17:12 +0000 (3 08:17 -0600)
tree43d8289773e56056ba55e57d5d197d85e8445db9
parentddde5ee769fcc84b96f879d7b94f35268f69ca3b
nbd: make nbd_read* return -EIO on error

NBD reconnect logic considers the error code from the functions that
read NBD messages to tell if reconnect should be attempted or not: it is
attempted on -EIO, otherwise the client transitions to NBD_CLIENT_QUIT
state (see nbd_channel_error).  This error code is propagated from the
primitives like nbd_read.

The problem, however, is that nbd_read itself turns every error into -1
rather than -EIO.  As a result, if the NBD server happens to die while
sending the message, the client in QEMU receives less data than it
expects, considers it as a fatal error, and wouldn't attempt
reestablishing the connection.

Fix it by turning every negative return from qio_channel_read_all into
-EIO returned from nbd_read.  Apparently that was the original behavior,
but got broken later.  Also adjust nbd_readXX to follow.

Fixes: e6798f06a6 ("nbd: generalize usage of nbd_read")
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210129073859.683063-4-rvkagan@yandex-team.ru>
Signed-off-by: Eric Blake <eblake@redhat.com>
include/block/nbd.h