Commit 5236b6a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/alternatives: Rename 'poke_int3_handler()' to 'smp_text_poke_int3_handler()' 



All related functions in this subsystem already have a
text_poke_int3_ prefix - add it to the trap handler
as well.

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-8-mingo@kernel.org
parent 9586ae48

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ extern void *text_poke_copy(void *addr, const void *opcode, size_t len); 
#define text_poke_copy text_poke_copy

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 int smp_text_poke_int3_handler(struct pt_regs *regs);

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);

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -2515,7 +2515,7 @@ static __always_inline int patch_cmp(const void *key, const void *elt) 
	return 0;

}



noinstr int poke_int3_handler(struct pt_regs *regs)

noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)

{

	struct text_poke_int3_vec *desc;

	struct text_poke_loc *tp;

arch/x86/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -882,16 +882,16 @@ static void do_int3_user(struct pt_regs *regs) 
DEFINE_IDTENTRY_RAW(exc_int3)

{

	/*

	 * poke_int3_handler() is completely self contained code; it does (and

	 * smp_text_poke_int3_handler() is completely self contained code; it does (and

	 * must) *NOT* call out to anything, lest it hits upon yet another

	 * INT3.

	 */

	if (poke_int3_handler(regs))

	if (smp_text_poke_int3_handler(regs))

		return;



	/*

	 * irqentry_enter_from_user_mode() uses static_branch_{,un}likely()

	 * and therefore can trigger INT3, hence poke_int3_handler() must

	 * and therefore can trigger INT3, hence smp_text_poke_int3_handler() must

	 * be done before. If the entry came from kernel mode, then use

	 * nmi_enter() because the INT3 could have been hit in any context

	 * including NMI.