Commit 71cd7306 authored May 06, 2018 by Lidong Chen Committed by Juan Quintela May 15, 2018

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>

parent edd70806

migration/rdma.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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) {