@@ -72,14 +72,23 @@ static int cpu_on_ret[NR_CPUS];
static cpumask_t cpu_on_ready, cpu_on_done;
static volatile int cpu_on_start;
-static void cpu_on_secondary_entry(void)
+extern void secondary_entry(void);
+static void cpu_on_wake_target(void)
{
int cpu = smp_processor_id();
cpumask_set_cpu(cpu, &cpu_on_ready);
while (!cpu_on_start)
cpu_relax();
- cpu_on_ret[cpu] = psci_cpu_on(cpus[1], __pa(halt));
+ cpu_on_ret[cpu] = psci_cpu_on(cpus[1], __pa(secondary_entry));
+ cpumask_set_cpu(cpu, &cpu_on_done);
+}
+
+static void cpu_on_target(void)
+{
+ int cpu = smp_processor_id();
+
+ cpu_on_ret[cpu] = PSCI_RET_ALREADY_ON;
cpumask_set_cpu(cpu, &cpu_on_done);
}
@@ -89,31 +98,34 @@ static bool psci_cpu_on_test(void)
int ret_success = 0;
int cpu;
- cpumask_set_cpu(1, &cpu_on_ready);
- cpumask_set_cpu(1, &cpu_on_done);
-
for_each_present_cpu(cpu) {
if (cpu < 2)
continue;
- smp_boot_secondary(cpu, cpu_on_secondary_entry);
+ smp_boot_secondary(cpu, cpu_on_wake_target);
}
cpumask_set_cpu(0, &cpu_on_ready);
+ cpumask_set_cpu(1, &cpu_on_ready);
while (!cpumask_full(&cpu_on_ready))
cpu_relax();
+ /*
+ * Wait for all other CPUs to be online before configuring the thread
+ * for the target CPU, as all secondaries are set up using the same
+ * global variable.
+ */
+ smp_prepare_secondary(1, cpu_on_target);
+
cpu_on_start = 1;
smp_mb();
- cpu_on_ret[0] = psci_cpu_on(cpus[1], __pa(halt));
+ cpu_on_ret[0] = psci_cpu_on(cpus[1], __pa(secondary_entry));
cpumask_set_cpu(0, &cpu_on_done);
while (!cpumask_full(&cpu_on_done))
cpu_relax();
for_each_present_cpu(cpu) {
- if (cpu == 1)
- continue;
if (cpu_on_ret[cpu] == PSCI_RET_SUCCESS) {
ret_success++;
} else if (cpu_on_ret[cpu] != PSCI_RET_ALREADY_ON) {
@@ -49,6 +49,7 @@ static inline void set_cpu_idle(int cpu, bool idle)
}
typedef void (*secondary_entry_fn)(void);
+extern void smp_prepare_secondary(int cpu, secondary_entry_fn entry);
extern void smp_boot_secondary(int cpu, secondary_entry_fn entry);
extern void on_cpu_async(int cpu, void (*func)(void *data), void *data);
extern void on_cpu(int cpu, void (*func)(void *data), void *data);
@@ -58,13 +58,19 @@ secondary_entry_fn secondary_cinit(void)
return entry;
}
-static void __smp_boot_secondary(int cpu, secondary_entry_fn entry)
+void smp_prepare_secondary(int cpu, secondary_entry_fn entry)
{
- int ret;
-
secondary_data.stack = thread_stack_alloc();
secondary_data.entry = entry;
mmu_mark_disabled(cpu);
+}
+
+static void __smp_boot_secondary(int cpu, secondary_entry_fn entry)
+{
+ int ret;
+
+ smp_prepare_secondary(cpu, entry);
+
ret = cpu_psci_cpu_boot(cpu);
assert(ret == 0);
For the PSCI CPU_ON function test, all other CPUs perform a CPU_ON call that target CPU 1. The test is considered a success if CPU_ON returns SUCCESS exactly once, and for the rest of the calls ALREADY_ON. Enhance the test by making sure that CPU 1 is actually online and able to execute code. Since the CPU 1 thread is now being set up properly by kvm-unit-tests when being brought online, it becomes possible to add other tests in the future that require all CPUs. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- I got the idea for this patch when reviewing the CPU_OFF test [1]. Nonetheless, I think this patch has merit on its own. [1] https://lore.kernel.org/kvm/20220805132601.461751-1-Nikita.Venkatesh@arm.com/ arm/psci.c | 30 +++++++++++++++++++++--------- lib/arm/asm/smp.h | 1 + lib/arm/smp.c | 12 +++++++++--- 3 files changed, 31 insertions(+), 12 deletions(-)