Commit 9586ae48 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/alternatives: Rename 'text_poke_bp()' to 'smp_text_poke_single()' 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: "H . Peter Anvin" <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250411054105.2341982-7-mingo@kernel.org
parent bee4fcfb

arch/x86/include/asm/text-patching.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ extern void *text_poke_copy(void *addr, const void *opcode, size_t len); 
extern void *text_poke_copy_locked(void *addr, const void *opcode, size_t len, bool core_ok);

extern void *text_poke_set(void *addr, int c, size_t len);

extern int poke_int3_handler(struct pt_regs *regs);

extern void text_poke_bp(void *addr, const void *opcode, size_t len, const void *emulate);

extern void smp_text_poke_single(void *addr, const void *opcode, size_t len, const void *emulate);



extern void text_poke_queue(void *addr, const void *opcode, size_t len, const void *emulate);

extern void text_poke_finish(void);

arch/x86/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -2887,7 +2887,7 @@ void __ref text_poke_queue(void *addr, const void *opcode, size_t len, const voi 
}



/**

 * text_poke_bp() -- update instructions on live kernel on SMP

 * smp_text_poke_single() -- update instructions on live kernel on SMP

 * @addr:	address to patch

 * @opcode:	opcode of new instruction

 * @len:	length to copy
@@ -2897,7 +2897,7 @@ void __ref text_poke_queue(void *addr, const void *opcode, size_t len, const voi 
 * dynamically allocated memory. This function should be used when it is

 * not possible to allocate memory.

 */

void __ref text_poke_bp(void *addr, const void *opcode, size_t len, const void *emulate)

void __ref smp_text_poke_single(void *addr, const void *opcode, size_t len, const void *emulate)

{

	struct text_poke_loc tp;

arch/x86/kernel/ftrace.c

+4 −4
Original line number Diff line number Diff line
@@ -186,11 +186,11 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 


	ip = (unsigned long)(&ftrace_call);

	new = ftrace_call_replace(ip, (unsigned long)func);

	text_poke_bp((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	smp_text_poke_single((void *)ip, new, MCOUNT_INSN_SIZE, NULL);



	ip = (unsigned long)(&ftrace_regs_call);

	new = ftrace_call_replace(ip, (unsigned long)func);

	text_poke_bp((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	smp_text_poke_single((void *)ip, new, MCOUNT_INSN_SIZE, NULL);



	return 0;

}
@@ -492,7 +492,7 @@ void arch_ftrace_update_trampoline(struct ftrace_ops *ops) 
	mutex_lock(&text_mutex);

	/* Do a safe modify in case the trampoline is executing */

	new = ftrace_call_replace(ip, (unsigned long)func);

	text_poke_bp((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	smp_text_poke_single((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	mutex_unlock(&text_mutex);

}
@@ -586,7 +586,7 @@ static int ftrace_mod_jmp(unsigned long ip, void *func) 
	const char *new;



	new = ftrace_jmp_replace(ip, (unsigned long)func);

	text_poke_bp((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	smp_text_poke_single((void *)ip, new, MCOUNT_INSN_SIZE, NULL);

	return 0;

}

arch/x86/kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ __jump_label_transform(struct jump_entry *entry, 
		return;

	}



	text_poke_bp((void *)jump_entry_code(entry), jlp.code, jlp.size, NULL);

	smp_text_poke_single((void *)jump_entry_code(entry), jlp.code, jlp.size, NULL);

}



static void __ref jump_label_transform(struct jump_entry *entry,

arch/x86/kernel/kprobes/opt.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ void arch_optimize_kprobes(struct list_head *oplist) 
		insn_buff[0] = JMP32_INSN_OPCODE;

		*(s32 *)(&insn_buff[1]) = rel;



		text_poke_bp(op->kp.addr, insn_buff, JMP32_INSN_SIZE, NULL);

		smp_text_poke_single(op->kp.addr, insn_buff, JMP32_INSN_SIZE, NULL);



		list_del_init(&op->list);

	}