@@ -163,21 +163,31 @@ static void virtio_ccw_register_hcalls(void)
static void s390_memory_init(ram_addr_t mem_size)
{
MemoryRegion *sysmem = get_system_memory();
+ MemoryRegion *ram = g_new(MemoryRegion, 1);
ram_addr_t chunk, offset = 0;
unsigned int number = 0;
Error *local_err = NULL;
gchar *name;
/* allocate RAM for core */
+ memory_region_allocate_system_memory(ram, NULL, "s390.whole.ram", mem_size);
+ /*
+ * memory_region_allocate_system_memory() registers allocated RAM for
+ * migration, however for compat reasons the RAM should be passed over
+ * as RAMBlocks of the size upto KVM_SLOT_MAX_BYTES. So unregister just
+ * allocated RAM so it won't be migrated directly. Aliases will take care
+ * of segmenting RAM into legacy chunks that migration and KVM compatible.
+ */
+ vmstate_unregister_ram(ram, NULL);
name = g_strdup_printf("s390.ram");
while (mem_size) {
- MemoryRegion *ram = g_new(MemoryRegion, 1);
- uint64_t size = mem_size;
+ MemoryRegion *alias = g_new(MemoryRegion, 1);
/* KVM does not allow memslots >= 8 TB */
- chunk = MIN(size, KVM_SLOT_MAX_BYTES);
- memory_region_allocate_system_memory(ram, NULL, name, chunk);
- memory_region_add_subregion(sysmem, offset, ram);
+ chunk = MIN(mem_size, KVM_SLOT_MAX_BYTES);
+ memory_region_init_alias(alias, NULL, name, ram, offset, chunk);
+ vmstate_register_ram_global(alias);
+ memory_region_add_subregion(sysmem, offset, alias);
mem_size -= chunk;
offset += chunk;
g_free(name);
s390 was trying to solve limited KVM memslot size issue by abusing memory_region_allocate_system_memory(), which breaks API contract where the function might be called only once. s390 should have used memory aliases to fragment inital memory into smaller chunks to satisfy KVM's memslot limitation. But its a bit late now, since allocated pieces are transfered in migration stream separately, so it's not possible to just replace broken layout with correct one. To workaround previous patch made MemoryRegion alases migratable and this patch switches to use them to split big initial RAM chunk into smaller pieces up to KVM_SLOT_MAX_BYTES each and registers aliases for migration. That should keep migration and guest ABI (RAM mapping) compatible with previous QEMU versions. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- I don't have access to a suitable system to test it, so I've simulated it with smaller chunks on x84 host. Ping-pong migration between old and new QEMU worked fine. KVM part should be fine as memslots using mapped MemoryRegions (in this case it would be aliases) as far as I know but is someone could test it on big enough host it would be nice. --- hw/s390x/s390-virtio-ccw.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)