Commit 9884db28 authored by Felipe Franciosi's avatar Felipe Franciosi Committed by Juan Quintela
Browse files

migration: keep bytes_xfer_prev init'd to zero 



The first time migration_bitmap_sync() is called, bytes_xfer_prev is set
to ram_state.bytes_transferred which is, at this point, zero. The next
time migration_bitmap_sync() is called, an iteration has happened and
bytes_xfer_prev is set to 'x' bytes. Most likely, more than one second
has passed, so the auto converge logic will be triggered and
bytes_xfer_now will also be set to 'x' bytes.

This condition is currently masked by dirty_rate_high_cnt, which will
wait for a few iterations before throttling. It would otherwise always
assume zero bytes have been copied and therefore throttle the guest
(possibly) prematurely.

Given bytes_xfer_prev is only used by the auto convergence logic, it
makes sense to only set its value after a check has been made against
bytes_xfer_now.

Signed-off-by: default avatarFelipe Franciosi <felipe@nutanix.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 20a519a0

migration/ram.c

+0 −4
Original line number Diff line number Diff line
@@ -673,10 +673,6 @@ static void migration_bitmap_sync(RAMState *rs) 


    rs->bitmap_sync_count++;



    if (!rs->bytes_xfer_prev) {

        rs->bytes_xfer_prev = ram_bytes_transferred();

    }



    if (!rs->time_last_bitmap_sync) {

        rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);

    }