Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c54794d1 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Mask jump target in ftrace_dyn_arch_init_insns(). 



The current code is abusing the uasm interface by passing jump target
addresses with high bits set.  Mask the addresses to avoid annoying
messages at boot time.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Wu Zhangjin <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/1922/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 693d92a1

arch/mips/kernel/ftrace.c

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#define JAL 0x0c000000		/* jump & link: ip --> ra, jump to target */

#define ADDR_MASK 0x03ffffff	/*  op_code|addr : 31...26|25 ....0 */

#define JUMP_RANGE_MASK ((1UL << 28) - 1)



#define INSN_NOP 0x00000000	/* nop */

#define INSN_JAL(addr)	\
@@ -44,12 +45,12 @@ static inline void ftrace_dyn_arch_init_insns(void) 


	/* jal (ftrace_caller + 8), jump over the first two instruction */

	buf = (u32 *)&insn_jal_ftrace_caller;

	uasm_i_jal(&buf, (FTRACE_ADDR + 8));

	uasm_i_jal(&buf, (FTRACE_ADDR + 8) & JUMP_RANGE_MASK);



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	/* j ftrace_graph_caller */

	buf = (u32 *)&insn_j_ftrace_graph_caller;

	uasm_i_j(&buf, (unsigned long)ftrace_graph_caller);

	uasm_i_j(&buf, (unsigned long)ftrace_graph_caller & JUMP_RANGE_MASK);

#endif

}