Patchwork 2.6.30-git(16 and 17) system hangs after resume from suspend to disk, mce related?

login
register
mail settings
Submitter Hidetoshi Seto
Date June 24, 2009, 12:21 a.m.
Message ID <4A417176.40008@jp.fujitsu.com>
Download mbox | patch
Permalink /patch/32062/
State New, archived
Headers show

Comments

Hidetoshi Seto - June 24, 2009, 12:21 a.m.
Peter, could you put this patch into urgent too? 

Thanks,
H.Seto

--
1.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Andi Kleen - June 24, 2009, 6:17 a.m.
Hidetoshi Seto wrote:
> Peter, could you put this patch into urgent too? 

Acked-by: Andi Kleen <ak@linux.intel.com> too

(BTW that is needed in interaction with the new timer migration code
that was merged into .31; .30 based kernels don't need it)

-Andi

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Maciej Rutecki - June 25, 2009, 3:53 p.m.
2009/6/24 Andi Kleen <ak@linux.intel.com>:
> Hidetoshi Seto wrote:
>>
>> Peter, could you put this patch into urgent too?
>
> Acked-by: Andi Kleen <ak@linux.intel.com> too
>
> (BTW that is needed in interaction with the new timer migration code
> that was merged into .31; .30 based kernels don't need it)
>
> -Andi
>
>

Are this patches was added to -rc1?
H. Peter Anvin - June 25, 2009, 4:20 p.m.
Maciej Rutecki wrote:
> 
> Are this patches was added to -rc1?
> 

No, but they're in our push queue.  Since they're bug fixes they will be
pushed after we have run tests on them.

	-hpa

Patch

===

[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 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>
Tested-by Maciej Rutecki <maciej.rutecki@gmail.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());
 }
 
 /*