Skip to content

Commit 4d9f675

Browse files
jemmy858585Juan Quintela
authored and
Juan Quintela
committed
migration: implement io_set_aio_fd_handler function for RDMA QIOChannel
if qio_channel_rdma_readv return QIO_CHANNEL_ERR_BLOCK, the destination qemu crash. The backtrace is: (gdb) bt #0 0x0000000000000000 in ?? () #1 0x00000000008db50e in qio_channel_set_aio_fd_handler (ioc=0x38111e0, ctx=0x3726080, io_read=0x8db841 <qio_channel_restart_read>, io_write=0x0, opaque=0x38111e0) at io/channel.c: #2 0x00000000008db952 in qio_channel_set_aio_fd_handlers (ioc=0x38111e0) at io/channel.c:438 #3 0x00000000008dbab4 in qio_channel_yield (ioc=0x38111e0, condition=G_IO_IN) at io/channel.c:47 #4 0x00000000007a870b in channel_get_buffer (opaque=0x38111e0, buf=0x440c038 "", pos=0, size=327 at migration/qemu-file-channel.c:83 #5 0x00000000007a70f6 in qemu_fill_buffer (f=0x440c000) at migration/qemu-file.c:299 #6 0x00000000007a79d0 in qemu_peek_byte (f=0x440c000, offset=0) at migration/qemu-file.c:562 #7 0x00000000007a7a22 in qemu_get_byte (f=0x440c000) at migration/qemu-file.c:575 #8 0x00000000007a7c78 in qemu_get_be32 (f=0x440c000) at migration/qemu-file.c:655 #9 0x00000000007a0508 in qemu_loadvm_state (f=0x440c000) at migration/savevm.c:2126 #10 0x0000000000794141 in process_incoming_migration_co (opaque=0x0) at migration/migration.c:366 #11 0x000000000095c598 in coroutine_trampoline (i0=84033984, i1=0) at util/coroutine-ucontext.c:1 #12 0x00007f9c0db56d40 in ?? () from /lib64/libc.so.6 #13 0x00007f96fe858760 in ?? () #14 0x0000000000000000 in ?? () RDMA QIOChannel not implement io_set_aio_fd_handler. so qio_channel_set_aio_fd_handler will access NULL pointer. Signed-off-by: Lidong Chen <[email protected]> Reviewed-by: Juan Quintela <[email protected]> Signed-off-by: Juan Quintela <[email protected]>
1 parent f5627c2 commit 4d9f675

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

migration/rdma.c

+16
Original file line numberDiff line numberDiff line change
@@ -2963,6 +2963,21 @@ static GSource *qio_channel_rdma_create_watch(QIOChannel *ioc,
29632963
return source;
29642964
}
29652965

2966+
static void qio_channel_rdma_set_aio_fd_handler(QIOChannel *ioc,
2967+
AioContext *ctx,
2968+
IOHandler *io_read,
2969+
IOHandler *io_write,
2970+
void *opaque)
2971+
{
2972+
QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(ioc);
2973+
if (io_read) {
2974+
aio_set_fd_handler(ctx, rioc->rdmain->comp_channel->fd,
2975+
false, io_read, io_write, NULL, opaque);
2976+
} else {
2977+
aio_set_fd_handler(ctx, rioc->rdmaout->comp_channel->fd,
2978+
false, io_read, io_write, NULL, opaque);
2979+
}
2980+
}
29662981

29672982
static int qio_channel_rdma_close(QIOChannel *ioc,
29682983
Error **errp)
@@ -3822,6 +3837,7 @@ static void qio_channel_rdma_class_init(ObjectClass *klass,
38223837
ioc_klass->io_set_blocking = qio_channel_rdma_set_blocking;
38233838
ioc_klass->io_close = qio_channel_rdma_close;
38243839
ioc_klass->io_create_watch = qio_channel_rdma_create_watch;
3840+
ioc_klass->io_set_aio_fd_handler = qio_channel_rdma_set_aio_fd_handler;
38253841
}
38263842

38273843
static const TypeInfo qio_channel_rdma_info = {

0 commit comments

Comments
 (0)