OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: disable auto-converge during bulk block migration

Browse Source 
auto-converge and block migration currently do not play well together.
During block migration the auto-converge logic detects that ram
migration makes no progress and thus throttles down the vm until
it nearly stalls completely. Avoid this by disabling the throttling
logic during the bulk phase of the block migration.

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Message-Id: <1506421996-12513-1-git-send-email-pl@kamp.de>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Lieven 2017-09-26 12:33:16 +02:00 committed by Dr. David Alan Gilbert
parent 31bc1d8481
commit 9ac78b6171
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
migration/block.c
View File

@ -161,6 +161,11 @@ int blk_mig_active(void)
return !QSIMPLEQ_EMPTY(&block_mig_state.bmds_list); return !QSIMPLEQ_EMPTY(&block_mig_state.bmds_list);
} }
int blk_mig_bulk_active(void)
{
return blk_mig_active() && !block_mig_state.bulk_completed;
}
uint64_t blk_mig_bytes_transferred(void) uint64_t blk_mig_bytes_transferred(void)
{ {
BlkMigDevState *bmds; BlkMigDevState *bmds;

7
migration/block.h
View File

@ -16,6 +16,7 @@
#ifdef CONFIG_LIVE_BLOCK_MIGRATION #ifdef CONFIG_LIVE_BLOCK_MIGRATION
int blk_mig_active(void); int blk_mig_active(void);
int blk_mig_bulk_active(void);
uint64_t blk_mig_bytes_transferred(void); uint64_t blk_mig_bytes_transferred(void);
uint64_t blk_mig_bytes_remaining(void); uint64_t blk_mig_bytes_remaining(void);
uint64_t blk_mig_bytes_total(void); uint64_t blk_mig_bytes_total(void);
@ -25,6 +26,12 @@ static inline int blk_mig_active(void)
{ {
return false; return false;
} }
static inline int blk_mig_bulk_active(void)
{
return false;
}
static inline uint64_t blk_mig_bytes_transferred(void) static inline uint64_t blk_mig_bytes_transferred(void)
{ {
return 0; return 0;

6
migration/ram.c
View File

@ -46,6 +46,7 @@
#include "exec/ram_addr.h" #include "exec/ram_addr.h"
#include "qemu/rcu_queue.h" #include "qemu/rcu_queue.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "migration/block.h"
/***********************************************************/ /***********************************************************/
/* ram save/restore */ /* ram save/restore */
@ -825,7 +826,10 @@ static void migration_bitmap_sync(RAMState *rs)
/ (end_time - rs->time_last_bitmap_sync); / (end_time - rs->time_last_bitmap_sync);
bytes_xfer_now = ram_counters.transferred; bytes_xfer_now = ram_counters.transferred;
if (migrate_auto_converge()) { /* During block migration the auto-converge logic incorrectly detects
* that ram migration makes no progress. Avoid this by disabling the
* throttling logic during the bulk phase of block migration. */
if (migrate_auto_converge() && !blk_mig_bulk_active()) {
/* The following detection logic can be refined later. For now: /* The following detection logic can be refined later. For now:
Check to see if the dirtied bytes is 50% more than the approx. Check to see if the dirtied bytes is 50% more than the approx.
amount of bytes that just got transferred since the last time we amount of bytes that just got transferred since the last time we