Skip to content

Commit 47d67e4

Browse files
brooniewilldeacon
authored andcommitted
arm64: insn: Report PAC and BTI instructions as skippable
The PAC and BTI instructions can be safely skipped so report them as such, allowing them to be probed. Signed-off-by: Mark Brown <broonie@kernel.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20200504131326.18290-5-broonie@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
1 parent c71052c commit 47d67e4

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

arch/arm64/kernel/insn.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,23 @@ bool __kprobes aarch64_insn_is_steppable_hint(u32 insn)
5757
return false;
5858

5959
switch (insn & 0xFE0) {
60+
case AARCH64_INSN_HINT_XPACLRI:
61+
case AARCH64_INSN_HINT_PACIA_1716:
62+
case AARCH64_INSN_HINT_PACIB_1716:
63+
case AARCH64_INSN_HINT_AUTIA_1716:
64+
case AARCH64_INSN_HINT_AUTIB_1716:
65+
case AARCH64_INSN_HINT_PACIAZ:
66+
case AARCH64_INSN_HINT_PACIASP:
67+
case AARCH64_INSN_HINT_PACIBZ:
68+
case AARCH64_INSN_HINT_PACIBSP:
69+
case AARCH64_INSN_HINT_AUTIAZ:
70+
case AARCH64_INSN_HINT_AUTIASP:
71+
case AARCH64_INSN_HINT_AUTIBZ:
72+
case AARCH64_INSN_HINT_AUTIBSP:
73+
case AARCH64_INSN_HINT_BTI:
74+
case AARCH64_INSN_HINT_BTIC:
75+
case AARCH64_INSN_HINT_BTIJ:
76+
case AARCH64_INSN_HINT_BTIJC:
6077
case AARCH64_INSN_HINT_NOP:
6178
return true;
6279
default:

0 commit comments

Comments
 (0)