diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-04-11 08:40:33 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-04-11 12:01:34 +0300 |
| commit | 87836af1eafc6616bde680be556f49ba3325f798 (patch) | |
| tree | 632f5752ab4c3d1d5b89c8e38ce98d97608a6811 | |
| parent | 3bd7546ff24ecf9dbd74adf92b843eebd2862d1c (diff) | |
| download | linux-87836af1eafc6616bde680be556f49ba3325f798.tar.xz | |
x86/alternatives: Add text_mutex) assert to smp_text_poke_batch_flush()
It's possible to escape the text_mutex-held assert in
smp_text_poke_batch_process() if the caller uses a properly
batched and sorted series of patch requests, so add
an explicit lockdep_assert_held() to make sure it's
held by all callers.
All text_poke_int3_*() APIs will call either smp_text_poke_batch_process()
or smp_text_poke_batch_flush() internally.
The text_mutex must be held, because tp_vec and tp_vec_nr et al
are all globals, and the INT3 patching machinery itself relies on
external serialization.
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-22-mingo@kernel.org
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index b97abfb38c3b..c53eb3b0454e 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -2860,6 +2860,8 @@ static bool tp_order_fail(void *addr) static void smp_text_poke_batch_flush(void *addr) { + lockdep_assert_held(&text_mutex); + if (tp_vec_nr == TP_VEC_MAX || tp_order_fail(addr)) { smp_text_poke_batch_process(tp_vec, tp_vec_nr); tp_vec_nr = 0; |