|
 |
9ae3a8 |
From 68dbf16886540b4ec6edc46409f5adf0b97f1dcf Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 20 Oct 2014 14:55:55 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 43/43] rdma: Fix block during rdma migration
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1413816955-4190-2-git-send-email-dgilbert@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 61746
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] rdma: Fix block during rdma migration
|
|
|
9ae3a8 |
Bugzilla: 1152969
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Gonglei <arei.gonglei@huawei.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
If the networking break or there's something wrong with rdma
|
|
|
9ae3a8 |
device(ib0 with no IP) during rdma migration, the main_loop of
|
|
|
9ae3a8 |
qemu will be blocked in rdma_destroy_id. I add rdma_ack_cm_event
|
|
|
9ae3a8 |
to fix this bug.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Mo Yuxiang <Moyuxiang@huawei.com>
|
|
|
9ae3a8 |
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
|
|
|
9ae3a8 |
Reviewed-by: Michael R. Hines <mrhines@us.ibm.com>
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 2a9343470432573acf06379bcbf8e5e6568507e4)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
migration-rdma.c | 1 +
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
migration-rdma.c | 1 +
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/migration-rdma.c b/migration-rdma.c
|
|
|
9ae3a8 |
index ba4ad76..5596571 100644
|
|
|
9ae3a8 |
--- a/migration-rdma.c
|
|
|
9ae3a8 |
+++ b/migration-rdma.c
|
|
|
9ae3a8 |
@@ -949,6 +949,7 @@ route:
|
|
|
9ae3a8 |
ERROR(errp, "result not equal to event_addr_resolved %s",
|
|
|
9ae3a8 |
rdma_event_str(cm_event->event));
|
|
|
9ae3a8 |
perror("rdma_resolve_addr");
|
|
|
9ae3a8 |
+ rdma_ack_cm_event(cm_event);
|
|
|
9ae3a8 |
ret = -EINVAL;
|
|
|
9ae3a8 |
goto err_resolve_get_addr;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|