|
 |
1bdc94 |
From f6aecbe90d02dd675d82194240b1be740ca2c2e7 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
1bdc94 |
Date: Fri, 22 Jun 2018 19:00:00 +0200
|
|
|
1bdc94 |
Subject: [PATCH 21/57] migration: update index field when delete or qsort
|
|
|
1bdc94 |
RDMALocalBlock
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180622190005.21297-14-dgilbert@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81010
|
|
|
1bdc94 |
O-Subject: [RHEL7.6 qemu-kvm-rhev PATCH 13/18] migration: update index field when delete or qsort RDMALocalBlock
|
|
|
1bdc94 |
Bugzilla: 1584139
|
|
|
1bdc94 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Lidong Chen <jemmy858585@gmail.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
rdma_delete_block function deletes RDMALocalBlock base on index field,
|
|
|
1bdc94 |
but not update the index field. So when next time invoke rdma_delete_block,
|
|
|
1bdc94 |
it will not work correctly.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
If start and cancel migration repeatedly, some RDMALocalBlock not invoke
|
|
|
1bdc94 |
ibv_dereg_mr to decrease kernel mm_struct vmpin. When vmpin is large than
|
|
|
1bdc94 |
max locked memory limitation, ibv_reg_mr will failed, and migration can not
|
|
|
1bdc94 |
start successfully again.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Lidong Chen <lidongchen@tencent.com>
|
|
|
1bdc94 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
1bdc94 |
Message-Id: <1525618499-1560-1-git-send-email-lidongchen@tencent.com>
|
|
|
1bdc94 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Lidong Chen <jemmy858585@gmail.com>
|
|
|
1bdc94 |
(cherry picked from commit 71cd73061c014d04bc6b54936e675347ebc8d964)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
migration/rdma.c | 7 +++++++
|
|
|
1bdc94 |
1 file changed, 7 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/migration/rdma.c b/migration/rdma.c
|
|
|
1bdc94 |
index da474fc..7d233b0 100644
|
|
|
1bdc94 |
--- a/migration/rdma.c
|
|
|
1bdc94 |
+++ b/migration/rdma.c
|
|
|
1bdc94 |
@@ -708,6 +708,9 @@ static int rdma_delete_block(RDMAContext *rdma, RDMALocalBlock *block)
|
|
|
1bdc94 |
memcpy(local->block + block->index, old + (block->index + 1),
|
|
|
1bdc94 |
sizeof(RDMALocalBlock) *
|
|
|
1bdc94 |
(local->nb_blocks - (block->index + 1)));
|
|
|
1bdc94 |
+ for (x = block->index; x < local->nb_blocks - 1; x++) {
|
|
|
1bdc94 |
+ local->block[x].index--;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
} else {
|
|
|
1bdc94 |
assert(block == local->block);
|
|
|
1bdc94 |
@@ -3246,6 +3249,10 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
|
|
|
1bdc94 |
qsort(rdma->local_ram_blocks.block,
|
|
|
1bdc94 |
rdma->local_ram_blocks.nb_blocks,
|
|
|
1bdc94 |
sizeof(RDMALocalBlock), dest_ram_sort_func);
|
|
|
1bdc94 |
+ for (i = 0; i < local->nb_blocks; i++) {
|
|
|
1bdc94 |
+ local->block[i].index = i;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
if (rdma->pin_all) {
|
|
|
1bdc94 |
ret = qemu_rdma_reg_whole_ram_blocks(rdma);
|
|
|
1bdc94 |
if (ret) {
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|