Skip to content

Commit

Permalink
migration/ram: Handle RAM block resizes during precopy
Browse files Browse the repository at this point in the history
Resizing while migrating is dangerous and does not work as expected.
The whole migration code works on the usable_length of ram blocks and does
not expect this to change at random points in time.

In the case of precopy, the ram block size must not change on the source,
after syncing the RAM block list in ram_save_setup(), so as long as the
guest is still running on the source.

Resizing can be trigger *after* (but not during) a reset in
ACPI code by the guest
- hw/arm/virt-acpi-build.c:acpi_ram_update()
- hw/i386/acpi-build.c:acpi_ram_update()

Use the ram block notifier to get notified about resizes. Let's simply
cancel migration and indicate the reason. We'll continue running on the
source. No harm done.

Update the documentation. Postcopy will be handled separately.

Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210429112708.12291-5-david@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Manual merge
  • Loading branch information
davidhildenbrand authored and dagrh committed May 13, 2021
1 parent e15c7d1 commit c7c0e72
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 8 deletions.
10 changes: 6 additions & 4 deletions include/exec/memory.h
Expand Up @@ -131,7 +131,7 @@ typedef struct IOMMUTLBEvent {
#define RAM_SHARED (1 << 1)

/* Only a portion of RAM (used_length) is actually used, and migrated.
* This used_length size can change across reboots.
* Resizing RAM while migrating can result in the migration being canceled.
*/
#define RAM_RESIZEABLE (1 << 2)

Expand Down Expand Up @@ -955,7 +955,9 @@ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr,
* RAM. Accesses into the region will
* modify memory directly. Only an initial
* portion of this RAM is actually used.
* The used size can change across reboots.
* Changing the size while migrating
* can result in the migration being
* canceled.
*
* @mr: the #MemoryRegion to be initialized.
* @owner: the object that tracks the region's reference count
Expand Down Expand Up @@ -1586,8 +1588,8 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);

/* memory_region_ram_resize: Resize a RAM region.
*
* Only legal before guest might have detected the memory size: e.g. on
* incoming migration, or right after reset.
* Resizing RAM while migrating can result in the migration being canceled.
* Care has to be taken if the guest might have already detected the memory.
*
* @mr: a memory region created with @memory_region_init_resizeable_ram.
* @newsize: the new size the region
Expand Down
9 changes: 7 additions & 2 deletions migration/migration.c
Expand Up @@ -223,13 +223,18 @@ void migration_object_init(void)
dirty_bitmap_mig_init();
}

void migration_cancel(void)
{
migrate_fd_cancel(current_migration);
}

void migration_shutdown(void)
{
/*
* Cancel the current migration - that will (eventually)
* stop the migration using this structure
*/
migrate_fd_cancel(current_migration);
migration_cancel();
object_unref(OBJECT(current_migration));

/*
Expand Down Expand Up @@ -2307,7 +2312,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,

void qmp_migrate_cancel(Error **errp)
{
migrate_fd_cancel(migrate_get_current());
migration_cancel();
}

void qmp_migrate_continue(MigrationStatus state, Error **errp)
Expand Down
1 change: 1 addition & 0 deletions migration/migration.h
Expand Up @@ -375,5 +375,6 @@ int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque);
void migration_make_urgent_request(void);
void migration_consume_urgent_request(void);
bool migration_rate_limit(void);
void migration_cancel(void);

#endif
30 changes: 30 additions & 0 deletions migration/ram.c
Expand Up @@ -4096,8 +4096,38 @@ static SaveVMHandlers savevm_ram_handlers = {
.resume_prepare = ram_resume_prepare,
};

static void ram_mig_ram_block_resized(RAMBlockNotifier *n, void *host,
size_t old_size, size_t new_size)
{
ram_addr_t offset;
RAMBlock *rb = qemu_ram_block_from_host(host, false, &offset);
Error *err = NULL;

if (ramblock_is_ignored(rb)) {
return;
}

if (!migration_is_idle()) {
/*
* Precopy code on the source cannot deal with the size of RAM blocks
* changing at random points in time - especially after sending the
* RAM block sizes in the migration stream, they must no longer change.
* Abort and indicate a proper reason.
*/
error_setg(&err, "RAM block '%s' resized during precopy.", rb->idstr);
migrate_set_error(migrate_get_current(), err);
error_free(err);
migration_cancel();
}
}

static RAMBlockNotifier ram_mig_ram_notifier = {
.ram_block_resized = ram_mig_ram_block_resized,
};

void ram_mig_init(void)
{
qemu_mutex_init(&XBZRLE.lock);
register_savevm_live("ram", 0, 4, &savevm_ram_handlers, &ram_state);
ram_block_notifier_add(&ram_mig_ram_notifier);
}
5 changes: 3 additions & 2 deletions softmmu/physmem.c
Expand Up @@ -1798,8 +1798,9 @@ static int memory_try_enable_merging(void *addr, size_t len)
return qemu_madvise(addr, len, QEMU_MADV_MERGEABLE);
}

/* Only legal before guest might have detected the memory size: e.g. on
* incoming migration, or right after reset.
/*
* Resizing RAM while migrating can result in the migration being canceled.
* Care has to be taken if the guest might have already detected the memory.
*
* As memory core doesn't know how is memory accessed, it is up to
* resize callback to update device state and/or add assertions to detect
Expand Down

0 comments on commit c7c0e72

Please sign in to comment.