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

!13208 [sync] PR-13146: arm64: probes: Remove broken LDR (literal) uprobe support 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/13146 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ARVV3NCT6FOI767IE3QFGWZQFB2MGGBP/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2BX7 
 
Link:https://gitee.com/openeuler/kernel/pulls/13208

 

Reviewed-by: default avatarXu Kuohai <xukuohai@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents ce9f1089 4e3fd5c6

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

+11 −5
Original line number Diff line number Diff line
@@ -99,10 +99,6 @@ arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api) 
	    aarch64_insn_is_blr(insn) ||

	    aarch64_insn_is_ret(insn)) {

		api->handler = simulate_br_blr_ret;

	} else if (aarch64_insn_is_ldr_lit(insn)) {

		api->handler = simulate_ldr_literal;

	} else if (aarch64_insn_is_ldrsw_lit(insn)) {

		api->handler = simulate_ldrsw_literal;

	} else {

		/*

		 * Instruction cannot be stepped out-of-line and we don't
@@ -140,6 +136,17 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi) 
	probe_opcode_t insn = le32_to_cpu(*addr);

	probe_opcode_t *scan_end = NULL;

	unsigned long size = 0, offset = 0;

	struct arch_probe_insn *api = &asi->api;



	if (aarch64_insn_is_ldr_lit(insn)) {

		api->handler = simulate_ldr_literal;

		decoded = INSN_GOOD_NO_SLOT;

	} else if (aarch64_insn_is_ldrsw_lit(insn)) {

		api->handler = simulate_ldrsw_literal;

		decoded = INSN_GOOD_NO_SLOT;

	} else {

		decoded = arm_probe_decode_insn(insn, &asi->api);

	}



	/*

	 * If there's a symbol defined in front of and near enough to
@@ -157,7 +164,6 @@ arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi) 
		else

			scan_end = addr - MAX_ATOMIC_CONTEXT_SIZE;

	}

	decoded = arm_probe_decode_insn(insn, &asi->api);



	if (decoded != INSN_REJECTED && scan_end)

		if (is_probed_address_atomic(addr - 1, scan_end))