diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2025-04-11 07:40:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-04-11 11:01:34 +0200 |
| commit | 476ad071c678d70623cdb14fadd21818f64cc45b (patch) | |
| tree | 76a023caf6d29ffa623a6ab9122b86f6ab81fb4d | |
| parent | x86/alternatives: Simplify smp_text_poke_single() by using tp_vec and existing APIs (diff) | |
| download | wireguard-linux-476ad071c678d70623cdb14fadd21818f64cc45b.tar.xz wireguard-linux-476ad071c678d70623cdb14fadd21818f64cc45b.zip | |
x86/alternatives: Assert that smp_text_poke_int3_handler() can only ever handle 'tp_vec[]' based requests
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-26-mingo@kernel.org
| -rw-r--r-- | arch/x86/kernel/alternative.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index b4cb8676c2f0..329f6ee6b3bc 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2510,6 +2510,10 @@ static __always_inline int patch_cmp(const void *key, const void *elt) return 0; } +#define TP_VEC_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_loc)) +static struct smp_text_poke_loc tp_vec[TP_VEC_MAX]; +static int tp_vec_nr; + noinstr int smp_text_poke_int3_handler(struct pt_regs *regs) { struct text_poke_int3_vec *desc; @@ -2534,6 +2538,8 @@ noinstr int smp_text_poke_int3_handler(struct pt_regs *regs) if (!desc) return 0; + WARN_ON_ONCE(desc->vec != tp_vec); + /* * Discount the INT3. See smp_text_poke_batch_process(). */ @@ -2592,10 +2598,6 @@ out_put: return ret; } -#define TP_VEC_MAX (PAGE_SIZE / sizeof(struct smp_text_poke_loc)) -static struct smp_text_poke_loc tp_vec[TP_VEC_MAX]; -static int tp_vec_nr; - /** * smp_text_poke_batch_process() -- update instructions on live kernel on SMP * @tp: vector of instructions to patch |