From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755347Ab3KEU3j (ORCPT ); Tue, 5 Nov 2013 15:29:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3722 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754728Ab3KEU3i (ORCPT ); Tue, 5 Nov 2013 15:29:38 -0500 Date: Tue, 5 Nov 2013 15:28:56 -0500 From: Vivek Goyal To: Baoquan He Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, akpm@linux-foundation.org, holt@sgi.com, davej@fedoraproject.org, rmk+kernel@arm.linux.org.uk, chaowang@redhat.com, mwhitehe@redhat.com, kexec@lists.infradead.org Subject: Re: [PATCH] x86: make reboot task only run on the appropriate processor Message-ID: <20131105202855.GD4598@redhat.com> References: <1383642967-12595-1-git-send-email-bhe@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1383642967-12595-1-git-send-email-bhe@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 05, 2013 at 05:16:07PM +0800, Baoquan He wrote: > Currently system always reboot after below message when execute "kexec -e". > > [ 0.572119] smpboot: Booting Node 0, Processors # 1 OK > So is it same problem were we reboot on non-boot cpu and sending INIT to boot cpu in second kernel brings down the machine? I think for x86, it makes sense to reboot on boot cpu. Thanks Vivek > In commit 1b3a5d02ee070c8f9943333b9b6370f486601e0f, reboot= handling was > moved to kerne/reboot.c. However, the code to migrate current thread to > reboot cpu was removed. That cause this incorrect kexec behavior. > > Now add that code block back. > > Reported-by: Matthew Whitehead > Reported-by: Dave Young > Tested-by: WANG Chao > Signed-off-by: Baoquan He > --- > arch/x86/kernel/reboot.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c > index 7e920bf..3049de9 100644 > --- a/arch/x86/kernel/reboot.c > +++ b/arch/x86/kernel/reboot.c > @@ -551,6 +551,21 @@ void native_machine_shutdown(void) > { > /* Stop the cpus and apics */ > #ifdef CONFIG_SMP > + /* The boot cpu is always logical cpu 0 */ > + int reboot_cpu_id = 0; > + > + /* See if there has been given a command line override */ > + if ((reboot_cpu != -1) && (reboot_cpu < nr_cpu_ids) && > + cpu_online(reboot_cpu)) > + reboot_cpu_id = reboot_cpu; > + > + /* Make certain the cpu I'm about to reboot on is online */ > + if (!cpu_online(reboot_cpu_id)) > + reboot_cpu_id = smp_processor_id(); > + > + /* Make certain I only run on the appropriate processor */ > + set_cpus_allowed_ptr(current, cpumask_of(reboot_cpu_id)); > + > /* > * Stop all of the others. Also disable the local irq to > * not receive the per-cpu timer interrupt which may trigger > -- > 1.8.3.1