• Mark Rutland's avatar
    arm64: Avoid cpus_have_const_cap() for ARM64_HAS_DIT · 25693f17
    Mark Rutland authored
    In __cpu_suspend_exit() we use cpus_have_const_cap() to check for
    ARM64_HAS_DIT but this is not necessary and cpus_have_final_cap() of
    alternative_has_cap_*() would be preferable.
    
    For historical reasons, cpus_have_const_cap() is more complicated than
    it needs to be. Before cpucaps are finalized, it will perform a bitmap
    test of the system_cpucaps bitmap, and once cpucaps are finalized it
    will use an alternative branch. This used to be necessary to handle some
    race conditions in the window between cpucap detection and the
    subsequent patching of alternatives and static branches, where different
    branches could be out-of-sync with one another (or w.r.t. alternative
    sequences). Now that we use alternative branches instead of static
    branches, these are all patched atomically w.r.t. one another, and there
    are only a handful of cases that need special care in the window between
    cpucap detection and alternative patching.
    
    Due to the above, it would be nice to remove cpus_have_const_cap(), and
    migrate callers over to alternative_has_cap_*(), cpus_have_final_cap(),
    or cpus_have_cap() depending on when their requirements. This will
    remove redundant instructions and improve code generation, and will make
    it easier to determine how each callsite will behave before, during, and
    after alternative patching.
    
    The ARM64_HAS_DIT cpucap is detected and patched (along with all other
    cpucaps) before __cpu_suspend_exit() can run. We'll only use
    __cpu_suspend_exit() as part of PSCI cpuidle or hibernation, and both of
    these are intialized after system cpucaps are detected and patched: the
    PSCI cpuidle driver is registered with a device_initcall, hibernation
    restoration occurs in a late_initcall, and hibarnation saving is driven
    by usrspace. Therefore it is not necessary to use cpus_have_const_cap(),
    and using alternative_has_cap_*() or cpus_have_final_cap() is
    sufficient.
    
    This patch replaces the use of cpus_have_const_cap() with
    alternative_has_cap_unlikely(), which will avoid generating code to test
    the system_cpucaps bitmap and should be better for all subsequent calls
    at runtime. To clearly document the ordering relationship between
    suspend/resume and alternatives patching, an explicit check for
    system_capabilities_finalized() is added to cpu_suspend() along with a
    comment block, which will make it easier to spot issues if code is
    changed in future to allow these functions to be reached earlier.
    Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
    Cc: James Morse <james.morse@arm.com>
    Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
    Cc: Will Deacon <will@kernel.org>
    Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
    25693f17
suspend.c 5.01 KB