diff options
| author | Sergio Lopez <slp@redhat.com> | 2019-09-12 13:00:33 +0200 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-09-24 07:30:19 -0500 |
| commit | b4961249af0403fa55aae57c4c8806b24f7a7b33 (patch) | |
| tree | 6358a425a762fa8fd186fcea9b9ae85efc30985f /nbd | |
| parent | 1b5c15cebd5cc7595337a8a7cf14f6a707605e99 (diff) | |
| download | qemu-b4961249af0403fa55aae57c4c8806b24f7a7b33.zip | |
nbd/server: attach client channel to the export's AioContext
On creation, the export's AioContext is set to the same one as the
BlockBackend, while the AioContext in the client QIOChannel is left
untouched.
As a result, when using data-plane, nbd_client_receive_next_request()
schedules coroutines in the IOThread AioContext, while the client's
QIOChannel is serviced from the main_loop, potentially triggering the
assertion at qio_channel_restart_[read|write].
To fix this, as soon we have the export corresponding to the client,
we call qio_channel_attach_aio_context() to attach the QIOChannel
context to the export's AioContext. This matches with the logic at
blk_aio_attached().
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1748253
Signed-off-by: Sergio Lopez <slp@redhat.com>
Message-Id: <20190912110032.26395-1-slp@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'nbd')
| -rw-r--r-- | nbd/server.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nbd/server.c b/nbd/server.c index 28c3c8be85..31d624e146 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -1297,6 +1297,11 @@ static coroutine_fn int nbd_negotiate(NBDClient *client, Error **errp) return ret; } + /* Attach the channel to the same AioContext as the export */ + if (client->exp && client->exp->ctx) { + qio_channel_attach_aio_context(client->ioc, client->exp->ctx); + } + assert(!client->optlen); trace_nbd_negotiate_success(); |