forked from Minki/linux
b291aa7a65
I have had four seperate system lockups attributable to this exact problem in two days of testing. Instead of trying to handle all the weird end cases and wrap, how about changing it to look for exactly what we appear to want. The following patch removes a couple races in setup_APIC_timer. One occurs when the HPET advances the COUNTER past the T0_CMP value between the time the T0_CMP was originally read and when COUNTER is read. This results in a delay waiting for the counter to wrap. The other results from the counter wrapping. This change takes a snapshot of T0_CMP at the beginning of the loop and simply loops until T0_CMP has changed (a tick has happened). <later> I have one small concern about the patch. I am not sure it meets the intent as well as it should. I think we are trying to match APIC timer interrupts up with the hpet counter increment. The event which appears to be disturbing this loop in our test environment is the NMI watchdog. What we believe has been happening with the existing code is the setup_APIC_timer loop has read the CMP value, and the NMI watchdog code fires for the first time. This results in a series of icache miss slowdowns and by the time we get back to things it has wrapped. I think this code is trying to get the CMP as close to the counter value as possible. If that is the intent, maybe we should really be testing against a "window" around the CMP. Something like COUNTER = CMP+/2. It appears COUNTER should get advanced every 89nSec (IIRC). The above seems like an unreasonably small window, but may be necessary. Without documentation, I am not sure of the original intent with this code. In summary, this code fixes my boot hangs, but since I am not certain of the intent of the existing code, I am not certain this has not introduced new bugs or unexpected behaviors. Signed-off-by: Robin Holt <holt@sgi.com> Acked-by: Andi Kleen <ak@suse.de> Cc: Vojtech Pavlik <vojtech@suse.cz> Cc: "Aaron Durbin" <adurbin@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
||
|---|---|---|
| .. | ||
| acpi | ||
| cpufreq | ||
| aperture.c | ||
| apic.c | ||
| asm-offsets.c | ||
| audit.c | ||
| bugs.c | ||
| crash_dump.c | ||
| crash.c | ||
| e820.c | ||
| early_printk.c | ||
| early-quirks.c | ||
| entry.S | ||
| genapic_flat.c | ||
| genapic.c | ||
| head64.c | ||
| head.S | ||
| hpet.c | ||
| i387.c | ||
| i8259.c | ||
| init_task.c | ||
| io_apic.c | ||
| ioport.c | ||
| irq.c | ||
| k8.c | ||
| kprobes.c | ||
| ldt.c | ||
| machine_kexec.c | ||
| Makefile | ||
| mce_amd.c | ||
| mce_intel.c | ||
| mce.c | ||
| module.c | ||
| mpparse.c | ||
| nmi.c | ||
| pci-calgary.c | ||
| pci-dma.c | ||
| pci-gart.c | ||
| pci-nommu.c | ||
| pci-swiotlb.c | ||
| pmtimer.c | ||
| process.c | ||
| ptrace.c | ||
| reboot.c | ||
| relocate_kernel.S | ||
| setup64.c | ||
| setup.c | ||
| signal.c | ||
| smp.c | ||
| smpboot.c | ||
| stacktrace.c | ||
| suspend_asm.S | ||
| suspend.c | ||
| sys_x86_64.c | ||
| syscall.c | ||
| tce.c | ||
| time.c | ||
| trampoline.S | ||
| traps.c | ||
| tsc_sync.c | ||
| tsc.c | ||
| verify_cpu.S | ||
| vmlinux.lds.S | ||
| vsmp.c | ||
| vsyscall.c | ||
| x8664_ksyms.c | ||