2017-02-27 18:32+0100, Andrew Jones:
> From: Levente Kurusa <lkurusa@xxxxxxxxxx>
>
> The cpu_on test exposed two races in KVM's PSCI emulation.
>
> Signed-off-by: Levente Kurusa <lkurusa@xxxxxxxxxx>
> [Rewrote the cpu_on test to improve the chance of hitting the race.
> Also added affinity-info tests and made some minor cleanups. -drew]
> Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
> ---
> arm/Makefile.common | 1 +
> arm/psci.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> arm/unittests.cfg | 6 +++
> 3 files changed, 119 insertions(+)
> create mode 100644 arm/psci.c
>
> diff --git a/arm/Makefile.common b/arm/Makefile.common
> index f7193c3e6d64..74c7394eb7c1 100644
> --- a/arm/Makefile.common
> +++ b/arm/Makefile.common
> @@ -14,6 +14,7 @@ tests-common += $(TEST_DIR)/spinlock-test.flat
> tests-common += $(TEST_DIR)/pci-test.flat
> tests-common += $(TEST_DIR)/pmu.flat
> tests-common += $(TEST_DIR)/gic.flat
> +tests-common += $(TEST_DIR)/psci.flat
>
> tests-all = $(tests-common) $(tests)
> all: $(tests-all)
> diff --git a/arm/psci.c b/arm/psci.c
> new file mode 100644
> index 000000000000..e571afb92c7e
> --- /dev/null
> +++ b/arm/psci.c
> @@ -0,0 +1,112 @@
> +/*
> + * PSCI tests
> + *
> + * Copyright (C) 2017, Red Hat, Inc.
> + * Author: Levente Kurusa <lkurusa@xxxxxxxxxx>
> + * Author: Andrew Jones <drjones@xxxxxxxxxx>
> + *
> + * This work is licensed under the terms of the GNU LGPL, version 2.
> + */
> +#include <libcflat.h>
> +#include <asm/smp.h>
> +#include <asm/psci.h>
> +
> +static bool psci_invalid_function(void)
> +{
> + return psci_invoke(1337, 0, 0, 0) == PSCI_RET_NOT_SUPPORTED;
> +}
> +
> +static int psci_affinity_info(unsigned long target_affinity, uint32_t lowest_affinity_level)
> +{
> +#ifdef __arm__
> + return psci_invoke(PSCI_0_2_FN_AFFINITY_INFO, target_affinity, lowest_affinity_level, 0);
> +#else
> + return psci_invoke(PSCI_0_2_FN64_AFFINITY_INFO, target_affinity, lowest_affinity_level, 0);
> +#endif
> +}
> +
> +static bool psci_affinity_info_on(void)
> +{
> + return psci_affinity_info(cpus[0], 0) == PSCI_0_2_AFFINITY_LEVEL_ON;
> +}
> +
> +static bool psci_affinity_info_off(void)
> +{
> + return psci_affinity_info(cpus[1], 0) == PSCI_0_2_AFFINITY_LEVEL_OFF;
Please check that smp > 1 here
> +}
> +
> +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)
> +{
> + 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));
> + cpumask_set_cpu(cpu, &cpu_on_done);
> + halt();
> +}
> +
> +static bool psci_cpu_on_test(void)
> +{
> + bool failed = false;
> + int cpu;
and here too.
Thanks.
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
