x86/alternatives: Simplify smp_text_poke_int3_handler()

Remove the 'desc' local variable indirection and use
text_poke_array directly.

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-33-mingo@kernel.org

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index edc18be4fac4f127ad4f9b296fa1e23701a62fa6..97cb954467ff81c24568f23b5b929630c9c19574 100644 (file)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2511,7 +2511,6 @@ static __always_inline int patch_cmp(const void *key, const void *elt)
 
 noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
 {
-       struct smp_text_poke_array *desc;
        struct smp_text_poke_loc *tp;
        int ret = 0;
        void *ip;
@@ -2531,9 +2530,6 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
 
        if (!try_get_text_poke_array())
                return 0;
-       desc = &text_poke_array;
-
-       WARN_ON_ONCE(desc->vec != text_poke_array.vec);
 
        /*
         * Discount the INT3. See smp_text_poke_batch_process().
@@ -2543,14 +2539,14 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs)
        /*
         * Skip the binary search if there is a single member in the vector.
         */
-       if (unlikely(desc->nr_entries > 1)) {
-               tp = __inline_bsearch(ip, desc->vec, desc->nr_entries,
+       if (unlikely(text_poke_array.nr_entries > 1)) {
+               tp = __inline_bsearch(ip, text_poke_array.vec, text_poke_array.nr_entries,
                                      sizeof(struct smp_text_poke_loc),
                                      patch_cmp);
                if (!tp)
                        goto out_put;
        } else {
-               tp = desc->vec;
+               tp = text_poke_array.vec;
                if (text_poke_addr(tp) != ip)
                        goto out_put;
        }