[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/12] migration: invoke qio_channel_yield only w
From: |
Lidong Chen |
Subject: |
[Qemu-devel] [PATCH v6 07/12] migration: invoke qio_channel_yield only when qemu_in_coroutine() |
Date: |
Fri, 3 Aug 2018 17:13:45 +0800 |
From: Lidong Chen <address@hidden>
when qio_channel_read return QIO_CHANNEL_ERR_BLOCK, the source qemu crash.
The backtrace is:
(gdb) bt
#0 0x00007fb20aba91d7 in raise () from /lib64/libc.so.6
#1 0x00007fb20abaa8c8 in abort () from /lib64/libc.so.6
#2 0x00007fb20aba2146 in __assert_fail_base () from /lib64/libc.so.6
#3 0x00007fb20aba21f2 in __assert_fail () from /lib64/libc.so.6
#4 0x00000000008dba2d in qio_channel_yield (ioc=0x22f9e20,
condition=G_IO_IN) at io/channel.c:460
#5 0x00000000007a870b in channel_get_buffer (opaque=0x22f9e20,
buf=0x3d54038 "", pos=0, size=32768)
at migration/qemu-file-channel.c:83
#6 0x00000000007a70f6 in qemu_fill_buffer (f=0x3d54000) at
migration/qemu-file.c:299
#7 0x00000000007a79d0 in qemu_peek_byte (f=0x3d54000, offset=0) at
migration/qemu-file.c:562
#8 0x00000000007a7a22 in qemu_get_byte (f=0x3d54000) at
migration/qemu-file.c:575
#9 0x00000000007a7c46 in qemu_get_be16 (f=0x3d54000) at
migration/qemu-file.c:647
#10 0x0000000000796db7 in source_return_path_thread (opaque=0x2242280) at
migration/migration.c:1794
#11 0x00000000009428fa in qemu_thread_start (args=0x3e58420) at
util/qemu-thread-posix.c:504
#12 0x00007fb20af3ddc5 in start_thread () from /lib64/libpthread.so.0
#13 0x00007fb20ac6b74d in clone () from /lib64/libc.so.6
This patch fixed by invoke qio_channel_yield only when qemu_in_coroutine().
Signed-off-by: Lidong Chen <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
migration/qemu-file-channel.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c
index e202d73..8e639eb 100644
--- a/migration/qemu-file-channel.c
+++ b/migration/qemu-file-channel.c
@@ -49,7 +49,11 @@ static ssize_t channel_writev_buffer(void *opaque,
ssize_t len;
len = qio_channel_writev(ioc, local_iov, nlocal_iov, NULL);
if (len == QIO_CHANNEL_ERR_BLOCK) {
- qio_channel_wait(ioc, G_IO_OUT);
+ if (qemu_in_coroutine()) {
+ qio_channel_yield(ioc, G_IO_OUT);
+ } else {
+ qio_channel_wait(ioc, G_IO_OUT);
+ }
continue;
}
if (len < 0) {
@@ -80,7 +84,11 @@ static ssize_t channel_get_buffer(void *opaque,
ret = qio_channel_read(ioc, (char *)buf, size, NULL);
if (ret < 0) {
if (ret == QIO_CHANNEL_ERR_BLOCK) {
- qio_channel_yield(ioc, G_IO_IN);
+ if (qemu_in_coroutine()) {
+ qio_channel_yield(ioc, G_IO_IN);
+ } else {
+ qio_channel_wait(ioc, G_IO_IN);
+ }
} else {
/* XXX handle Error * object */
return -EIO;
--
1.8.3.1
- [Qemu-devel] [PATCH v6 00/12] Enable postcopy RDMA live migration, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 01/12] migration: disable RDMA WRITE after postcopy started, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 02/12] migration: create a dedicated connection for rdma return path, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 03/12] migration: avoid concurrent invoke channel_close by different threads, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 04/12] migration: implement bi-directional RDMA QIOChannel, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 06/12] migration: implement io_set_aio_fd_handler function for RDMA QIOChannel, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 05/12] migration: Stop rdma yielding during incoming postcopy, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 08/12] migration: poll the cm event while wait RDMA work request completion, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 07/12] migration: invoke qio_channel_yield only when qemu_in_coroutine(),
Lidong Chen <=
- [Qemu-devel] [PATCH v6 09/12] migration: implement the shutdown for RDMA QIOChannel, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 11/12] migration: remove the unnecessary RDMA_CONTROL_ERROR message, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 12/12] migration: create a dedicated thread to release rdma resource, Lidong Chen, 2018/08/03
- [Qemu-devel] [PATCH v6 10/12] migration: poll the cm event for destination qemu, Lidong Chen, 2018/08/03
- Re: [Qemu-devel] [PATCH v6 00/12] Enable postcopy RDMA live migration, 858585 jemmy, 2018/08/06
- Re: [Qemu-devel] [PATCH v6 00/12] Enable postcopy RDMA live migration, no-reply, 2018/08/06