Re: [tip:x86/debug] x86, reboot: Use NMI instead of REBOOT_VECTOR to stop cpus

[Don Zickus <dzickus@redhat.com>]

On Wed, Dec 21, 2011 at 10:24:53AM -0800, Yinghai Lu wrote:
> On Wed, Dec 21, 2011 at 6:59 AM, Don Zickus <dzickus@redhat.com> wrote:
> > On Tue, Dec 20, 2011 at 02:38:39PM -0800, Yinghai Lu wrote:
> >> > @@ -230,7 +285,7 @@ struct smp_ops smp_ops = {
> >> >        .smp_prepare_cpus       = native_smp_prepare_cpus,
> >> >        .smp_cpus_done          = native_smp_cpus_done,
> >> >
> >> > -       .stop_other_cpus        = native_stop_other_cpus,
> >> > +       .stop_other_cpus        = native_nmi_stop_other_cpus,
> >> >        .smp_send_reschedule    = native_smp_send_reschedule,
> >> >
> >> >        .cpu_up                 = native_cpu_up,
> >>
> >> this broke kexec on our intel nehalem, westmere and sandbridge platforms.
> >> system get reset while try to kexec second kernel.
> >
> >
> > Hmm. Ok.  Does the reboot path work correctly?
> 
> Yes.
> 
> > Vivek showed me that the
> > kexec and reboot paths do the same shutdowns.  Perhaps the second kernel
> > has trouble dealing with cpus spinning in an NMI context and can't
> > properly reset them.
> 
> not sure.
> when use nonmi_ipi in first kernel, it will work well.

Hi Yinghai,

Sorry for the delay.  I figured out the problem, one of those brown paper
bag moments. :-(

I think this patch should fix your issue (it did on my system).

--->8----
From: Don Zickus <dzickus@redhat.com>
Date: Thu, 5 Jan 2012 13:06:58 -0500
Subject: [PATCH] x86, reboot: typo in nmi reboot path

It was brought to my attention that my x86 change to use NMI in the
reboot path broke Intel Nehalem and Westmere boxes when using kexec.

I realized I had mistyped the if statement in commit
3603a2512f9e69dc87914ba922eb4a0812b21cd6 and stuck the ')' in
the wrong spot.  Putting it in the right spot fixes kexec again.

Doh.

Reported-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Don Zickus <dzickus@redhat.com>
---
 arch/x86/kernel/smp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index e72b175..3f3d3f0 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -176,7 +176,7 @@ static void native_nmi_stop_other_cpus(int wait)
 	 */
 	if (num_online_cpus() > 1) {
 		/* did someone beat us here? */
-		if (atomic_cmpxchg(&stopping_cpu, -1, safe_smp_processor_id() != -1))
+		if (atomic_cmpxchg(&stopping_cpu, -1, safe_smp_processor_id()) != -1)
 			return;
 
 		if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,
-- 
1.7.7.4