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

Signed-off-by: Ingo 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

diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h
index ab9e143ec9fea182b5247cc1b379e9559ca0fd48..5189188b5e494426c51c9d2be7d1f1821036a6dc 100644 (file)
--- a/arch/x86/include/asm/text-patching.h
+++ b/arch/x86/include/asm/text-patching.h
@@ -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);

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 78024e5def29fd42b088b1a85d4d53262e5d3c4e..222021af790697d129e7c60d91e6a311384e05e4 100644 (file)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -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;
 

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index cace6e8d7cc77a14a6213cab63b90de08d6b0929..7175a0404def38bcc160282998b04583863ddd6d 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -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;
 }
 

diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index f5b8ef02d172c1740f4c22a622b188da379f13d9..166e12037199d90f30d1ecaa706a38f5d2438500 100644 (file)
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -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,

diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index 36d6809c6c9e1a74d879285bd835958087c1a5ee..9307a40f4983401887a9d24123388aac3cd3ddfe 100644 (file)
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -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);
        }

diff --git a/arch/x86/kernel/static_call.c b/arch/x86/kernel/static_call.c
index a59c72e7764522bb0e19fae79b51e0d12f9ca0bf..8164a7323c1729475560f401622f2fb8f1e9f121 100644 (file)
--- a/arch/x86/kernel/static_call.c
+++ b/arch/x86/kernel/static_call.c
@@ -108,7 +108,7 @@ static void __ref __static_call_transform(void *insn, enum insn_type type,
        if (system_state == SYSTEM_BOOTING || modinit)
                return text_poke_early(insn, code, size);
 
-       text_poke_bp(insn, code, size, emulate);
+       smp_text_poke_single(insn, code, size, emulate);
 }
 
 static void __static_call_validate(u8 *insn, bool tail, bool tramp)

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 9e5fe2ba858f08408b427e395eb64be9ee15cf29..e2b9991c332652b5d6ffac14aa32a29769871a43 100644 (file)
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -629,7 +629,7 @@ static int __bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,
                goto out;
        ret = 1;
        if (memcmp(ip, new_insn, X86_PATCH_SIZE)) {
-               text_poke_bp(ip, new_insn, X86_PATCH_SIZE, NULL);
+               smp_text_poke_single(ip, new_insn, X86_PATCH_SIZE, NULL);
                ret = 0;
        }
 out: