Messages in this thread Patch in this message | | | From | Petr Mladek <> | Subject | [PATCH v6 2/8] x86: allow to call text_poke_bp during boot | Date | Tue, 10 Dec 2013 16:42:14 +0100 |
| |
We would like to use text_poke_bp in ftrace. It might be called also during boot when there is only one CPU and we do not need to sync the others.
The check is must to have because there are also disabled interrupts during the boot. Then the call would cause a deadlock, see the warning in "smp_call_function_many", kernel/smp.c:371.
The change is inspired by the code in arch/x86/kernel/ftrace.c.
Signed-off-by: Petr Mladek <pmladek@suse.cz> Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> --- arch/x86/kernel/alternative.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index eabed9326d2a..6436beec7b0c 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -599,6 +599,17 @@ static void do_sync_core(void *info) sync_core(); } +static void run_sync(void) +{ + /* + * We do not need to sync other cores during boot when there is only one + * CPU enabled. In fact, we must not because there are also disabled + * interrupts. The call would fail because of a potential deadlock. + */ + if (num_online_cpus() != 1) + on_each_cpu(do_sync_core, NULL, 1); +} + static bool bp_patching_in_progress; static void *bp_int3_handler, *bp_int3_addr; @@ -661,7 +672,7 @@ int text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) if (unlikely(ret)) goto fail; - on_each_cpu(do_sync_core, NULL, 1); + run_sync(); if (len - sizeof(int3) > 0) { /* @@ -676,13 +687,13 @@ int text_poke_bp(void *addr, const void *opcode, size_t len, void *handler) * not necessary and we'd be safe even without it. But * better safe than sorry (plus there's not only Intel). */ - on_each_cpu(do_sync_core, NULL, 1); + run_sync(); } /* Patch the first byte. We do not know how to recover from an error. */ text_poke_or_die(addr, opcode, sizeof(int3)); - on_each_cpu(do_sync_core, NULL, 1); + run_sync(); fail: bp_patching_in_progress = false; -- 1.8.4
| |