Messages in this thread Patch in this message | | | Date | Mon, 22 Jun 2009 11:03:20 +0900 | From | Hidetoshi Seto <> | Subject | Re: 2.6.30-git(16 and 17) system hangs after resume from suspend to disk, mce related? |
| |
Maciej Rutecki wrote: >> Also a "a few minutes" suggest something might be going wrong >> with the poll handler. Does the problem still happen >> with you use CONFIG_X86_NEW_MCE again, but before >> resume do >> >> echo 0 > /sys/device/system/machinecheck/machinecheck0/check_interval >> >> On the other hand you should get a crash very fast with >> >> echo 1 > /sys/device/system/machinecheck/machinecheck0/check_interval > > I didn't instructions from above, but I found something else. After > normal boot I try: > > echo 1 > /sys/devices/system/machinecheck/machinecheck0/check_interval > > I I found this in dmesg: > > [ 141.704025] ------------[ cut here ]------------ > [ 141.704039] WARNING: at arch/x86/kernel/cpu/mcheck/mce.c:1102 > mcheck_timer+0xf5/0x100()
I see. At least this warning will be cleared by following patch. WARN_ON(smp_processor_id() != data);
But I'm not sure whether this can cause system hangs or not.
Thanks, H.Seto
===
[PATCH] x86, mce: percpu mcheck_timer should be pinned
Maciej Rutecki wrote: > After normal boot I try: > > echo 1 > /sys/devices/system/machinecheck/machinecheck0/check_interval > > I I found this in dmesg: > > [ 141.704025] ------------[ cut here ]------------ > [ 141.704039] WARNING: at arch/x86/kernel/cpu/mcheck/mce.c:1102 > mcheck_timer+0xf5/0x100()
If CONFIG_NO_HZ + CONFIG_SMP, timer added via add_timer() might be migrated on other cpu. Use add_timer_on() instead.
Reported-by: Maciej Rutecki <maciej.rutecki@gmail.com> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> CC: Andi Kleen <ak@linux.intel.com> --- arch/x86/kernel/cpu/mcheck/mce.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index 7da8fec..8e1794a 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1117,7 +1117,7 @@ static void mcheck_timer(unsigned long data) *n = min(*n*2, (int)round_jiffies_relative(check_interval*HZ)); t->expires = jiffies + *n; - add_timer(t); + add_timer_on(t, smp_processor_id()); } static void mce_do_trigger(struct work_struct *work) @@ -1321,7 +1321,7 @@ static void mce_init_timer(void) return; setup_timer(t, mcheck_timer, smp_processor_id()); t->expires = round_jiffies(jiffies + *n); - add_timer(t); + add_timer_on(t, smp_processor_id()); } /* -- 1.6.3
| |