Skip to contentSkip to conversation

vl.c: fix migration failure for 3.1 and older machine types

PATCH In review Igor Mammedov 4 participants 5 messages Mar 4, 2020 – Mar 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vl.c: fix migration failure for 3.1 and older machine types

Migration from QEMU(v4.0) fails when using 3.1 or older machine type. For example if one attempts to migrate
QEMU-2.12 started as
qemu-system-ppc64 -nodefaults -M pseries-2.12 -m 4096 -mem-path /tmp/
to current master, it will fail with
qemu-system-ppc64: Unknown ramblock "ppc_spapr.ram", cannot accept migration
qemu-system-ppc64: error while loading state for instance 0x0 of device 'ram'
qemu-system-ppc64: load of migration failed: Invalid argument

Caused by 900c0ba373 commit which switches main RAM allocation to memory backends and the fact in 3.1 and older QEMU, backends used full[***] QOM path as memory region name instead of backend's name. That was changed after 3.1 to use prefix-less names by default (fa0cb34d22) for new machine types.
*** effectively makes main RAM memory region names defined by MachineClass::default_ram_id being altered with '/objects/' prefix and therefore migration fails as old QEMU sends prefix-less name while new QEMU expects name with prefix when using 3.1 and older machine types.

Fix it by forcing implicit[1] memory backend to always use prefix-less names for its memory region by setting
'x-use-canonical-path-for-ramblock-id'
property to false.

1) i.e. memory backend created by compat glue which maps -m/-mem-path/-mem-prealloc/default RAM size into appropriate backend type/options to match old CLI format.

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 softmmu/vl.c | 3 +++
 1 file changed, 3 insertions(+)
softmmu/vl.c +3 -0
index 5549f4b619..1101b1cb41 100644
@@ -2800,6 +2800,9 @@ static void create_default_memdev(MachineState *ms, const char *path)
     object_property_set_int(obj, ms->ram_size, "size", &error_fatal);
     object_property_add_child(object_get_objects_root(), mc->default_ram_id,
                               obj, &error_fatal);
+    /* Ensure backend's memory region name is equal to mc->default_ram_id */
+    object_property_set_bool(obj, false, "x-use-canonical-path-for-ramblock-id",
+                             &error_fatal);
     user_creatable_complete(USER_CREATABLE(obj), &error_fatal);
     object_unref(obj);
     object_property_set_str(OBJECT(ms), mc->default_ram_id, "memory-backend",
Signature · 1 line
2.18.1
Tested-by on v1 1/1
#1 lore raw

Dne 04. 03. 20 v 18:27 Igor Mammedov napsal(a):

Quoted 46 lines

Migration from QEMU(v4.0) fails when using 3.1 or older machine type. For example if one attempts to migrate
QEMU-2.12 started as
qemu-system-ppc64 -nodefaults -M pseries-2.12 -m 4096 -mem-path /tmp/
to current master, it will fail with
qemu-system-ppc64: Unknown ramblock "ppc_spapr.ram", cannot accept migration
qemu-system-ppc64: error while loading state for instance 0x0 of device 'ram'
qemu-system-ppc64: load of migration failed: Invalid argument

Caused by 900c0ba373 commit which switches main RAM allocation to memory backends and the fact in 3.1 and older QEMU, backends used full[***] QOM path as memory region name instead of backend's name. That was changed after 3.1 to use prefix-less names by default (fa0cb34d22) for new machine types.
*** effectively makes main RAM memory region names defined by MachineClass::default_ram_id being altered with '/objects/' prefix and therefore migration fails as old QEMU sends prefix-less name while new QEMU expects name with prefix when using 3.1 and older machine types.

Fix it by forcing implicit[1] memory backend to always use prefix-less names for its memory region by setting
'x-use-canonical-path-for-ramblock-id'
property to false.

1) i.e. memory backend created by compat glue which maps -m/-mem-path/-mem-prealloc/default RAM size into appropriate backend type/options to match old CLI format.

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 softmmu/vl.c | 3 +++
 1 file changed, 3 insertions(+)
softmmu/vl.c +0 -0
index 5549f4b619..1101b1cb41 100644

softmmu/vl.c static void create_default_memdev(MachineState *ms, const char *path) · line 2808

Quoted 9 lines
softmmu/vl.c +3 -0
@@ -2800,6 +2800,9 @@ static void create_default_memdev(MachineState *ms, const char *path)
     object_property_set_int(obj, ms->ram_size, "size", &error_fatal);
     object_property_add_child(object_get_objects_root(), mc->default_ram_id,
                               obj, &error_fatal);
+    /* Ensure backend's memory region name is equal to mc->default_ram_id */
+    object_property_set_bool(obj, false, "x-use-canonical-path-for-ramblock-id",
+                             &error_fatal);
     user_creatable_complete(USER_CREATABLE(obj), &error_fatal);
     object_unref(obj);
     object_property_set_str(OBJECT(ms), mc->default_ram_id, "memory-backend",

I can't say anything about the code, but functional-wise it addresses the issue and fixes post_copy hugepages migration in my mini-CI (variants 2.10, 2.12, 3.0, 3.1, 4.0 -> master and vice-versa are failing with master and passing with this patch).

Regards,
Lukáš

Reviewed-by on v1 1/1
#2 lore raw
In reply to Igor Mammedov

Hi

Quoted 21 lines · Igor Mammedov

Migration from QEMU(v4.0) fails when using 3.1 or older machine type. For example if one attempts to migrate
QEMU-2.12 started as
qemu-system-ppc64 -nodefaults -M pseries-2.12 -m 4096 -mem-path /tmp/
to current master, it will fail with
qemu-system-ppc64: Unknown ramblock "ppc_spapr.ram", cannot accept migration
qemu-system-ppc64: error while loading state for instance 0x0 of device 'ram'
qemu-system-ppc64: load of migration failed: Invalid argument

Caused by 900c0ba373 commit which switches main RAM allocation to memory backends and the fact in 3.1 and older QEMU, backends used full[***] QOM path as memory region name instead of backend's name. That was changed after 3.1 to use prefix-less names by default (fa0cb34d22) for new machine types.
*** effectively makes main RAM memory region names defined by MachineClass::default_ram_id being altered with '/objects/' prefix and therefore migration fails as old QEMU sends prefix-less name while new QEMU expects name with prefix when using 3.1 and older machine types.

Quoted 4 lines

Fix it by forcing implicit[1] memory backend to always use prefix-less names for its memory region by setting
'x-use-canonical-path-for-ramblock-id'
property to false.

ahah, ok. If main RAM allocation was always using prefix-less name, then that should be good enough:

Quoted 34 lines

1) i.e. memory backend created by compat glue which maps -m/-mem-path/-mem-prealloc/default RAM size into appropriate backend type/options to match old CLI format.

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 softmmu/vl.c | 3 +++
 1 file changed, 3 insertions(+)
softmmu/vl.c +3 -1
index 5549f4b619..1101b1cb41 100644
@@ -2800,6 +2800,9 @@ static void create_default_memdev(MachineState *ms, const char *path)
     object_property_set_int(obj, ms->ram_size, "size", &error_fatal);
     object_property_add_child(object_get_objects_root(), mc->default_ram_id,
                               obj, &error_fatal);
+    /* Ensure backend's memory region name is equal to mc->default_ram_id */
+    object_property_set_bool(obj, false, "x-use-canonical-path-for-ramblock-id",
+                             &error_fatal);
     user_creatable_complete(USER_CREATABLE(obj), &error_fatal);
     object_unref(obj);
     object_property_set_str(OBJECT(ms), mc->default_ram_id, "memory-backend",
--

2.18.1

Signature · 1 line
Marc-André Lureau
#3 lore raw
In reply to Igor Mammedov
Quoted 25 lines · On Wed, 4 Mar 2020 12:27:48 -0500 Igor Mammedov <[email protected]> wrote:

Migration from QEMU(v4.0) fails when using 3.1 or older machine type. For example if one attempts to migrate
QEMU-2.12 started as
qemu-system-ppc64 -nodefaults -M pseries-2.12 -m 4096 -mem-path /tmp/
to current master, it will fail with
qemu-system-ppc64: Unknown ramblock "ppc_spapr.ram", cannot accept migration
qemu-system-ppc64: error while loading state for instance 0x0 of device 'ram'
qemu-system-ppc64: load of migration failed: Invalid argument

Caused by 900c0ba373 commit which switches main RAM allocation to memory backends and the fact in 3.1 and older QEMU, backends used full[***] QOM path as memory region name instead of backend's name. That was changed after 3.1 to use prefix-less names by default (fa0cb34d22) for new machine types.
*** effectively makes main RAM memory region names defined by MachineClass::default_ram_id being altered with '/objects/' prefix and therefore migration fails as old QEMU sends prefix-less name while new QEMU expects name with prefix when using 3.1 and older machine types.

Fix it by forcing implicit[1] memory backend to always use prefix-less names for its memory region by setting
'x-use-canonical-path-for-ramblock-id'
property to false.

Quoted 7 lines

1) i.e. memory backend created by compat glue which maps -m/-mem-path/-mem-prealloc/default RAM size into appropriate backend type/options to match old CLI format.

ping,

so we don't forget to merge it

Quoted 22 lines

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 softmmu/vl.c | 3 +++
 1 file changed, 3 insertions(+)
softmmu/vl.c +3 -0
index 5549f4b619..1101b1cb41 100644
@@ -2800,6 +2800,9 @@ static void create_default_memdev(MachineState *ms, const char *path)
     object_property_set_int(obj, ms->ram_size, "size", &error_fatal);
     object_property_add_child(object_get_objects_root(), mc->default_ram_id,
                               obj, &error_fatal);
+    /* Ensure backend's memory region name is equal to mc->default_ram_id */
+    object_property_set_bool(obj, false, "x-use-canonical-path-for-ramblock-id",
+                             &error_fatal);
     user_creatable_complete(USER_CREATABLE(obj), &error_fatal);
     object_unref(obj);
     object_property_set_str(OBJECT(ms), mc->default_ram_id, "memory-backend",
#4 lore raw
Quoted 32 lines · * Igor Mammedov ([email protected]) wrote:
Quoted 29 lines · On Wed, 4 Mar 2020 12:27:48 -0500 Igor Mammedov <[email protected]> wrote:

Migration from QEMU(v4.0) fails when using 3.1 or older machine type. For example if one attempts to migrate
QEMU-2.12 started as
qemu-system-ppc64 -nodefaults -M pseries-2.12 -m 4096 -mem-path /tmp/
to current master, it will fail with
qemu-system-ppc64: Unknown ramblock "ppc_spapr.ram", cannot accept migration
qemu-system-ppc64: error while loading state for instance 0x0 of device 'ram'
qemu-system-ppc64: load of migration failed: Invalid argument

Caused by 900c0ba373 commit which switches main RAM allocation to memory backends and the fact in 3.1 and older QEMU, backends used full[***] QOM path as memory region name instead of backend's name. That was changed after 3.1 to use prefix-less names by default (fa0cb34d22) for new machine types.
*** effectively makes main RAM memory region names defined by MachineClass::default_ram_id being altered with '/objects/' prefix and therefore migration fails as old QEMU sends prefix-less name while new QEMU expects name with prefix when using 3.1 and older machine types.

Fix it by forcing implicit[1] memory backend to always use prefix-less names for its memory region by setting
'x-use-canonical-path-for-ramblock-id'
property to false.

1) i.e. memory backend created by compat glue which maps -m/-mem-path/-mem-prealloc/default RAM size into appropriate backend type/options to match old CLI format.

Quoted 8 lines
Quoted 3 lines

ping,

so we don't forget to merge it

I'm queueing this.

Quoted 8 lines
Quoted 8 lines

---
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 softmmu/vl.c | 3 +++
 1 file changed, 3 insertions(+)
Quoted 16 lines
Quoted 5 lines
softmmu/vl.c +0 -0
index 5549f4b619..1101b1cb41 100644

softmmu/vl.c static void create_default_memdev(MachineState *ms, const char *path) · line 2808

Quoted 9 lines
softmmu/vl.c +3 -0
@@ -2800,6 +2800,9 @@ static void create_default_memdev(MachineState *ms, const char *path)
     object_property_set_int(obj, ms->ram_size, "size", &error_fatal);
     object_property_add_child(object_get_objects_root(), mc->default_ram_id,
                               obj, &error_fatal);
+    /* Ensure backend's memory region name is equal to mc->default_ram_id */
+    object_property_set_bool(obj, false, "x-use-canonical-path-for-ramblock-id",
+                             &error_fatal);
     user_creatable_complete(USER_CREATABLE(obj), &error_fatal);
     object_unref(obj);
     object_property_set_str(OBJECT(ms), mc->default_ram_id, "memory-backend",

--
Dr. David Alan Gilbert / [email protected] / Manchester, UK