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

Commit 11570da1 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

x86/jump-label: Do not bother updating nops if they are correct 



On boot up, the jump label init function scans all the jump label locations
and converts them to the best nop for the machine. If the nop is already
the ideal nop, do not bother with changing it.

Cc: Jason Baron <jbaron@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c3c7f14a

arch/x86/kernel/jump_label.c

+24 −1
Original line number Diff line number Diff line
@@ -50,9 +50,32 @@ void arch_jump_label_transform(struct jump_entry *entry, 
	put_online_cpus();

}



static enum {

	JL_STATE_START,

	JL_STATE_NO_UPDATE,

	JL_STATE_UPDATE,

} jlstate __initdata_or_module = JL_STATE_START;



__init_or_module void arch_jump_label_transform_static(struct jump_entry *entry,

				      enum jump_label_type type)

{

	/*

	 * This function is called at boot up and when modules are

	 * first loaded. Check if the default nop, the one that is

	 * inserted at compile time, is the ideal nop. If it is, then

	 * we do not need to update the nop, and we can leave it as is.

	 * If it is not, then we need to update the nop to the ideal nop.

	 */

	if (jlstate == JL_STATE_START) {

		const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };

		const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];



		if (memcmp(ideal_nop, default_nop, 5) != 0)

			jlstate = JL_STATE_UPDATE;

		else

			jlstate = JL_STATE_NO_UPDATE;

	}

	if (jlstate == JL_STATE_UPDATE)

		__jump_label_transform(entry, type, text_poke_early);

}