Skip to contentSkip to conversation

xen: fixup RAM memory region initialization

PATCH In review Igor Mammedov 2 participants 3 messages Apr 2, 2020 – Apr 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xen: fixup RAM memory region initialization

Since bd457782b3b0 ("x86/pc: use memdev for RAM") Xen machine fails to start with:
qemu-system-i386: xen: failed to populate ram at 0

The reason is that xen_ram_alloc() which is called by memory_region_init_ram(), compares memory region with statically allocated 'global' ram_memory memory region that it uses for RAM, and does nothing in case it matches.

While it's possible feed machine->ram to xen_ram_alloc() in the same manner to keep that hack working, I'd prefer not to keep that circular dependency and try to untangle that.

However it doesn't look trivial to fix, so as temporary fixup opt out Xen machine from memdev based RAM allocation, and let xen_ram_alloc() do its trick for now.

---
v2:
* make it work with -M pc,accel=xen

---
 hw/xen/xen-common.c | 7 +++++++
 1 file changed, 7 insertions(+)
hw/xen/xen-common.c +7 -0
index 15650d7f6a..a15070f7f6 100644
@@ -19,6 +19,7 @@
 #include "sysemu/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
+#include "hw/boards.h"
 
 //#define DEBUG_XEN
 
@@ -151,6 +152,8 @@ static void xen_setup_post(MachineState *ms, AccelState *accel)
 
 static int xen_init(MachineState *ms)
 {
+    MachineClass *mc = MACHINE_GET_CLASS(ms);
+
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_pv_printf(NULL, 0, "can't open xen interface\n");
@@ -170,6 +173,10 @@ static int xen_init(MachineState *ms)
         return -1;
     }
     qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
+    /*
+     * opt out of system RAM being allocated by generic code
+     */
+    mc->default_ram_id = NULL;
     return 0;
 }
 
Signature · 1 line
2.18.1
#1 lore raw
Quoted 49 lines · Igor Mammedov

Since bd457782b3b0 ("x86/pc: use memdev for RAM") Xen machine fails to start with:
qemu-system-i386: xen: failed to populate ram at 0

The reason is that xen_ram_alloc() which is called by memory_region_init_ram(), compares memory region with statically allocated 'global' ram_memory memory region that it uses for RAM, and does nothing in case it matches.

While it's possible feed machine->ram to xen_ram_alloc() in the same manner to keep that hack working, I'd prefer not to keep that circular dependency and try to untangle that.

However it doesn't look trivial to fix, so as temporary fixup opt out Xen machine from memdev based RAM allocation, and let xen_ram_alloc() do its trick for now.

---
v2:
* make it work with -M pc,accel=xen

---
 hw/xen/xen-common.c | 7 +++++++
 1 file changed, 7 insertions(+)
hw/xen/xen-common.c +3 -0
index 15650d7f6a..a15070f7f6 100644
@@ -19,6 +19,7 @@
 #include "sysemu/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
+#include "hw/boards.h"
 
 //#define DEBUG_XEN
 
@@ -151,6 +152,8 @@ static void xen_setup_post(MachineState *ms, AccelState *accel)
 
 static int xen_init(MachineState *ms)
 {
+    MachineClass *mc = MACHINE_GET_CLASS(ms);
+
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_pv_printf(NULL, 0, "can't open xen interface\n");

hw/xen/xen-common.c static int xen_init(MachineState *ms) · line 182

Quoted 10 lines
hw/xen/xen-common.c +4 -0
@@ -170,6 +173,10 @@ static int xen_init(MachineState *ms)
         return -1;
     }
     qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
+    /*
+     * opt out of system RAM being allocated by generic code
+     */
+    mc->default_ram_id = NULL;
     return 0;
 }
 

Monkey patching the class is slightly disgusting. :) It would be better to use a new ms->default_ram_id, and assign it from the class in instance_init, but I've queued it anyway.

Paolo

#2 lore raw
Quoted 56 lines · On Thu, 2 Apr 2020 20:57:14 +0200 Paolo Bonzini <[email protected]> wrote:
Quoted 55 lines · Igor Mammedov

Since bd457782b3b0 ("x86/pc: use memdev for RAM") Xen machine fails to start with:
qemu-system-i386: xen: failed to populate ram at 0

The reason is that xen_ram_alloc() which is called by memory_region_init_ram(), compares memory region with statically allocated 'global' ram_memory memory region that it uses for RAM, and does nothing in case it matches.

While it's possible feed machine->ram to xen_ram_alloc() in the same manner to keep that hack working, I'd prefer not to keep that circular dependency and try to untangle that.

However it doesn't look trivial to fix, so as temporary fixup opt out Xen machine from memdev based RAM allocation, and let xen_ram_alloc() do its trick for now.

---
v2:
* make it work with -M pc,accel=xen

---
 hw/xen/xen-common.c | 7 +++++++
 1 file changed, 7 insertions(+)
hw/xen/xen-common.c +7 -0
index 15650d7f6a..a15070f7f6 100644
@@ -19,6 +19,7 @@
 #include "sysemu/runstate.h"
 #include "migration/misc.h"
 #include "migration/global_state.h"
+#include "hw/boards.h"
 
 //#define DEBUG_XEN
 
@@ -151,6 +152,8 @@ static void xen_setup_post(MachineState *ms, AccelState *accel)
 
 static int xen_init(MachineState *ms)
 {
+    MachineClass *mc = MACHINE_GET_CLASS(ms);
+
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_pv_printf(NULL, 0, "can't open xen interface\n");
@@ -170,6 +173,10 @@ static int xen_init(MachineState *ms)
         return -1;
     }
     qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
+    /*
+     * opt out of system RAM being allocated by generic code
+     */
+    mc->default_ram_id = NULL;
Quoted 8 lines

hw/xen/xen-common.c static int xen_init(MachineState *ms) · line 182

Quoted 4 lines
hw/xen/xen-common.c +0 -0
     return 0;
 }
 

Monkey patching the class is slightly disgusting. :) It would be better to use a new ms->default_ram_id, and assign it from the class in instance_init, but I've queued it anyway.

it's disgusting, I hope to drop this after fixing xen properly.

Quoted 4 lines

Paolo