76b235c6bc
Since we've already stepped away from ENABLE is a JMP and DISABLE is a
NOP with the branch_default bits, and are going to make it even worse,
rename it to make it all clearer.
This way we don't mix multiple levels of logic attributes, but have a
plain 'physical' name for what the current instruction patching status
of a jump label is.
This is a first step in removing the naming confusion that has led to
a stream of avoidable bugs such as:
a833581e37 ("x86, perf: Fix static_key bug in load_mm_cr4()")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
[ Beefed up the changelog. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
39 lines
812 B
C
39 lines
812 B
C
#include <linux/kernel.h>
|
|
#include <linux/jump_label.h>
|
|
#include <asm/patch.h>
|
|
#include <asm/insn.h>
|
|
|
|
#ifdef HAVE_JUMP_LABEL
|
|
|
|
static void __arch_jump_label_transform(struct jump_entry *entry,
|
|
enum jump_label_type type,
|
|
bool is_static)
|
|
{
|
|
void *addr = (void *)entry->code;
|
|
unsigned int insn;
|
|
|
|
if (type == JUMP_LABEL_JMP)
|
|
insn = arm_gen_branch(entry->code, entry->target);
|
|
else
|
|
insn = arm_gen_nop();
|
|
|
|
if (is_static)
|
|
__patch_text_early(addr, insn);
|
|
else
|
|
patch_text(addr, insn);
|
|
}
|
|
|
|
void arch_jump_label_transform(struct jump_entry *entry,
|
|
enum jump_label_type type)
|
|
{
|
|
__arch_jump_label_transform(entry, type, false);
|
|
}
|
|
|
|
void arch_jump_label_transform_static(struct jump_entry *entry,
|
|
enum jump_label_type type)
|
|
{
|
|
__arch_jump_label_transform(entry, type, true);
|
|
}
|
|
|
|
#endif
|