Skip to content

Commit

Permalink
arm64: Move BP hardening to check_and_switch_context
Browse files Browse the repository at this point in the history
We call arm64_apply_bp_hardening() from post_ttbr_update_workaround,
which has the unexpected consequence of being triggered on every
exception return to userspace when ARM64_SW_TTBR0_PAN is selected,
even if no context switch actually occured.

This is a bit suboptimal, and it would be more logical to only
invalidate the branch predictor when we actually switch to
a different mm.

In order to solve this, move the call to arm64_apply_bp_hardening()
into check_and_switch_context(), where we're guaranteed to pick
a different mm context.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Marc Zyngier authored and Catalin Marinas committed Jan 23, 2018
1 parent e9eaa80 commit a8e4c0a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/arm64/mm/context.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ void check_and_switch_context(struct mm_struct *mm, unsigned int cpu)
raw_spin_unlock_irqrestore(&cpu_asid_lock, flags);

switch_mm_fastpath:

arm64_apply_bp_hardening();

/*
* Defer TTBR0_EL1 setting for user threads to uaccess_enable() when
* emulating PAN.
Expand All @@ -249,8 +252,6 @@ asmlinkage void post_ttbr_update_workaround(void)
"ic iallu; dsb nsh; isb",
ARM64_WORKAROUND_CAVIUM_27456,
CONFIG_CAVIUM_ERRATUM_27456));

arm64_apply_bp_hardening();
}

static int asids_init(void)
Expand Down

0 comments on commit a8e4c0a

Please sign in to comment.