Commit e8d7b8c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/alternatives: Rename 'text_poke_finish()' to 'smp_text_poke_batch_finish()' 



This name is actively confusing as well, because the simple text_poke*()
APIs use MM-switching based code patching, while text_poke_finish()
is part of the INT3 based text_poke_int3_*() machinery that is an
additional layer of functionality on top of regular text_poke*() functionality.

Rename it to smp_text_poke_batch_finish() to make it clear which layer
it belongs to.

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-16-mingo@kernel.org
parent aedb60c2

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

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 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);

extern void text_poke_finish(void);

extern void smp_text_poke_batch_finish(void);



#define INT3_INSN_SIZE		1

#define INT3_INSN_OPCODE	0xCC

arch/x86/kernel/alternative.c

+1 −1
Original line number Diff line number Diff line
@@ -2866,7 +2866,7 @@ static void smp_text_poke_batch_flush(void *addr) 
	}

}



void text_poke_finish(void)

void smp_text_poke_batch_finish(void)

{

	smp_text_poke_batch_flush(NULL);

}

arch/x86/kernel/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void ftrace_arch_code_modify_post_process(void) 
	 * module load, and we need to finish the text_poke_queue()

	 * that they do, here.

	 */

	text_poke_finish();

	smp_text_poke_batch_finish();

	ftrace_poke_late = 0;

	mutex_unlock(&text_mutex);

}
@@ -250,7 +250,7 @@ void ftrace_replace_code(int enable) 
		text_poke_queue((void *)rec->ip, new, MCOUNT_INSN_SIZE, NULL);

		ftrace_update_record(rec, enable);

	}

	text_poke_finish();

	smp_text_poke_batch_finish();

}



void arch_ftrace_update_code(int command)

arch/x86/kernel/jump_label.c

+1 −1
Original line number Diff line number Diff line
@@ -143,6 +143,6 @@ bool arch_jump_label_transform_queue(struct jump_entry *entry, 
void arch_jump_label_transform_apply(void)

{

	mutex_lock(&text_mutex);

	text_poke_finish();

	smp_text_poke_batch_finish();

	mutex_unlock(&text_mutex);

}