On Wed, Jan 31, 2018 at 06:27:58PM +0000, Suzuki K Poulose wrote:
> The kernel detects and uses some of the features based on the boot
> CPU and expects that all the following CPUs conform to it. e.g,
> with VHE and the boot CPU running at EL2, the kernel decides to
> keep the kernel running at EL2. If another CPU is brought up without
> this capability, we use custom hooks (via check_early_cpu_features())
> to handle it. To handle such capabilities add support for detecting
> and enabling capabilities based on the boot CPU.
>
> A bit is added to indicate if the capability should be detected
> early on the boot CPU. The infrastructure then ensures that such
> capabilities are probed and "enabled" early on in the boot CPU
> and, enabled on the subsequent CPUs.
>
> Cc: Julien Thierry <julien.thie...@arm.com>
> Cc: Dave Martin <dave.mar...@arm.com>
> Cc: Will Deacon <will.dea...@arm.com>
> Cc: Mark Rutland <mark.rutl...@arm.com>
> Cc: Marc Zyngier <marc.zyng...@arm.com>
> Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
> ---
> arch/arm64/include/asm/cpufeature.h | 48
> +++++++++++++++++++++++++++++--------
> arch/arm64/kernel/cpufeature.c | 48
> +++++++++++++++++++++++++++----------
> 2 files changed, 74 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm64/include/asm/cpufeature.h
> b/arch/arm64/include/asm/cpufeature.h
> index 71993dd4afae..04161aac0f06 100644
> --- a/arch/arm64/include/asm/cpufeature.h
> +++ b/arch/arm64/include/asm/cpufeature.h
> @@ -104,7 +104,7 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
> * some checks at runtime. This could be, e.g, checking the value of a
> field
> * in CPU ID feature register or checking the cpu model. The capability
> * provides a call back ( @matches() ) to perform the check.
> - * Scope defines how the checks should be performed. There are two cases:
> + * Scope defines how the checks should be performed. There are three
> cases:
> *
> * a) SCOPE_LOCAL_CPU: check all the CPUs and "detect" if at least one
> * matches. This implies, we have to run the check on all the booting
> @@ -117,6 +117,11 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
> * field in one of the CPU ID feature registers, we use the sanitised
> * value of the register from the CPU feature infrastructure to make
> * the decision.
> + * Or
> + * c) SCOPE_BOOT_CPU: Check only on the primary boot CPU to detect the
> feature.
> + * This category is for features that are "finalised" (or used) by
> the kernel
> + * very early even before the SMP cpus are brought up.
> + *
> * The process of detection is usually denoted by "update" capability
> state
> * in the code.
> *
> @@ -129,6 +134,10 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
> * EL2 with Virtualisation Host Extensions). The kernel usually disallows
> * any changes to the state of a capability once it finalises the
> capability
> * and takes any action, as it may be impossible to execute the actions
> safely.
> + * At the moment there are two passes of finalising the capabilities.
> + * a) Boot CPU scope capabilities - Finalised by primary boot CPU via
> + * setup_boot_cpu_capabilities().
> + * b) Everything except (a) - Run via setup_system_capabilities().
> *
> * 3) Verification: When a CPU is brought online (e.g, by user or by the
> kernel),
> * the kernel should make sure that it is safe to use the CPU, by
> verifying
> @@ -139,11 +148,22 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
> *
> * As explained in (2) above, capabilities could be finalised at different
> * points in the execution. Each CPU is verified against the "finalised"
> - * capabilities and if there is a conflict, the kernel takes an action,
> based
> - * on the severity (e.g, a CPU could be prevented from booting or cause a
> - * kernel panic). The CPU is allowed to "affect" the state of the
> capability,
> - * if it has not been finalised already. See section 5 for more details on
> - * conflicts.
> + * capabilities.
> + *
> + * x------------------------------------------------------------------- x
> + * | Verification: | Boot CPU | SMP CPUs by kernel | CPUs by user |
> + * |--------------------------------------------------------------------|
> + * | Primary boot CPU | | | |
> + * | capability | n | y | y |
> + * |--------------------------------------------------------------------|
> + * | All others | n | n | y |
> + * x--------------------------------------------------------------------x
Minor clarify nit: it's not obvious that "n" means "no conflict" and "y"
means "conflict".
Could we have blank cell versus "X" (with a note saying what that
means), or "ok" versus "CONFLICT"?
> + *
> + *
> + * If there is a conflict, the kernel takes an action, based on the
> severity
> + * (e.g, a CPU could be prevented from booting or cause a kernel panic).
> + * The CPU is allowed to "affect" the state of the capability, if it has
> not
> + * been finalised already. See section 5 for more details on conflicts.
> *
> * 4) Action: As mentioned in (2), the kernel can take an action for each
> detected
> * capability, on all CPUs on the system. This is always initiated only
> after
> @@ -186,20 +206,28 @@ extern struct arm64_ftr_reg arm64_ftr_reg_ctrel0;
> */
>
>
> -/* Decide how the capability is detected. On a local CPU vs System wide */
> -#define ARM64_CPUCAP_SCOPE_MASK 0x3
> +/*
> + * Decide how the capability is detected.
> + * On any local CPU vs System wide vs the primary boot CPU
> + */
> +#define ARM64_CPUCAP_SCOPE_MASK 0x7
Minor nit: magic number. Could we do
#define ARM64_CPUCAP_SCOPE_MASK \
(ARM64_CPUCAP_SCOPE_LOCAL_CPU | \
ARM64_CPUCAP_SCOPE_SYSTEM | \
ARM64_CPUCAP_SCOPE_BOOT_CPU)
below?
> #define ARM64_CPUCAP_SCOPE_LOCAL_CPU ((u16)BIT(0))
> #define ARM64_CPUCAP_SCOPE_SYSTEM ((u16)BIT(1))
> +/*
> + * The capabilitiy is detected on the Boot CPU and is used by kernel
> + * during early boot. i.e, the capability should be "detected" and "enabled"
> + * as early as possibly on all booting CPUs.
> + */
> +#define ARM64_CPUCAP_SCOPE_BOOT_CPU ((u16)BIT(2))
> #define SCOPE_SYSTEM ARM64_CPUCAP_SCOPE_SYSTEM
> #define SCOPE_LOCAL_CPU
> ARM64_CPUCAP_SCOPE_LOCAL_CPU
> +#define SCOPE_BOOT_CPU
> ARM64_CPUCAP_SCOPE_BOOT_CPU
>
> /* Is it permitted for a late CPU to have this capability when system
> doesn't already have */
> #define ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU ((u16)BIT(4))
> /* Is it safe for a late CPU to miss this capability when system has it */
> #define ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU ((u16)BIT(5))
>
> -#define ARM64_CPUCAP_SCOPE_ALL \
> - (ARM64_CPUCAP_SCOPE_LOCAL_CPU | ARM64_CPUCAP_SCOPE_SYSTEM)
> /*
> * CPU errata detected at boot time based on feature of one or more CPUs.
> * It is not safe for a late CPU to have this feature when the system doesn't
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index 4a55492784b7..6d759f068de1 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -504,7 +504,7 @@ static void __init init_cpu_ftr_reg(u32 sys_reg, u64 new)
> }
>
> extern const struct arm64_cpu_capabilities arm64_errata[];
> -static void update_cpu_local_capabilities(void);
> +static void __init setup_boot_cpu_capabilities(void);
>
> void __init init_cpu_features(struct cpuinfo_arm64 *info)
> {
> @@ -550,10 +550,10 @@ void __init init_cpu_features(struct cpuinfo_arm64
> *info)
> }
>
> /*
> - * Run the errata work around checks on the boot CPU, once we have
> - * initialised the cpu feature infrastructure.
> + * Detect and enable early CPU features based on the boot CPU, after
> + * we have initialised the CPU feature infrastructure.
> */
> - update_cpu_local_capabilities();
> + setup_boot_cpu_capabilities();
> }
>
> static void update_cpu_ftr_reg(struct arm64_ftr_reg *reg, u64 new)
> @@ -1235,12 +1235,21 @@ __enable_cpu_capabilities(const struct
> arm64_cpu_capabilities *caps, u16 scope_m
>
> if (caps->cpu_enable) {
> /*
> - * Use stop_machine() as it schedules the work allowing
> - * us to modify PSTATE, instead of on_each_cpu() which
> - * uses an IPI, giving us a PSTATE that disappears when
> - * we return.
> + * If we are dealing with EARLY detected features, we
> + * have to enable this only on the Boot CPU, where it
> + * is detected. All the secondaries enable it via
> + * verify_early_cpu_capabilities().
> + *
> + * Otherwise, use stop_machine() as it schedules the
> + * work allowing us to modify PSTATE, instead of
> + * on_each_cpu() which uses an IPI, giving us a PSTATE
> + * that disappears when we return.
> */
> - stop_machine(__enable_cpu_capability, (void *)caps,
> cpu_online_mask);
> + if (scope_mask & ARM64_CPUCAP_SCOPE_BOOT_CPU)
> + caps->cpu_enable(caps);
> + else
> + stop_machine(__enable_cpu_capability,
> + (void *)caps, cpu_online_mask);
> }
> }
> }
> @@ -1315,6 +1324,12 @@ static void check_early_cpu_features(void)
> {
> verify_cpu_run_el();
> verify_cpu_asid_bits();
> + /*
> + * Early features are used by the kernel already. If there
> + * is a conflict, we cannot proceed further.
> + */
> + if (!verify_local_cpu_caps(ARM64_CPUCAP_SCOPE_BOOT_CPU))
> + cpu_panic_kernel();
> }
>
> static void
> @@ -1381,7 +1396,7 @@ static void enable_cpu_capabilities(u16 scope_mask)
> */
> static void verify_local_cpu_capabilities(void)
> {
> - if (!verify_local_cpu_caps(ARM64_CPUCAP_SCOPE_ALL))
> + if (!verify_local_cpu_caps(~ARM64_CPUCAP_SCOPE_BOOT_CPU))
[1] This is neat, but would it be clearer to say _ALL & ~_BOOT_CPU?
Otherwise, this is passing (u16)0xfffb, which feels invalid,
particularly since it includes _{PERMITTED,OPTIONAL}_FOR_LATE_CPU which
don't make sense here, even if we know they get masked off.
There could be future pitfalls here if ~_BOOT_CPU by itself is pasted
in other places where the *_FOR_LATE_CPU bits are significant.
> cpu_die_early();
> verify_local_elf_hwcaps(arm64_elf_hwcaps);
>
> @@ -1415,6 +1430,15 @@ void check_local_cpu_capabilities(void)
> verify_local_cpu_capabilities();
> }
>
> +static void __init setup_boot_cpu_capabilities(void)
> +{
> + /* Detect capabilities with either SCOPE_BOOT_CPU or SCOPE_LOCAL_CPU */
> + update_cpu_capabilities(ARM64_CPUCAP_SCOPE_BOOT_CPU |
> + ARM64_CPUCAP_SCOPE_LOCAL_CPU);
> + /* Enable the SCOPE_BOOT_CPU capabilities alone right away */
> + enable_cpu_capabilities(ARM64_CPUCAP_SCOPE_BOOT_CPU);
> +}
> +
> static void __init setup_system_capabilities(void)
> {
> /*
> @@ -1422,8 +1446,8 @@ static void __init setup_system_capabilities(void)
> * finalise the capabilities that depend on it.
> */
> update_system_capabilities();
> - /* Enable all the available capabilities */
> - enable_cpu_capabilities(ARM64_CPUCAP_SCOPE_ALL);
> + /* Enable all the available capabilities, which are not already
> enabled. */
> + enable_cpu_capabilities(~ARM64_CPUCAP_SCOPE_BOOT_CPU);
As [1] above.
Cheers
---Dave
