diff options
| author | Lidong Chen <jemmy858585@gmail.com> | 2018-05-06 22:54:58 +0800 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2018-05-15 22:13:08 +0200 |
| commit | 71cd73061c014d04bc6b54936e675347ebc8d964 (patch) | |
| tree | fa913eeca36a8d25e4b203c55aa66ed0312bdbdc | |
| parent | edd7080692cb43147352d736cce0fb728787f2b4 (diff) | |
| download | qemu-71cd73061c014d04bc6b54936e675347ebc8d964.zip qemu-71cd73061c014d04bc6b54936e675347ebc8d964.tar.gz qemu-71cd73061c014d04bc6b54936e675347ebc8d964.tar.bz2 | |
migration: update index field when delete or qsort RDMALocalBlock
rdma_delete_block function deletes RDMALocalBlock base on index field,
but not update the index field. So when next time invoke rdma_delete_block,
it will not work correctly.
If start and cancel migration repeatedly, some RDMALocalBlock not invoke
ibv_dereg_mr to decrease kernel mm_struct vmpin. When vmpin is large than
max locked memory limitation, ibv_reg_mr will failed, and migration can not
start successfully again.
Signed-off-by: Lidong Chen <lidongchen@tencent.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1525618499-1560-1-git-send-email-lidongchen@tencent.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Lidong Chen <jemmy858585@gmail.com>
| -rw-r--r-- | migration/rdma.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index da474fc..7d233b0 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -708,6 +708,9 @@ static int rdma_delete_block(RDMAContext *rdma, RDMALocalBlock *block) memcpy(local->block + block->index, old + (block->index + 1), sizeof(RDMALocalBlock) * (local->nb_blocks - (block->index + 1))); + for (x = block->index; x < local->nb_blocks - 1; x++) { + local->block[x].index--; + } } } else { assert(block == local->block); @@ -3246,6 +3249,10 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque) qsort(rdma->local_ram_blocks.block, rdma->local_ram_blocks.nb_blocks, sizeof(RDMALocalBlock), dest_ram_sort_func); + for (i = 0; i < local->nb_blocks; i++) { + local->block[i].index = i; + } + if (rdma->pin_all) { ret = qemu_rdma_reg_whole_ram_blocks(rdma); if (ret) { |