Commit 14762109 authored by Mark Rutland's avatar Mark Rutland Committed by Catalin Marinas
Browse files

arm64: probes: Remove probe_opcode_t 



The probe_opcode_t typedef for u32 isn't necessary, and is a source of
confusion as it is easily confused with kprobe_opcode_t, which is a
typedef for __le32.

The typedef is only used within arch/arm64, and all of arm64's commn
insn code uses u32 for the endian-agnostic value of an instruction, so
it'd be clearer to use u32 consistently.

Remove probe_opcode_t and use u32 directly.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marnias@arm.com>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20241008155851.801546-7-mark.rutland@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent dd0eb50e

arch/arm64/include/asm/probes.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <asm/insn.h>



typedef u32 probe_opcode_t;

typedef void (probes_handler_t) (u32 opcode, long addr, struct pt_regs *);



struct arch_probe_insn {

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

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static bool __kprobes aarch64_insn_is_steppable(u32 insn) 
 *   INSN_GOOD_NO_SLOT If instruction is supported but doesn't use its slot.

 */

enum probe_insn __kprobes

arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *api)

arm_probe_decode_insn(u32 insn, struct arch_probe_insn *api)

{

	/*

	 * Instructions reading or modifying the PC won't work from the XOL
@@ -133,7 +133,7 @@ enum probe_insn __kprobes 
arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi)

{

	enum probe_insn decoded;

	probe_opcode_t insn = le32_to_cpu(*addr);

	u32 insn = le32_to_cpu(*addr);

	kprobe_opcode_t *scan_end = NULL;

	unsigned long size = 0, offset = 0;

	struct arch_probe_insn *api = &asi->api;

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

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ enum probe_insn __kprobes 
arm_kprobe_decode_insn(kprobe_opcode_t *addr, struct arch_specific_insn *asi);

#endif

enum probe_insn __kprobes

arm_probe_decode_insn(probe_opcode_t insn, struct arch_probe_insn *asi);

arm_probe_decode_insn(u32 insn, struct arch_probe_insn *asi);



#endif /* _ARM_KERNEL_KPROBES_ARM64_H */

arch/arm64/kernel/probes/uprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ unsigned long uprobe_get_swbp_addr(struct pt_regs *regs) 
int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,

		unsigned long addr)

{

	probe_opcode_t insn;

	u32 insn;



	/* TODO: Currently we do not support AARCH32 instruction probing */

	if (mm->context.flags & MMCF_AARCH32)
@@ -102,7 +102,7 @@ bool arch_uprobe_xol_was_trapped(struct task_struct *t) 


bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)

{

	probe_opcode_t insn;

	u32 insn;

	unsigned long addr;



	if (!auprobe->simulate)