v3: don't call reset functions on cpu initialization
PATCH 1/1 v3: don't call reset functions on cpu initialization
There is absolutely no need to call reset functions when initializing devices. Since we are already registering them, calling qemu_system_reset() should suffice. Actually, it is what happens when we reboot the machine, and using the same process instead of a special case semantics will even allow us to find bugs easier.
Furthermore, the fact that we initialize things like the cpu quite early, leads to the need to introduce synchronization stuff like qemu_system_cond. This patch removes it entirely. All we need to do is call qemu_system_reset() only when we're already sure the system is up and running
I tested it with qemu (with and without io-thread) and qemu-kvm, and it seems to be doing okay - although qemu-kvm uses a slightly different patch.
[ v2: user mode still needs cpu_reset, so put it in ifdef. ] [ v3: leave qemu_system_cond for now. ]
--- hw/apic.c | 1 - hw/e1000.c | 1 - hw/hpet.c | 1 - hw/i8254.c | 2 -- hw/ide/piix.c | 1 - hw/piix4.c | 1 - hw/piix_pci.c | 1 - hw/rtl8139.c | 2 +- hw/serial.c | 1 - hw/usb-ohci.c | 1 - hw/usb-uhci.c | 1 - hw/vga.c | 1 - target-i386/helper.c | 2 ++ vl.c | 1 + 14 files changed, 4 insertions(+), 13 deletions(-)
hw/apic.c +0 -1
@@ -981,7 +981,6 @@ int apic_init(CPUState *env) s->id = env->cpuid_apic_id; s->cpu_env = env; -apic_reset (s); msix_supported =1 ;/* XXX: mapping more APICs at the same memory location */
hw/e1000.c +0 -1
@@ -1113,7 +1113,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)qemu_format_nic_info_str (d->vc, macaddr);vmstate_register (-1 , &vmstate_e1000, d); -e1000_reset (d);if (!pci_dev->qdev.hotplugged) {static int loaded =0 ;
hw/hpet.c +0 -1
@@ -577,7 +577,6 @@ void hpet_init(qemu_irq *irq) {HPETTimer *timer = &s->timer[i]; timer->qemu_timer =qemu_new_timer (vm_clock, hpet_timer, timer); } -hpet_reset (s);vmstate_register (-1 , &vmstate_hpet, s);qemu_register_reset (hpet_reset, s);/* HPET Area */
hw/i8254.c +0 -2
@@ -513,7 +513,5 @@ PITState *pit_init(int base, qemu_irq irq)register_ioport_write (base,4 ,1 , pit_ioport_write, pit);register_ioport_read (base,3 ,1 , pit_ioport_read, pit); -pit_reset (pit); -return pit; }
hw/ide/piix.c +0 -1
@@ -120,7 +120,6 @@ static int pci_piix_ide_initfn(PCIIDEState *d) pci_conf[PCI_HEADER_TYPE ] =PCI_HEADER_TYPE_NORMAL ;// header_type qemu_register_reset (piix3_reset, d); -piix3_reset (d);pci_register_bar (&d->dev,4 ,0x10 ,PCI_ADDRESS_SPACE_IO , bmdma_map);
hw/piix4.c +0 -1
@@ -97,7 +97,6 @@ static int piix4_initfn(PCIDevice *d)PCI_HEADER_TYPE_NORMAL |PCI_HEADER_TYPE_MULTI_FUNCTION ;// header_type = PCI_multifunction, generic piix4_dev = d; -piix4_reset (d);qemu_register_reset (piix4_reset, d);return 0 ; }
hw/piix_pci.c +0 -1
@@ -341,7 +341,6 @@ static int piix3_initfn(PCIDevice *dev) pci_conf[PCI_HEADER_TYPE ] =PCI_HEADER_TYPE_NORMAL |PCI_HEADER_TYPE_MULTI_FUNCTION ;// header_type = PCI_multifunction, generic -piix3_reset (d);qemu_register_reset (piix3_reset, d);return 0 ; }
hw/rtl8139.c +1 -1
@@ -3331,7 +3331,7 @@ static int pci_rtl8139_init(PCIDevice *dev) PCI_ADDRESS_SPACE_MEM, rtl8139_mmio_map);qemu_macaddr_default_if_unset (&s->conf.macaddr); -rtl8139_reset (&s->dev.qdev); + s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->conf.vlan, s->conf.peer, dev->qdev.info->name, dev->qdev.id,
hw/serial.c +0 -1
@@ -725,7 +725,6 @@ static void serial_init_core(SerialState *s) s->transmit_timer =qemu_new_timer (vm_clock, (QEMUTimerCB *) serial_xmit, s);qemu_register_reset (serial_reset, s); -serial_reset (s);qemu_chr_add_handlers (s->chr, serial_can_receive1, serial_receive1, serial_event, s);
hw/usb-ohci.c +0 -1
@@ -1698,7 +1698,6 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev, ohci->async_td =0 ;qemu_register_reset (ohci_reset, ohci); -ohci_reset (ohci); } typedef struct {
hw/usb-uhci.c +0 -1
@@ -1079,7 +1079,6 @@ static int usb_uhci_common_initfn(UHCIState *s) s->num_ports_vmstate =NB_PORTS ;qemu_register_reset (uhci_reset, s); -uhci_reset (s);/* Use region 4 for consistency with real hardware. BSD guests seem to rely on this. */
hw/vga.c +0 -1
@@ -2235,7 +2235,6 @@ void vga_common_init(VGACommonState *s, int vga_ram_size) s->update_retrace_info = vga_precise_update_retrace_info;break ; } -vga_reset (s); }/* used by both ISA and PCI */
target-i386/helper.c +2 -0
@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model)return NULL ; }mce_init (env); +#ifdef CONFIG_USER_ONLY cpu_reset (env); +#endif qemu_init_vcpu (env);
vl.c +1 -0
@@ -4034,6 +4034,7 @@ static void main_loop(void) qemu_system_ready =1 ;qemu_cond_broadcast (&qemu_system_cond);#endif +qemu_system_reset ();for (;;) { do {
Signature · 1 line
1.6.2.5
Quoted 10 lines · Glauber Costa
There is absolutely no need to call reset functions when initializing devices. Since we are already registering them, calling
qemu_system_reset()should suffice. Actually, it is what happens when we reboot the machine, and using the same process instead of a special case semantics will even allow us to find bugs easier.Furthermore, the fact that we initialize things like the cpu quite early, leads to the need to introduce synchronization stuff like
qemu_system_cond. This patch removes it entirely. All we need to do is callqemu_system_reset()only when we're already sure the system is up and running
Nice idea. But shouldn't you remove all calls to reset functions, not just some random x86 ones?
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 9 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif
Please push the call to *-user/main.c, just after call to cpu_init().
Quoted 7 lines · Blue Swirl
Quoted 6 lines · Glauber Costa
There is absolutely no need to call reset functions when initializing devices. Since we are already registering them, calling
qemu_system_reset()should suffice. Actually, it is what happens when we reboot the machine, and using the same process instead of a special case semantics will even allow us to find bugs easier.
Quoted 7 lines
Quoted 4 lines
Furthermore, the fact that we initialize things like the cpu quite early, leads to the need to introduce synchronization stuff like
qemu_system_cond. This patch removes it entirely. All we need to do is callqemu_system_reset()only when we're already sure the system is up and runningNice idea. But shouldn't you remove all calls to reset functions, not just some random x86 ones?
Yes, but I can't test it, so I don't feel comfortable.
After the patch is merged, others can remove their own too.
Quoted 12 lines
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 10 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif Please push the call to
*-user/main.c, just after call tocpu_init().
I'd prefer it that way too. But cpu_reset is also called in some other places, and Laurent suggested me to to this way.
I don't really know much about -user, so I'm fine with whatever you guys agree on.
Quoted 2 lines · Glauber Costa
Quoted 1 line · Blue Swirl
On Thu, Nov 5, 2009 at 6:05 PM, Glauber Costa <[email protected]> wrote:
[...]
Quoted 11 lines
Quoted 11 lines
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 9 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif Please push the call to
*-user/main.c, just after call tocpu_init().
Quoted 2 lines
I'd prefer it that way too. But
cpu_resetis also called in some other places, and Laurent suggested me to to this way.
Yes, you'd have to remove all calls to cpu_reset from all CPUs. And also add a call to cpu_reset to cpu_copy.
Quoted 1 line
I don't really know much about -user, so I'm fine with whatever you guys agree on.
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Laurent
Quoted 21 lines · Laurent Desnogues
Quoted 2 lines · Glauber Costa
Quoted 1 line · Blue Swirl
On Thu, Nov 5, 2009 at 6:05 PM, Glauber Costa <[email protected]> wrote:
[...]
Quoted 11 lines
Quoted 11 lines
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 9 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif Please push the call to
*-user/main.c, just after call tocpu_init().Quoted 2 lines
I'd prefer it that way too. But
cpu_resetis also called in some other places, and Laurent suggested me to to this way.Yes, you'd have to remove all calls to
cpu_resetfrom all CPUs. And also add a call tocpu_resettocpu_copy.
Quoted 6 lines
Quoted 1 line
I don't really know much about -user, so I'm fine with whatever you guys agree on.
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to cpu_reset are important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.
Quoted 2 lines · Blue Swirl
On Fri, Nov 6, 2009 at 8:43 PM, Laurent Desnogues
<[email protected]> wrote:
[...]
Quoted 9 lines
Quoted 4 lines
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.
Multiple resets would result in memory leaks for MIPS for instance. So I don't think they are that innocuous. Though that probably is more a problem of the MIPS reset than anything else :-)
Laurent
Quoted 9 lines · Laurent Desnogues
Quoted 2 lines · Blue Swirl
On Fri, Nov 6, 2009 at 8:43 PM, Laurent Desnogues
<[email protected]> wrote:[...]
Quoted 5 lines
Quoted 4 lines
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Quoted 8 lines
Quoted 4 lines
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.Multiple resets would result in memory leaks for MIPS for instance. So I don't think they are that innocuous. Though that probably is more a problem of the MIPS reset than anything else :-)
You are hinting at target-mips/translate_init.c: mmu_init()? Right, it shouldn't do the allocation.
Quoted 16 lines · Blue Swirl
Quoted 14 lines · Laurent Desnogues
Quoted 2 lines · Blue Swirl
On Fri, Nov 6, 2009 at 8:43 PM, Laurent Desnogues
<[email protected]> wrote:[...]
Quoted 9 lines
Quoted 4 lines
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.
Quoted 6 lines
Quoted 3 lines
Multiple resets would result in memory leaks for MIPS for instance. So I don't think they are that innocuous. Though that probably is more a problem of the MIPS reset than anything else :-)
You are hinting at
target-mips/translate_init.c:mmu_init()? Right, it shouldn't do the allocation.
No, I was talking about mvp_init.
Laurent
Quoted 17 lines · Laurent Desnogues
Quoted 16 lines · Blue Swirl
Quoted 14 lines · Laurent Desnogues
Quoted 2 lines · Blue Swirl
On Fri, Nov 6, 2009 at 8:43 PM, Laurent Desnogues
<[email protected]> wrote:[...]
Quoted 9 lines
Quoted 4 lines
I honestly don't care that much as long as all targets still work in user mode :-)
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Multiple resets would result in memory leaks for MIPS for instance. So I don't think they are that innocuous. Though that probably is more a problem of the MIPS reset than anything else :-)
You are hinting at
target-mips/translate_init.c:mmu_init()? Right, it shouldn't do the allocation.No, I was talking about
mvp_init.
Both are then buggy.
Why are these even allocated instead being members of CPUState?
Quoted 28 lines · Blue Swirl
Quoted 26 lines · Laurent Desnogues
Quoted 2 lines · Glauber Costa
Quoted 1 line · Blue Swirl
On Thu, Nov 5, 2009 at 6:05 PM, Glauber Costa <[email protected]> wrote:
[...]
Quoted 11 lines
Quoted 11 lines
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 9 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif Please push the call to
*-user/main.c, just after call tocpu_init().Quoted 2 lines
I'd prefer it that way too. But
cpu_resetis also called in some other places, and Laurent suggested me to to this way.Yes, you'd have to remove all calls to
cpu_resetfrom all CPUs. And also add a call tocpu_resettocpu_copy.Quoted 1 line
I don't really know much about -user, so I'm fine with whatever you guys agree on.
I honestly don't care that much as long as all targets still work in user mode :-)
Quoted 6 lines
Quoted 1 line
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.
Which IMHO, pretty much means apply it this way, and then later on move the reset functions elsewhere for -user, if one wants to.
Quoted 29 lines · Glauber Costa
Quoted 28 lines · Blue Swirl
Quoted 26 lines · Laurent Desnogues
Quoted 2 lines · Glauber Costa
Quoted 1 line · Blue Swirl
On Thu, Nov 5, 2009 at 6:05 PM, Glauber Costa <[email protected]> wrote:
[...]
Quoted 11 lines
Quoted 11 lines
target-i386/helper.c CPUX86State *cpu_x86_init(const char *cpu_model) · line 1890
Quoted 9 lines
target-i386/helper.c +2
-0@@ -1885,7 +1885,9 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); +#ifdef CONFIG_USER_ONLY cpu_reset(env); +#endif Please push the call to
*-user/main.c, just after call tocpu_init().Quoted 2 lines
I'd prefer it that way too. But
cpu_resetis also called in some other places, and Laurent suggested me to to this way.Yes, you'd have to remove all calls to
cpu_resetfrom all CPUs. And also add a call tocpu_resettocpu_copy.Quoted 1 line
I don't really know much about -user, so I'm fine with whatever you guys agree on.
I honestly don't care that much as long as all targets still work in user mode :-)
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
The aim was to make Glauber's patch less intrusive.
Given that only the new calls to
cpu_resetare important and the removals are much less so (double reset shouldn't be a problem), the least intrusive version would be to just add the new calls and do the clean up later.Which IMHO, pretty much means apply it this way, and then later on move the reset functions elsewhere for -user, if one wants to.
Thanks, applied. While testing I noticed that the poor x86 emulator does not survive even five system_resets until BIOS refuses to boot. This happens without your patch. In comparison, I see no problems resetting Sparc32, Sparc64 or PPC.
On Sat, Nov 7, 2009 at 9:40 AM, Blue Swirl <[email protected]> wrote:
[...]
Quoted 4 lines
Thanks, applied. While testing I noticed that the poor x86 emulator does not survive even five
system_resetsuntil BIOS refuses to boot. This happens without your patch. In comparison, I see no problems resetting Sparc32, Sparc64 or PPC.
Unless I missed something you didn't commit Glauber's patch.
So now in user mode cpu_reset differs for i386, SPARC and PPC, and all other targets.
On top of that you didn't add a call to cpu_reset from cpu_copy which also calls cpu_init. Are you sure it's OK?
Laurent
Quoted 8 lines · Laurent Desnogues
On Sat, Nov 7, 2009 at 9:40 AM, Blue Swirl <[email protected]> wrote:
[...]Quoted 4 lines
Thanks, applied. While testing I noticed that the poor x86 emulator does not survive even five
system_resetsuntil BIOS refuses to boot. This happens without your patch. In comparison, I see no problems resetting Sparc32, Sparc64 or PPC.Unless I missed something you didn't commit Glauber's patch.
What's c169998802505c244b8bcad562633f29de7d74a4 then?
Quoted 2 lines
So now in user mode
cpu_resetdiffers for i386, SPARC and PPC, and all other targets.
No, for example MIPS cpu_reset is still called only once from cpu_mips_init.
Quoted 2 lines
On top of that you didn't add a call to
cpu_resetfromcpu_copywhich also callscpu_init. Are you sure it's OK?
It's not, I forgot to add that, sorry.
On Sat, Nov 7, 2009 at 5:11 PM, Blue Swirl <[email protected]> wrote:
[...]
Quoted 3 lines
Quoted 1 line
Unless I missed something you didn't commit Glauber's patch.
What's
c169998802505c244b8bcad562633f29de7d74a4then?
My bad, I updated and didn't notice you had applied further modifications. I seriously lack the commit mail notifications :-)
Laurent