@@ -27,6 +27,7 @@
#include "hw/core/cpu.h"
#include "qemu/main-loop.h"
#include "sysemu/cpus.h"
+#include "sysemu/kvm.h"
#include "cpu-throttle.h"
#include "migration.h"
#include "migration-stats.h"
@@ -141,7 +142,7 @@ void cpu_throttle_dirty_sync_timer_tick(void *opaque)
* effect on guest performance, therefore omit it to avoid
* paying extra for the sync penalty.
*/
- if (sync_cnt <= 1) {
+ if (sync_cnt <= (kvm_dirty_log_manual_enabled() ? 0 : 1)) {
goto end;
}
@@ -2718,7 +2718,7 @@ static void ram_list_init_bitmaps(void)
{
MigrationState *ms = migrate_get_current();
RAMBlock *block;
- unsigned long pages;
+ unsigned long pages, clear_bmap_pages;
uint8_t shift;
/* Skip setting bitmap if there is no RAM */
@@ -2736,6 +2736,7 @@ static void ram_list_init_bitmaps(void)
RAMBLOCK_FOREACH_NOT_IGNORED(block) {
pages = block->max_length >> TARGET_PAGE_BITS;
+ clear_bmap_pages = clear_bmap_size(pages, shift);
/*
* The initial dirty bitmap for migration must be set with all
* ones to make sure we'll migrate every guest RAM page to
@@ -2751,7 +2752,17 @@ static void ram_list_init_bitmaps(void)
block->file_bmap = bitmap_new(pages);
}
block->clear_bmap_shift = shift;
- block->clear_bmap = bitmap_new(clear_bmap_size(pages, shift));
+ block->clear_bmap = bitmap_new(clear_bmap_pages);
+ /*
+ * Set the clear bitmap by default to enable dirty logging.
+ *
+ * Note that with KVM_DIRTY_LOG_INITIALLY_SET, dirty logging
+ * will be enabled gradually in small chunks using
+ * KVM_CLEAR_DIRTY_LOG
+ */
+ if (kvm_dirty_log_manual_enabled()) {
+ bitmap_set(block->clear_bmap, 0, clear_bmap_pages);
+ }
}
}
}
@@ -2771,6 +2782,7 @@ static void migration_bitmap_clear_discarded_pages(RAMState *rs)
static bool ram_init_bitmaps(RAMState *rs, Error **errp)
{
+ Error *local_err = NULL;
bool ret = true;
qemu_mutex_lock_ramlist();
@@ -2783,7 +2795,19 @@ static bool ram_init_bitmaps(RAMState *rs, Error **errp)
if (!ret) {
goto out_unlock;
}
- migration_bitmap_sync_precopy(false);
+
+ if (kvm_dirty_log_manual_enabled()) {
+ /*
+ * Bypass the RAMBlock dirty sync and still publish a
+ * notification.
+ */
+ if (precopy_notify(PRECOPY_NOTIFY_AFTER_BITMAP_SYNC,
+ &local_err)) {
+ error_report_err(local_err);
+ }
+ } else {
+ migration_bitmap_sync_precopy(false);
+ }
}
}
out_unlock: