https://github.com/torvalds/linux
Revision f2b3d8566d81deaca31f4e3163def0bea7746e11 authored by James Morse on 24 January 2019, 16:32:55 UTC, committed by Will Deacon on 01 February 2019, 14:09:50 UTC
On systems with VHE the kernel and KVM's world-switch code run at the
same exception level. Code that is only used on a VHE system does not
need to be annotated as __hyp_text as it can reside anywhere in the
 kernel text.

__hyp_text was also used to prevent kprobes from patching breakpoint
instructions into this region, as this code runs at a different
exception level. While this is no longer true with VHE, KVM still
switches VBAR_EL1, meaning a kprobe's breakpoint executed in the
world-switch code will cause a hyp-panic.

Move the __hyp_text check in the kprobes blacklist so it applies on
VHE systems too, to cover the common code and guest enter/exit
assembly.

Fixes: 888b3c8720e0 ("arm64: Treat all entry code as non-kprobe-able")
Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent 8ea2359
Raw File
Tip revision: f2b3d8566d81deaca31f4e3163def0bea7746e11 authored by James Morse on 24 January 2019, 16:32:55 UTC
arm64: kprobe: Always blacklist the KVM world-switch code
Tip revision: f2b3d85
lockdep_states.h
/*
 * Lockdep states,
 *
 * please update XXX_LOCK_USAGE_STATES in include/linux/lockdep.h whenever
 * you add one, or come up with a nice dynamic solution.
 */
LOCKDEP_STATE(HARDIRQ)
LOCKDEP_STATE(SOFTIRQ)
back to top