2013-12-01 22:23:41 +01:00
|
|
|
/*
|
|
|
|
* QEMU Block driver for NBD
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Bull S.A.S.
|
|
|
|
* Author: Laurent Vivier <Laurent.Vivier@bull.net>
|
|
|
|
*
|
|
|
|
* Some parts:
|
|
|
|
* Copyright (C) 2007 Anthony Liguori <anthony@codemonkey.ws>
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "nbd-client.h"
|
|
|
|
#include "qemu/sockets.h"
|
|
|
|
|
|
|
|
#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs))
|
|
|
|
#define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs))
|
|
|
|
|
2013-12-01 22:23:45 +01:00
|
|
|
static void nbd_recv_coroutines_enter_all(NbdClientSession *s)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_NBD_REQUESTS; i++) {
|
|
|
|
if (s->recv_coroutine[i]) {
|
|
|
|
qemu_coroutine_enter(s->recv_coroutine[i], NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
static void nbd_teardown_connection(BlockDriverState *bs)
|
2014-02-26 15:30:18 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
|
|
|
|
2014-02-26 15:30:18 +01:00
|
|
|
/* finish any pending coroutines */
|
|
|
|
shutdown(client->sock, 2);
|
|
|
|
nbd_recv_coroutines_enter_all(client);
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_client_detach_aio_context(bs);
|
2014-02-26 15:30:18 +01:00
|
|
|
closesocket(client->sock);
|
|
|
|
client->sock = -1;
|
|
|
|
}
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
static void nbd_reply_ready(void *opaque)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
BlockDriverState *bs = opaque;
|
|
|
|
NbdClientSession *s = nbd_get_client_session(bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
uint64_t i;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (s->reply.handle == 0) {
|
|
|
|
/* No reply already in flight. Fetch a header. It is possible
|
|
|
|
* that another thread has done the same thing in parallel, so
|
|
|
|
* the socket is not readable anymore.
|
|
|
|
*/
|
|
|
|
ret = nbd_receive_reply(s->sock, &s->reply);
|
|
|
|
if (ret == -EAGAIN) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (ret < 0) {
|
|
|
|
s->reply.handle = 0;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* There's no need for a mutex on the receive side, because the
|
|
|
|
* handler acts as a synchronization point and ensures that only
|
|
|
|
* one coroutine is called until the reply finishes. */
|
|
|
|
i = HANDLE_TO_INDEX(s, s->reply.handle);
|
|
|
|
if (i >= MAX_NBD_REQUESTS) {
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (s->recv_coroutine[i]) {
|
|
|
|
qemu_coroutine_enter(s->recv_coroutine[i], NULL);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fail:
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_teardown_connection(bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void nbd_restart_write(void *opaque)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
BlockDriverState *bs = opaque;
|
2013-12-01 22:23:41 +01:00
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
qemu_coroutine_enter(nbd_get_client_session(bs)->send_coroutine, NULL);
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
static int nbd_co_send_request(BlockDriverState *bs,
|
|
|
|
struct nbd_request *request,
|
|
|
|
QEMUIOVector *qiov, int offset)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *s = nbd_get_client_session(bs);
|
2014-05-08 16:34:43 +02:00
|
|
|
AioContext *aio_context;
|
nbd: fix the co_queue multi-adding bug
When we tested the VM migartion between different hosts with NBD
devices, we found if we sent a cancel command after the drive_mirror
was just started, a coroutine re-enter error would occur. The stack
was as follow:
(gdb) bt
00) 0x00007fdfc744d885 in raise () from /lib64/libc.so.6
01) 0x00007fdfc744ee61 in abort () from /lib64/libc.so.6
02) 0x00007fdfca467cc5 in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:118
03) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedb400) at
qemu-coroutine-lock.c:59
04) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedb400) at qemu-coroutine.c:96
05) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:123
06) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedbdc0) at
qemu-coroutine-lock.c:59
07) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedbdc0) at qemu-coroutine.c:96
08) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedbdc0, opaque=0x0)
at qemu-coroutine.c:123
09) 0x00007fdfca4a1fa4 in nbd_recv_coroutines_enter_all (s=0x7fdfcaef7dd0) at
block/nbd-client.c:41
10) 0x00007fdfca4a1ff9 in nbd_teardown_connection (client=0x7fdfcaef7dd0) at
block/nbd-client.c:50
11) 0x00007fdfca4a20f0 in nbd_reply_ready (opaque=0x7fdfcaef7dd0) at
block/nbd-client.c:92
12) 0x00007fdfca45ed80 in aio_dispatch (ctx=0x7fdfcae15e90) at aio-posix.c:144
13) 0x00007fdfca45ef1b in aio_poll (ctx=0x7fdfcae15e90, blocking=false) at
aio-posix.c:222
14) 0x00007fdfca448c34 in aio_ctx_dispatch (source=0x7fdfcae15e90, callback=0x0,
user_data=0x0) at async.c:212
15) 0x00007fdfc8f2f69a in g_main_context_dispatch () from
/usr/lib64/libglib-2.0.so.0
16) 0x00007fdfca45c391 in glib_pollfds_poll () at main-loop.c:190
17) 0x00007fdfca45c489 in os_host_main_loop_wait (timeout=1483677098) at
main-loop.c:235
18) 0x00007fdfca45c57b in main_loop_wait (nonblocking=0) at main-loop.c:484
19) 0x00007fdfca25f403 in main_loop () at vl.c:2249
20) 0x00007fdfca266fc2 in main (argc=42, argv=0x7ffff517d638,
envp=0x7ffff517d790) at vl.c:4814
We find the nbd_recv_coroutines_enter_all function (triggered by a cancel
command or a network connection breaking down) will enter a coroutine which
is waiting for the sending lock. If the lock is still held by another coroutine,
the entering coroutine will be added into the co_queue again. Latter, when the
lock is released, a coroutine re-enter error will occur.
This bug can be fixed simply by delaying the setting of recv_coroutine as
suggested by paolo. After applying this patch, we have tested the cancel
operation in mirror phase looply for more than 5 hous and everything is fine.
Without this patch, a coroutine re-enter error will occur in 5 minutes.
Signed-off-by: Bn Wu <wu.wubin@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423552846-3896-1-git-send-email-wu.wubin@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2015-02-10 08:20:46 +01:00
|
|
|
int rc, ret, i;
|
2013-12-01 22:23:41 +01:00
|
|
|
|
|
|
|
qemu_co_mutex_lock(&s->send_mutex);
|
nbd: fix the co_queue multi-adding bug
When we tested the VM migartion between different hosts with NBD
devices, we found if we sent a cancel command after the drive_mirror
was just started, a coroutine re-enter error would occur. The stack
was as follow:
(gdb) bt
00) 0x00007fdfc744d885 in raise () from /lib64/libc.so.6
01) 0x00007fdfc744ee61 in abort () from /lib64/libc.so.6
02) 0x00007fdfca467cc5 in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:118
03) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedb400) at
qemu-coroutine-lock.c:59
04) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedb400) at qemu-coroutine.c:96
05) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:123
06) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedbdc0) at
qemu-coroutine-lock.c:59
07) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedbdc0) at qemu-coroutine.c:96
08) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedbdc0, opaque=0x0)
at qemu-coroutine.c:123
09) 0x00007fdfca4a1fa4 in nbd_recv_coroutines_enter_all (s=0x7fdfcaef7dd0) at
block/nbd-client.c:41
10) 0x00007fdfca4a1ff9 in nbd_teardown_connection (client=0x7fdfcaef7dd0) at
block/nbd-client.c:50
11) 0x00007fdfca4a20f0 in nbd_reply_ready (opaque=0x7fdfcaef7dd0) at
block/nbd-client.c:92
12) 0x00007fdfca45ed80 in aio_dispatch (ctx=0x7fdfcae15e90) at aio-posix.c:144
13) 0x00007fdfca45ef1b in aio_poll (ctx=0x7fdfcae15e90, blocking=false) at
aio-posix.c:222
14) 0x00007fdfca448c34 in aio_ctx_dispatch (source=0x7fdfcae15e90, callback=0x0,
user_data=0x0) at async.c:212
15) 0x00007fdfc8f2f69a in g_main_context_dispatch () from
/usr/lib64/libglib-2.0.so.0
16) 0x00007fdfca45c391 in glib_pollfds_poll () at main-loop.c:190
17) 0x00007fdfca45c489 in os_host_main_loop_wait (timeout=1483677098) at
main-loop.c:235
18) 0x00007fdfca45c57b in main_loop_wait (nonblocking=0) at main-loop.c:484
19) 0x00007fdfca25f403 in main_loop () at vl.c:2249
20) 0x00007fdfca266fc2 in main (argc=42, argv=0x7ffff517d638,
envp=0x7ffff517d790) at vl.c:4814
We find the nbd_recv_coroutines_enter_all function (triggered by a cancel
command or a network connection breaking down) will enter a coroutine which
is waiting for the sending lock. If the lock is still held by another coroutine,
the entering coroutine will be added into the co_queue again. Latter, when the
lock is released, a coroutine re-enter error will occur.
This bug can be fixed simply by delaying the setting of recv_coroutine as
suggested by paolo. After applying this patch, we have tested the cancel
operation in mirror phase looply for more than 5 hous and everything is fine.
Without this patch, a coroutine re-enter error will occur in 5 minutes.
Signed-off-by: Bn Wu <wu.wubin@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423552846-3896-1-git-send-email-wu.wubin@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2015-02-10 08:20:46 +01:00
|
|
|
|
|
|
|
for (i = 0; i < MAX_NBD_REQUESTS; i++) {
|
|
|
|
if (s->recv_coroutine[i] == NULL) {
|
|
|
|
s->recv_coroutine[i] = qemu_coroutine_self();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(i < MAX_NBD_REQUESTS);
|
|
|
|
request->handle = INDEX_TO_HANDLE(s, i);
|
2013-12-01 22:23:41 +01:00
|
|
|
s->send_coroutine = qemu_coroutine_self();
|
2015-02-06 22:06:16 +01:00
|
|
|
aio_context = bdrv_get_aio_context(bs);
|
nbd: fix the co_queue multi-adding bug
When we tested the VM migartion between different hosts with NBD
devices, we found if we sent a cancel command after the drive_mirror
was just started, a coroutine re-enter error would occur. The stack
was as follow:
(gdb) bt
00) 0x00007fdfc744d885 in raise () from /lib64/libc.so.6
01) 0x00007fdfc744ee61 in abort () from /lib64/libc.so.6
02) 0x00007fdfca467cc5 in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:118
03) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedb400) at
qemu-coroutine-lock.c:59
04) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedb400) at qemu-coroutine.c:96
05) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:123
06) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedbdc0) at
qemu-coroutine-lock.c:59
07) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedbdc0) at qemu-coroutine.c:96
08) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedbdc0, opaque=0x0)
at qemu-coroutine.c:123
09) 0x00007fdfca4a1fa4 in nbd_recv_coroutines_enter_all (s=0x7fdfcaef7dd0) at
block/nbd-client.c:41
10) 0x00007fdfca4a1ff9 in nbd_teardown_connection (client=0x7fdfcaef7dd0) at
block/nbd-client.c:50
11) 0x00007fdfca4a20f0 in nbd_reply_ready (opaque=0x7fdfcaef7dd0) at
block/nbd-client.c:92
12) 0x00007fdfca45ed80 in aio_dispatch (ctx=0x7fdfcae15e90) at aio-posix.c:144
13) 0x00007fdfca45ef1b in aio_poll (ctx=0x7fdfcae15e90, blocking=false) at
aio-posix.c:222
14) 0x00007fdfca448c34 in aio_ctx_dispatch (source=0x7fdfcae15e90, callback=0x0,
user_data=0x0) at async.c:212
15) 0x00007fdfc8f2f69a in g_main_context_dispatch () from
/usr/lib64/libglib-2.0.so.0
16) 0x00007fdfca45c391 in glib_pollfds_poll () at main-loop.c:190
17) 0x00007fdfca45c489 in os_host_main_loop_wait (timeout=1483677098) at
main-loop.c:235
18) 0x00007fdfca45c57b in main_loop_wait (nonblocking=0) at main-loop.c:484
19) 0x00007fdfca25f403 in main_loop () at vl.c:2249
20) 0x00007fdfca266fc2 in main (argc=42, argv=0x7ffff517d638,
envp=0x7ffff517d790) at vl.c:4814
We find the nbd_recv_coroutines_enter_all function (triggered by a cancel
command or a network connection breaking down) will enter a coroutine which
is waiting for the sending lock. If the lock is still held by another coroutine,
the entering coroutine will be added into the co_queue again. Latter, when the
lock is released, a coroutine re-enter error will occur.
This bug can be fixed simply by delaying the setting of recv_coroutine as
suggested by paolo. After applying this patch, we have tested the cancel
operation in mirror phase looply for more than 5 hous and everything is fine.
Without this patch, a coroutine re-enter error will occur in 5 minutes.
Signed-off-by: Bn Wu <wu.wubin@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423552846-3896-1-git-send-email-wu.wubin@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2015-02-10 08:20:46 +01:00
|
|
|
|
2014-05-08 16:34:43 +02:00
|
|
|
aio_set_fd_handler(aio_context, s->sock,
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_reply_ready, nbd_restart_write, bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (qiov) {
|
|
|
|
if (!s->is_unix) {
|
|
|
|
socket_set_cork(s->sock, 1);
|
|
|
|
}
|
|
|
|
rc = nbd_send_request(s->sock, request);
|
|
|
|
if (rc >= 0) {
|
|
|
|
ret = qemu_co_sendv(s->sock, qiov->iov, qiov->niov,
|
|
|
|
offset, request->len);
|
|
|
|
if (ret != request->len) {
|
|
|
|
rc = -EIO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!s->is_unix) {
|
|
|
|
socket_set_cork(s->sock, 0);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
rc = nbd_send_request(s->sock, request);
|
|
|
|
}
|
2015-02-06 22:06:16 +01:00
|
|
|
aio_set_fd_handler(aio_context, s->sock, nbd_reply_ready, NULL, bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
s->send_coroutine = NULL;
|
|
|
|
qemu_co_mutex_unlock(&s->send_mutex);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void nbd_co_receive_reply(NbdClientSession *s,
|
|
|
|
struct nbd_request *request, struct nbd_reply *reply,
|
|
|
|
QEMUIOVector *qiov, int offset)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* Wait until we're woken up by the read handler. TODO: perhaps
|
|
|
|
* peek at the next reply and avoid yielding if it's ours? */
|
|
|
|
qemu_coroutine_yield();
|
|
|
|
*reply = s->reply;
|
|
|
|
if (reply->handle != request->handle) {
|
|
|
|
reply->error = EIO;
|
|
|
|
} else {
|
|
|
|
if (qiov && reply->error == 0) {
|
|
|
|
ret = qemu_co_recvv(s->sock, qiov->iov, qiov->niov,
|
|
|
|
offset, request->len);
|
|
|
|
if (ret != request->len) {
|
|
|
|
reply->error = EIO;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Tell the read handler to read another header. */
|
|
|
|
s->reply.handle = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void nbd_coroutine_start(NbdClientSession *s,
|
|
|
|
struct nbd_request *request)
|
|
|
|
{
|
|
|
|
/* Poor man semaphore. The free_sema is locked when no other request
|
|
|
|
* can be accepted, and unlocked after receiving one reply. */
|
|
|
|
if (s->in_flight >= MAX_NBD_REQUESTS - 1) {
|
|
|
|
qemu_co_mutex_lock(&s->free_sema);
|
|
|
|
assert(s->in_flight < MAX_NBD_REQUESTS);
|
|
|
|
}
|
|
|
|
s->in_flight++;
|
|
|
|
|
nbd: fix the co_queue multi-adding bug
When we tested the VM migartion between different hosts with NBD
devices, we found if we sent a cancel command after the drive_mirror
was just started, a coroutine re-enter error would occur. The stack
was as follow:
(gdb) bt
00) 0x00007fdfc744d885 in raise () from /lib64/libc.so.6
01) 0x00007fdfc744ee61 in abort () from /lib64/libc.so.6
02) 0x00007fdfca467cc5 in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:118
03) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedb400) at
qemu-coroutine-lock.c:59
04) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedb400) at qemu-coroutine.c:96
05) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedb400, opaque=0x0)
at qemu-coroutine.c:123
06) 0x00007fdfca467f6c in qemu_co_queue_run_restart (co=0x7fdfcaedbdc0) at
qemu-coroutine-lock.c:59
07) 0x00007fdfca467be5 in coroutine_swap (from=0x7fdfcaf3c4e8,
to=0x7fdfcaedbdc0) at qemu-coroutine.c:96
08) 0x00007fdfca467cea in qemu_coroutine_enter (co=0x7fdfcaedbdc0, opaque=0x0)
at qemu-coroutine.c:123
09) 0x00007fdfca4a1fa4 in nbd_recv_coroutines_enter_all (s=0x7fdfcaef7dd0) at
block/nbd-client.c:41
10) 0x00007fdfca4a1ff9 in nbd_teardown_connection (client=0x7fdfcaef7dd0) at
block/nbd-client.c:50
11) 0x00007fdfca4a20f0 in nbd_reply_ready (opaque=0x7fdfcaef7dd0) at
block/nbd-client.c:92
12) 0x00007fdfca45ed80 in aio_dispatch (ctx=0x7fdfcae15e90) at aio-posix.c:144
13) 0x00007fdfca45ef1b in aio_poll (ctx=0x7fdfcae15e90, blocking=false) at
aio-posix.c:222
14) 0x00007fdfca448c34 in aio_ctx_dispatch (source=0x7fdfcae15e90, callback=0x0,
user_data=0x0) at async.c:212
15) 0x00007fdfc8f2f69a in g_main_context_dispatch () from
/usr/lib64/libglib-2.0.so.0
16) 0x00007fdfca45c391 in glib_pollfds_poll () at main-loop.c:190
17) 0x00007fdfca45c489 in os_host_main_loop_wait (timeout=1483677098) at
main-loop.c:235
18) 0x00007fdfca45c57b in main_loop_wait (nonblocking=0) at main-loop.c:484
19) 0x00007fdfca25f403 in main_loop () at vl.c:2249
20) 0x00007fdfca266fc2 in main (argc=42, argv=0x7ffff517d638,
envp=0x7ffff517d790) at vl.c:4814
We find the nbd_recv_coroutines_enter_all function (triggered by a cancel
command or a network connection breaking down) will enter a coroutine which
is waiting for the sending lock. If the lock is still held by another coroutine,
the entering coroutine will be added into the co_queue again. Latter, when the
lock is released, a coroutine re-enter error will occur.
This bug can be fixed simply by delaying the setting of recv_coroutine as
suggested by paolo. After applying this patch, we have tested the cancel
operation in mirror phase looply for more than 5 hous and everything is fine.
Without this patch, a coroutine re-enter error will occur in 5 minutes.
Signed-off-by: Bn Wu <wu.wubin@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1423552846-3896-1-git-send-email-wu.wubin@huawei.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2015-02-10 08:20:46 +01:00
|
|
|
/* s->recv_coroutine[i] is set as soon as we get the send_lock. */
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void nbd_coroutine_end(NbdClientSession *s,
|
|
|
|
struct nbd_request *request)
|
|
|
|
{
|
|
|
|
int i = HANDLE_TO_INDEX(s, request->handle);
|
|
|
|
s->recv_coroutine[i] = NULL;
|
|
|
|
if (s->in_flight-- == MAX_NBD_REQUESTS) {
|
|
|
|
qemu_co_mutex_unlock(&s->free_sema);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
static int nbd_co_readv_1(BlockDriverState *bs, int64_t sector_num,
|
2013-12-01 22:23:41 +01:00
|
|
|
int nb_sectors, QEMUIOVector *qiov,
|
|
|
|
int offset)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:46 +01:00
|
|
|
struct nbd_request request = { .type = NBD_CMD_READ };
|
2013-12-01 22:23:41 +01:00
|
|
|
struct nbd_reply reply;
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
request.from = sector_num * 512;
|
|
|
|
request.len = nb_sectors * 512;
|
|
|
|
|
|
|
|
nbd_coroutine_start(client, &request);
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_send_request(bs, &request, NULL, 0);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
reply.error = -ret;
|
|
|
|
} else {
|
|
|
|
nbd_co_receive_reply(client, &request, &reply, qiov, offset);
|
|
|
|
}
|
|
|
|
nbd_coroutine_end(client, &request);
|
|
|
|
return -reply.error;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
static int nbd_co_writev_1(BlockDriverState *bs, int64_t sector_num,
|
2013-12-01 22:23:41 +01:00
|
|
|
int nb_sectors, QEMUIOVector *qiov,
|
|
|
|
int offset)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:46 +01:00
|
|
|
struct nbd_request request = { .type = NBD_CMD_WRITE };
|
2013-12-01 22:23:41 +01:00
|
|
|
struct nbd_reply reply;
|
|
|
|
ssize_t ret;
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
if (!bdrv_enable_write_cache(bs) &&
|
2013-12-01 22:23:41 +01:00
|
|
|
(client->nbdflags & NBD_FLAG_SEND_FUA)) {
|
|
|
|
request.type |= NBD_CMD_FLAG_FUA;
|
|
|
|
}
|
|
|
|
|
|
|
|
request.from = sector_num * 512;
|
|
|
|
request.len = nb_sectors * 512;
|
|
|
|
|
|
|
|
nbd_coroutine_start(client, &request);
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_send_request(bs, &request, qiov, offset);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
reply.error = -ret;
|
|
|
|
} else {
|
|
|
|
nbd_co_receive_reply(client, &request, &reply, NULL, 0);
|
|
|
|
}
|
|
|
|
nbd_coroutine_end(client, &request);
|
|
|
|
return -reply.error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* qemu-nbd has a limit of slightly less than 1M per request. Try to
|
|
|
|
* remain aligned to 4K. */
|
|
|
|
#define NBD_MAX_SECTORS 2040
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
int nbd_client_co_readv(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors, QEMUIOVector *qiov)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
|
|
|
int offset = 0;
|
|
|
|
int ret;
|
|
|
|
while (nb_sectors > NBD_MAX_SECTORS) {
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_readv_1(bs, sector_num, NBD_MAX_SECTORS, qiov, offset);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
offset += NBD_MAX_SECTORS * 512;
|
|
|
|
sector_num += NBD_MAX_SECTORS;
|
|
|
|
nb_sectors -= NBD_MAX_SECTORS;
|
|
|
|
}
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_co_readv_1(bs, sector_num, nb_sectors, qiov, offset);
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
int nbd_client_co_writev(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors, QEMUIOVector *qiov)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
|
|
|
int offset = 0;
|
|
|
|
int ret;
|
|
|
|
while (nb_sectors > NBD_MAX_SECTORS) {
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_writev_1(bs, sector_num, NBD_MAX_SECTORS, qiov, offset);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
offset += NBD_MAX_SECTORS * 512;
|
|
|
|
sector_num += NBD_MAX_SECTORS;
|
|
|
|
nb_sectors -= NBD_MAX_SECTORS;
|
|
|
|
}
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_co_writev_1(bs, sector_num, nb_sectors, qiov, offset);
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
int nbd_client_co_flush(BlockDriverState *bs)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:46 +01:00
|
|
|
struct nbd_request request = { .type = NBD_CMD_FLUSH };
|
2013-12-01 22:23:41 +01:00
|
|
|
struct nbd_reply reply;
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
if (!(client->nbdflags & NBD_FLAG_SEND_FLUSH)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (client->nbdflags & NBD_FLAG_SEND_FUA) {
|
|
|
|
request.type |= NBD_CMD_FLAG_FUA;
|
|
|
|
}
|
|
|
|
|
|
|
|
request.from = 0;
|
|
|
|
request.len = 0;
|
|
|
|
|
|
|
|
nbd_coroutine_start(client, &request);
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_send_request(bs, &request, NULL, 0);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
reply.error = -ret;
|
|
|
|
} else {
|
|
|
|
nbd_co_receive_reply(client, &request, &reply, NULL, 0);
|
|
|
|
}
|
|
|
|
nbd_coroutine_end(client, &request);
|
|
|
|
return -reply.error;
|
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
int nbd_client_co_discard(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:46 +01:00
|
|
|
struct nbd_request request = { .type = NBD_CMD_TRIM };
|
2013-12-01 22:23:41 +01:00
|
|
|
struct nbd_reply reply;
|
|
|
|
ssize_t ret;
|
|
|
|
|
|
|
|
if (!(client->nbdflags & NBD_FLAG_SEND_TRIM)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
request.from = sector_num * 512;
|
|
|
|
request.len = nb_sectors * 512;
|
|
|
|
|
|
|
|
nbd_coroutine_start(client, &request);
|
2015-02-06 22:06:16 +01:00
|
|
|
ret = nbd_co_send_request(bs, &request, NULL, 0);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
reply.error = -ret;
|
|
|
|
} else {
|
|
|
|
nbd_co_receive_reply(client, &request, &reply, NULL, 0);
|
|
|
|
}
|
|
|
|
nbd_coroutine_end(client, &request);
|
|
|
|
return -reply.error;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
void nbd_client_detach_aio_context(BlockDriverState *bs)
|
2014-05-08 16:34:43 +02:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
aio_set_fd_handler(bdrv_get_aio_context(bs),
|
|
|
|
nbd_get_client_session(bs)->sock, NULL, NULL, NULL);
|
2014-05-08 16:34:43 +02:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
void nbd_client_attach_aio_context(BlockDriverState *bs,
|
|
|
|
AioContext *new_context)
|
2014-05-08 16:34:43 +02:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
aio_set_fd_handler(new_context, nbd_get_client_session(bs)->sock,
|
|
|
|
nbd_reply_ready, NULL, bs);
|
2014-05-08 16:34:43 +02:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
void nbd_client_close(BlockDriverState *bs)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:46 +01:00
|
|
|
struct nbd_request request = {
|
|
|
|
.type = NBD_CMD_DISC,
|
|
|
|
.from = 0,
|
|
|
|
.len = 0
|
|
|
|
};
|
2013-12-01 22:23:41 +01:00
|
|
|
|
2014-02-26 15:30:18 +01:00
|
|
|
if (client->sock == -1) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
nbd_send_request(client->sock, &request);
|
2013-12-01 22:23:44 +01:00
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_teardown_connection(bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
}
|
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
int nbd_client_init(BlockDriverState *bs, int sock, const char *export,
|
|
|
|
Error **errp)
|
2013-12-01 22:23:41 +01:00
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *client = nbd_get_client_session(bs);
|
2013-12-01 22:23:41 +01:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/* NBD handshake */
|
2013-12-01 22:23:43 +01:00
|
|
|
logout("session init %s\n", export);
|
2013-12-01 22:23:42 +01:00
|
|
|
qemu_set_block(sock);
|
2013-12-01 22:23:43 +01:00
|
|
|
ret = nbd_receive_negotiate(sock, export,
|
2013-12-01 22:23:41 +01:00
|
|
|
&client->nbdflags, &client->size,
|
2015-01-27 03:02:59 +01:00
|
|
|
&client->blocksize, errp);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (ret < 0) {
|
|
|
|
logout("Failed to negotiate with the NBD server\n");
|
|
|
|
closesocket(sock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_co_mutex_init(&client->send_mutex);
|
|
|
|
qemu_co_mutex_init(&client->free_sema);
|
|
|
|
client->sock = sock;
|
|
|
|
|
|
|
|
/* Now that we're connected, set the socket to be non-blocking and
|
|
|
|
* kick the reply mechanism. */
|
|
|
|
qemu_set_nonblock(sock);
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_client_attach_aio_context(bs, bdrv_get_aio_context(bs));
|
2013-12-01 22:23:41 +01:00
|
|
|
|
|
|
|
logout("Established connection with NBD server\n");
|
|
|
|
return 0;
|
|
|
|
}
|