From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753821AbbEAPPz (ORCPT ); Fri, 1 May 2015 11:15:55 -0400 Received: from e31.co.us.ibm.com ([32.97.110.149]:40175 "EHLO e31.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753345AbbEAPPx (ORCPT ); Fri, 1 May 2015 11:15:53 -0400 Date: Fri, 1 May 2015 08:08:48 -0700 From: "Paul E. McKenney" To: Catalin Marinas Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, mingo@kernel.org, will.deacon@arm.com Subject: Re: [PATCH arm 1/2] arm64: Use common outgoing-CPU-notification code Message-ID: <20150501150848.GC5381@linux.vnet.ibm.com> Reply-To: paulmck@linux.vnet.ibm.com References: <20150423200603.GA9473@linux.vnet.ibm.com> <1429819654-10498-1-git-send-email-paulmck@linux.vnet.ibm.com> <20150430095055.GI18867@e104818-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150430095055.GI18867@e104818-lin.cambridge.arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15050115-8236-0000-0000-00000B2951F4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 30, 2015 at 10:50:55AM +0100, Catalin Marinas wrote: > Hi Paul, > > On Thu, Apr 23, 2015 at 01:07:33PM -0700, Paul E. McKenney wrote: > > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > > index 328b8ce4b007..6dc727a6e73e 100644 > > --- a/arch/arm64/kernel/smp.c > > +++ b/arch/arm64/kernel/smp.c > > @@ -252,15 +252,13 @@ static int op_cpu_kill(unsigned int cpu) > > return cpu_ops[cpu]->cpu_kill(cpu); > > } > > > > -static DECLARE_COMPLETION(cpu_died); > > - > > /* > > * called on the thread which is asking for a CPU to be shutdown - > > * waits until shutdown has completed, or it is timed out. > > */ > > void __cpu_die(unsigned int cpu) > > { > > - if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { > > + if (!cpu_wait_death(cpu, 5)) { > > pr_crit("CPU%u: cpu didn't die\n", cpu); > > return; > > } > > @@ -293,7 +291,7 @@ void cpu_die(void) > > local_irq_disable(); > > > > /* Tell __cpu_die() that this CPU is now safe to dispose of */ > > - complete(&cpu_died); > > + (void)cpu_report_death(); > > > > /* > > * Actually shutdown the CPU. This must never fail. The specific hotplug > > Are these functions are only defined when HOTPLUG_CPU is enabled? On > arm64 we can end up with this option disabled if SUSPEND is disabled. Yep, only with HOTPLUG_CPU. And yes, both SUSPEND and HIBERNATION can force HOTPLUG_CPU, so if you have neiter SUSPEND nor HIBERNATION, you won't have HOTPLUG_CPU. This -should- be OK, because you should also not have __cpu_die() if !HOTPLUG_CPU. Or am I missing your point? Thanx, Paul