mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: update index field when delete or qsort RDMALocalBlock

Browse Source 
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>
This commit is contained in:
Lidong Chen 2018-05-06 22:54:58 +08:00 committed by Juan Quintela
parent edd7080692
commit 71cd73061c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/rdma.c
View File

@ -708,6 +708,9 @@ static int rdma_delete_block(RDMAContext *rdma, RDMALocalBlock *block)
memcpy(local->block + block->index, old + (block->index + 1), memcpy(local->block + block->index, old + (block->index + 1),
sizeof(RDMALocalBlock) * sizeof(RDMALocalBlock) *
(local->nb_blocks - (block->index + 1))); (local->nb_blocks - (block->index + 1)));
for (x = block->index; x < local->nb_blocks - 1; x++) {
local->block[x].index--;
}
} }
} else { } else {
assert(block == local->block); assert(block == local->block);
@ -3246,6 +3249,10 @@ static int qemu_rdma_registration_handle(QEMUFile *f, void *opaque)
qsort(rdma->local_ram_blocks.block, qsort(rdma->local_ram_blocks.block,
rdma->local_ram_blocks.nb_blocks, rdma->local_ram_blocks.nb_blocks,
sizeof(RDMALocalBlock), dest_ram_sort_func); sizeof(RDMALocalBlock), dest_ram_sort_func);
for (i = 0; i < local->nb_blocks; i++) {
local->block[i].index = i;
}
if (rdma->pin_all) { if (rdma->pin_all) {
ret = qemu_rdma_reg_whole_ram_blocks(rdma); ret = qemu_rdma_reg_whole_ram_blocks(rdma);
if (ret) { if (ret) {