Unverified Commit b2de7669 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14694 arm64: probes: Disable kprobes/uprobes on MOPS instructions 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2SHVASZBB25LLSY6JRCMIONBJHWP7R4U/ 
 
https://gitee.com/openeuler/kernel/issues/IBA6RL 
 
Link:https://gitee.com/openeuler/kernel/pulls/14694

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 2ba60df8 c8236ac9

arch/arm64/include/asm/insn.h

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ __AARCH64_INSN_FUNCS(ldrsw_lit, 0xFF000000, 0x98000000) 
__AARCH64_INSN_FUNCS(exclusive,	0x3F800000, 0x08000000)

__AARCH64_INSN_FUNCS(load_ex,	0x3F400000, 0x08400000)

__AARCH64_INSN_FUNCS(store_ex,	0x3F400000, 0x08000000)

__AARCH64_INSN_FUNCS(mops,	0x3B200C00, 0x19000400)

__AARCH64_INSN_FUNCS(stp,	0x7FC00000, 0x29000000)

__AARCH64_INSN_FUNCS(ldp,	0x7FC00000, 0x29400000)

__AARCH64_INSN_FUNCS(stp_post,	0x7FC00000, 0x28800000)

arch/arm64/kernel/probes/decode-insn.c

+5 −2
Original line number Diff line number Diff line
@@ -58,10 +58,13 @@ static bool __kprobes aarch64_insn_is_steppable(u32 insn) 
	 * Instructions which load PC relative literals are not going to work

	 * when executed from an XOL slot. Instructions doing an exclusive

	 * load/store are not going to complete successfully when single-step

	 * exception handling happens in the middle of the sequence.

	 * exception handling happens in the middle of the sequence. Memory

	 * copy/set instructions require that all three instructions be placed

	 * consecutively in memory.

	 */

	if (aarch64_insn_uses_literal(insn) ||

	    aarch64_insn_is_exclusive(insn))

	    aarch64_insn_is_exclusive(insn) ||

	    aarch64_insn_is_mops(insn))

		return false;



	return true;