Commit 07dcd967 authored by Mark Brown's avatar Mark Brown Committed by Will Deacon
Browse files

arm64: insn: Provide a better name for aarch64_insn_is_nop() 



The current aarch64_insn_is_nop() has exactly one caller which uses it
solely to identify if the instruction is a HINT that can safely be stepped,
requiring us to list things that aren't NOPs and make things more confusing
than they need to be. Rename the function to reflect the actual usage and
make things more clear.

Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200504131326.18290-3-broonie@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent bd507ca2

arch/arm64/include/asm/insn.h

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ __AARCH64_INSN_FUNCS(msr_reg, 0xFFF00000, 0xD5100000) 


#undef	__AARCH64_INSN_FUNCS



bool aarch64_insn_is_nop(u32 insn);

bool aarch64_insn_is_steppable_hint(u32 insn);

bool aarch64_insn_is_branch_imm(u32 insn);



static inline bool aarch64_insn_is_adr_adrp(u32 insn)

arch/arm64/kernel/insn.c

+1 −2
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ enum aarch64_insn_encoding_class __kprobes aarch64_get_insn_class(u32 insn) 
	return aarch64_insn_encoding_class[(insn >> 25) & 0xf];

}



/* NOP is an alias of HINT */

bool __kprobes aarch64_insn_is_nop(u32 insn)

bool __kprobes aarch64_insn_is_steppable_hint(u32 insn)

{

	if (!aarch64_insn_is_hint(insn))

		return false;

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static bool __kprobes aarch64_insn_is_steppable(u32 insn) 
		 * except for the NOP case.

		 */

		if (aarch64_insn_is_hint(insn))

			return aarch64_insn_is_nop(insn);

			return aarch64_insn_is_steppable_hint(insn);



		return true;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE