Hi Ashwin,
This looks mostly good to me, with a couple of issues below.
On Wed, May 07, 2014 at 03:27:27PM +0100, Ashwin Chaugule wrote:
PSCIv0.2 adds a new function called AFFINITY_INFO, which can be used to query if a specified CPU has actually gone offline. Calling this function via cpu_kill ensures that a CPU has quiesced after a call to cpu_die.
Signed-off-by: Ashwin Chaugule ashwin.chaugule@linaro.org Reviewed-by: Rob Herring robh@kernel.org
arch/arm/kernel/psci_smp.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
[...]
+int __ref psci_cpu_kill(unsigned int cpu) +{
- int err, i;
- if (!psci_ops.affinity_info)
return 1;- /*
* cpu_kill could race with cpu_die and we can* potentially end up declaring this cpu undead* while it is dying. So, try again a few times.*/- for (i=0; i<10; i++) {
Nit: please place spaces around the binary operators:
for (i = 0; i < 10; i++) {
err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);if (err == PSCI_0_2_AFFINITY_LEVEL_OFF)return 1;msleep(10);pr_info("Retrying again to check for CPU kill\n");
I don't think we need to print on each iteration -- that's going to spam the log if we race and/or slow things down.
- }
- pr_err("psci: Cannot kill CPU:%d, psci ret val: %d\n",
cpu, err);
This message might be a little confusing as we're testing that the CPU is dead rather than explicitly killing it. The "psci:" prefix is redundant thanks to pr_fmt and CPU:%d is a little odd.
How about:
pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n", cpu, err);
- /* Make platform_cpu_kill() fail. */
- return 0;
+}
[...]
Could you implement this for arm64 as well? We don't currently have a cpu_kill callback on cpu_operations, but the (compile-tested only) patch below should remedy that.
Cheers, Mark.
---->8----
From 8f81dc38a7a2b7b61165d350dff5cdcaa7248081 Mon Sep 17 00:00:00 2001
From: Mark Rutland mark.rutland@arm.com Date: Mon, 12 May 2014 10:39:07 +0100 Subject: [PATCH] arm64: cpu_ops: add cpu_kill callback
Currently there is a window between a CPU announcing that it is dead and said CPU leaving the kernel. If data or instructions are clobbered (as happens on a kexec) within this window the CPU might begin doing arbitrary bad things.
In some of these cases (e.g. on those platforms with PSCI 0.2) we can query the firmware to discover when the CPU has really left the kernel, closing the race.
This patch adds a cpu_kill callback for use in those cases, which may bew used to synchronise with the dying CPU.
Signed-off-by: Mark Rutland mark.rutland@arm.com --- arch/arm64/include/asm/cpu_ops.h | 2 ++ arch/arm64/kernel/smp.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+)
diff --git a/arch/arm64/include/asm/cpu_ops.h b/arch/arm64/include/asm/cpu_ops.h index 1524130..c7c7442 100644 --- a/arch/arm64/include/asm/cpu_ops.h +++ b/arch/arm64/include/asm/cpu_ops.h @@ -39,6 +39,7 @@ struct device_node; * from the cpu to be killed. * @cpu_die: Makes a cpu leave the kernel. Must not fail. Called from the * cpu being killed. + * @cpu_kill: Ensures a cpu has left the kernel. Called from another cpu. * @cpu_suspend: Suspends a cpu and saves the required context. May fail owing * to wrong parameters or error conditions. Called from the * CPU being suspended. Must be called with IRQs disabled. @@ -52,6 +53,7 @@ struct cpu_operations { #ifdef CONFIG_HOTPLUG_CPU int (*cpu_disable)(unsigned int cpu); void (*cpu_die)(unsigned int cpu); + int (*cpu_kill)(unsigned int cpu); #endif #ifdef CONFIG_ARM64_CPU_SUSPEND int (*cpu_suspend)(unsigned long); diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 7cfb92a..4844628 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -220,6 +220,19 @@ int __cpu_disable(void) return 0; }
+static int op_cpu_kill(unsigned int cpu) +{ + /* + * If we have no means of synchronising with the dying CPU, then assume + * that it is really dead. We can only wait for an arbitrary length of + * time and hope that it's dead, so let's skip the wait and just hope. + */ + if (!cpu_ops[cpu]->cpu_kill) + return 0; + + return cpu_ops[cpu]->cpu_kill(cpu); +} + static DECLARE_COMPLETION(cpu_died);
/* @@ -233,6 +246,15 @@ void __cpu_die(unsigned int cpu) return; } pr_notice("CPU%u: shutdown\n", cpu); + + /* + * Now that the dying CPU is beyond the point of no return w.r.t. + * in-kernel synchronisation, try to get the firwmare to help us to + * 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); }
/*