[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/20] migration: poll the cm event while wait RDMA w
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 11/20] migration: poll the cm event while wait RDMA work request completion |
Date: |
Wed, 22 Aug 2018 14:00:41 +0200 |
From: Lidong Chen <address@hidden>
If the peer qemu is crashed, the qemu_rdma_wait_comp_channel function
maybe loop forever. so we should also poll the cm event fd, and when
receive RDMA_CM_EVENT_DISCONNECTED and RDMA_CM_EVENT_DEVICE_REMOVAL,
we consider some error happened.
Signed-off-by: Lidong Chen <address@hidden>
Signed-off-by: Gal Shachaf <address@hidden>
Signed-off-by: Aviad Yehezkel <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/rdma.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index d6bbf28fdc..673f126a05 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -1489,6 +1489,9 @@ static uint64_t qemu_rdma_poll(RDMAContext *rdma,
uint64_t *wr_id_out,
*/
static int qemu_rdma_wait_comp_channel(RDMAContext *rdma)
{
+ struct rdma_cm_event *cm_event;
+ int ret = -1;
+
/*
* Coroutine doesn't start until migration_fd_process_incoming()
* so don't yield unless we know we're running inside of a coroutine.
@@ -1505,13 +1508,37 @@ static int qemu_rdma_wait_comp_channel(RDMAContext
*rdma)
* without hanging forever.
*/
while (!rdma->error_state && !rdma->received_error) {
- GPollFD pfds[1];
+ GPollFD pfds[2];
pfds[0].fd = rdma->comp_channel->fd;
pfds[0].events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+ pfds[0].revents = 0;
+
+ pfds[1].fd = rdma->channel->fd;
+ pfds[1].events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+ pfds[1].revents = 0;
+
/* 0.1s timeout, should be fine for a 'cancel' */
- switch (qemu_poll_ns(pfds, 1, 100 * 1000 * 1000)) {
+ switch (qemu_poll_ns(pfds, 2, 100 * 1000 * 1000)) {
+ case 2:
case 1: /* fd active */
- return 0;
+ if (pfds[0].revents) {
+ return 0;
+ }
+
+ if (pfds[1].revents) {
+ ret = rdma_get_cm_event(rdma->channel, &cm_event);
+ if (!ret) {
+ rdma_ack_cm_event(cm_event);
+ }
+
+ error_report("receive cm event while wait comp channel,"
+ "cm event is %d", cm_event->event);
+ if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED ||
+ cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) {
+ return -EPIPE;
+ }
+ }
+ break;
case 0: /* Timeout, go around again */
break;
--
2.17.1
- [Qemu-devel] [PULL 00/20] Migration pull requset, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 02/20] migration: Correctly handle subsections with no 'needed' function, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 06/20] migration: create a dedicated connection for rdma return path, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 01/20] qapi/migration.json: fix the description for "query-migrate" output, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 03/20] docs/migration: Clarify pre_load in subsections, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 08/20] migration: Stop rdma yielding during incoming postcopy, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 04/20] migrate/cpu-throttle: Add max-cpu-throttle migration parameter, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 11/20] migration: poll the cm event while wait RDMA work request completion,
Juan Quintela <=
- [Qemu-devel] [PULL 12/20] migration: implement the shutdown for RDMA QIOChannel, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 10/20] migration: invoke qio_channel_yield only when qemu_in_coroutine(), Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 14/20] migration: poll the cm event for destination qemu, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 05/20] migration: disable RDMA WRITE after postcopy started, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 09/20] migration: implement io_set_aio_fd_handler function for RDMA QIOChannel, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 07/20] migration: implement bi-directional RDMA QIOChannel, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 16/20] migration: fix counting normal page for compression, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 13/20] tests/migration-test: Silence the kvm_hv message by default, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 15/20] migration: do not wait for free thread, Juan Quintela, 2018/08/22
- [Qemu-devel] [PULL 17/20] migration: introduce save_zero_page_to_file, Juan Quintela, 2018/08/22