Message ID | 1431945503-6939-4-git-send-email-mark.rutland@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, May 18, 2015 at 11:38:14AM +0100, Mark Rutland wrote: > cpu_kill currently returns one for success and zero for failure, which > is unlike all the other cpu_operations, which return zero for success > and an error code upon failure. This difference is unnecessarily > confusing. > > Make cpu_kill consistent with the other cpu_operations. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
On 2015?05?18? 18:38, Mark Rutland wrote: > cpu_kill currently returns one for success and zero for failure, which > is unlike all the other cpu_operations, which return zero for success > and an error code upon failure. This difference is unnecessarily > confusing. > > Make cpu_kill consistent with the other cpu_operations. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > --- > arch/arm64/kernel/psci.c | 7 +++---- > arch/arm64/kernel/smp.c | 10 +++++++--- > 2 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c > index ea18cb5..10fa25e 100644 > --- a/arch/arm64/kernel/psci.c > +++ b/arch/arm64/kernel/psci.c > @@ -498,7 +498,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) > int err, i; > > if (!psci_ops.affinity_info) > - return 1; > + return 0; > /* > * cpu_kill could race with cpu_die and we can > * potentially end up declaring this cpu undead > @@ -509,7 +509,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) > err = psci_ops.affinity_info(cpu_logical_map(cpu), 0); > if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) { > pr_info("CPU%d killed.\n", cpu); > - return 1; > + return 0; > } > > msleep(10); > @@ -518,8 +518,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) > > pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n", > cpu, err); > - /* Make op_cpu_kill() fail. */ > - return 0; > + return -ETIMEDOUT; > } > #endif > #endif > diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c > index 2cb0081..3799df2 100644 > --- a/arch/arm64/kernel/smp.c > +++ b/arch/arm64/kernel/smp.c > @@ -248,7 +248,7 @@ static int op_cpu_kill(unsigned int cpu) > * time and hope that it's dead, so let's skip the wait and just hope. > */ > if (!cpu_ops[cpu]->cpu_kill) > - return 1; > + return 0; > > return cpu_ops[cpu]->cpu_kill(cpu); > } > @@ -261,6 +261,8 @@ static DECLARE_COMPLETION(cpu_died); > */ > void __cpu_die(unsigned int cpu) > { > + int err; > + > if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { > pr_crit("CPU%u: cpu didn't die\n", cpu); > return; > @@ -273,8 +275,10 @@ void __cpu_die(unsigned int cpu) > * verify that it has really left the kernel before we consider > * clobbering anything it might still be using. > */ > - if (!op_cpu_kill(cpu)) > - pr_warn("CPU%d may not have shut down cleanly\n", cpu); > + err = op_cpu_kill(cpu); > + if (err) > + pr_warn("CPU%d may not have shut down cleanly: %d\n", > + cpu, err); > } Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Thanks Hanjun
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index ea18cb5..10fa25e 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -498,7 +498,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) int err, i; if (!psci_ops.affinity_info) - return 1; + return 0; /* * cpu_kill could race with cpu_die and we can * potentially end up declaring this cpu undead @@ -509,7 +509,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) err = psci_ops.affinity_info(cpu_logical_map(cpu), 0); if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) { pr_info("CPU%d killed.\n", cpu); - return 1; + return 0; } msleep(10); @@ -518,8 +518,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n", cpu, err); - /* Make op_cpu_kill() fail. */ - return 0; + return -ETIMEDOUT; } #endif #endif diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 2cb0081..3799df2 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -248,7 +248,7 @@ static int op_cpu_kill(unsigned int cpu) * time and hope that it's dead, so let's skip the wait and just hope. */ if (!cpu_ops[cpu]->cpu_kill) - return 1; + return 0; return cpu_ops[cpu]->cpu_kill(cpu); } @@ -261,6 +261,8 @@ static DECLARE_COMPLETION(cpu_died); */ void __cpu_die(unsigned int cpu) { + int err; + if (!wait_for_completion_timeout(&cpu_died, msecs_to_jiffies(5000))) { pr_crit("CPU%u: cpu didn't die\n", cpu); return; @@ -273,8 +275,10 @@ void __cpu_die(unsigned int cpu) * verify that it has really left the kernel before we consider * clobbering anything it might still be using. */ - if (!op_cpu_kill(cpu)) - pr_warn("CPU%d may not have shut down cleanly\n", cpu); + err = op_cpu_kill(cpu); + if (err) + pr_warn("CPU%d may not have shut down cleanly: %d\n", + cpu, err); } /*