• Mark Rutland's avatar
    arm64: Avoid cpus_have_const_cap() for ARM64_HAS_CNP · 54c8818a
    Mark Rutland authored
    In system_supports_cnp() we use cpus_have_const_cap() to check for
    ARM64_HAS_CNP, but this is only necessary so that the cpu_enable_cnp()
    callback can run prior to alternatives being patched, and otherwise this
    is not necessary and 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 cpu_enable_cnp() callback is run immediately after the ARM64_HAS_CNP
    cpucap is detected system-wide under setup_system_capabilities(), prior
    to alternatives being patched. During this window cpu_enable_cnp() uses
    cpu_replace_ttbr1() to set the CNP bit for the swapper_pg_dir in TTBR1.
    No other users of the ARM64_HAS_CNP cpucap need the up-to-date value
    during this window:
    
    * As KVM isn't initialized yet, kvm_get_vttbr() isn't reachable.
    
    * As cpuidle isn't initialized yet, __cpu_suspend_exit() isn't
      reachable.
    
    * At this point all CPUs are using the swapper_pg_dir with a reserved
      ASID in TTBR1, and the idmap_pg_dir in TTBR0, so neither
      check_and_switch_context() nor cpu_do_switch_mm() need to do anything
      special.
    
    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 allow cpu_enable_cnp() to function prior to alternatives
    being patched, cpu_replace_ttbr1() is split into cpu_replace_ttbr1() and
    cpu_enable_swapper_cnp(), with the former only used for early TTBR1
    replacement, and the latter used by both cpu_enable_cnp() and
    __cpu_suspend_exit().
    Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
    Cc: Ard Biesheuvel <ardb@kernel.org>
    Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
    Cc: Vladimir Murzin <vladimir.murzin@arm.com>
    Cc: Will Deacon <will@kernel.org>
    Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
    54c8818a
mmu_context.h 8.16 KB