diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-06-10 13:08:02 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2021-06-18 12:21:22 -0500 |
| commit | bbfb7c2f350262f893642433dea66352fc168295 (patch) | |
| tree | 3e97e429acbe46ffac86019a601265952154c8c8 /block/nbd.c | |
| parent | 91e0998f5ab88e575b5d1b9bc55e0d179b9224f1 (diff) | |
| download | qemu-bbfb7c2f350262f893642433dea66352fc168295.zip qemu-bbfb7c2f350262f893642433dea66352fc168295.tar.gz qemu-bbfb7c2f350262f893642433dea66352fc168295.tar.bz2 | |
block/nbd: safer transition to receiving request
req->receiving is a flag of request being in one concrete yield point
in nbd_co_do_receive_one_chunk().
Such kind of boolean flag is always better to unset before scheduling
the coroutine, to avoid double scheduling. So, let's be more careful.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210610100802.5888-33-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/nbd.c')
| -rw-r--r-- | block/nbd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/nbd.c b/block/nbd.c index 5cfb749..3cbee76 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -150,6 +150,7 @@ static void nbd_recv_coroutines_wake_all(BDRVNBDState *s) NBDClientRequest *req = &s->requests[i]; if (req->coroutine && req->receiving) { + req->receiving = false; aio_co_wake(req->coroutine); } } @@ -548,6 +549,7 @@ static coroutine_fn void nbd_connection_entry(void *opaque) * connection_co happens through a bottom half, which can only * run after we yield. */ + s->requests[i].receiving = false; aio_co_wake(s->requests[i].coroutine); qemu_coroutine_yield(); } @@ -934,7 +936,7 @@ static coroutine_fn int nbd_co_do_receive_one_chunk( /* Wait until we're woken up by nbd_connection_entry. */ s->requests[i].receiving = true; qemu_coroutine_yield(); - s->requests[i].receiving = false; + assert(!s->requests[i].receiving); if (!nbd_client_connected(s)) { error_setg(errp, "Connection closed"); return -EIO; |