* [RESEND PATCH v2 0/2] fix & prevent the missing preemption disabling @ 2021-10-13 3:37 王贇 2021-10-13 3:37 ` [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 王贇 2021-10-13 3:38 ` [RESEND PATCH v2 2/2] ftrace: do CPU checking after preemption disabled 王贇 0 siblings, 2 replies; 8+ messages in thread From: 王贇 @ 2021-10-13 3:37 UTC (permalink / raw) To: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Miroslav Benes, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching The testing show that perf_ftrace_function_call() are using smp_processor_id() with preemption enabled, all the checking on CPU could be wrong after preemption. As Peter point out, the section between ftrace_test_recursion_trylock/unlock() pair require the preemption to be disabled as 'Documentation/trace/ftrace-uses.rst' explained, but currently the work is done outside of the helpers. Patch 1/2 will make sure preemption disabled after trylock() succeed, patch 2/2 will do smp_processor_id() checking after trylock to address the issue. v1: https://lore.kernel.org/all/8c7de46d-9869-aa5e-2bb9-5dbc2eda395e@linux.alibaba.com/ Michael Wang (2): ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() ftrace: do CPU checking after preemption disabled arch/csky/kernel/probes/ftrace.c | 2 -- arch/parisc/kernel/ftrace.c | 2 -- arch/powerpc/kernel/kprobes-ftrace.c | 2 -- arch/riscv/kernel/probes/ftrace.c | 2 -- arch/x86/kernel/kprobes/ftrace.c | 2 -- include/linux/trace_recursion.h | 22 +++++++++++++++++++++- kernel/livepatch/patch.c | 6 ------ kernel/trace/trace_event_perf.c | 6 +++--- kernel/trace/trace_functions.c | 5 ----- 9 files changed, 24 insertions(+), 25 deletions(-) -- 1.8.3.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 3:37 [RESEND PATCH v2 0/2] fix & prevent the missing preemption disabling 王贇 @ 2021-10-13 3:37 ` 王贇 2021-10-13 7:55 ` Miroslav Benes 2021-10-13 3:38 ` [RESEND PATCH v2 2/2] ftrace: do CPU checking after preemption disabled 王贇 1 sibling, 1 reply; 8+ messages in thread From: 王贇 @ 2021-10-13 3:37 UTC (permalink / raw) To: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Miroslav Benes, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching As the documentation explained, ftrace_test_recursion_trylock() and ftrace_test_recursion_unlock() were supposed to disable and enable preemption properly, however currently this work is done outside of the function, which could be missing by mistake. This path will make sure the preemption was disabled when trylock() succeed, and the unlock() will enable the preemption if previously enabled. CC: Steven Rostedt <rostedt@goodmis.org> CC: Miroslav Benes <mbenes@suse.cz> Reported-by: Abaci <abaci@linux.alibaba.com> Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com> --- arch/csky/kernel/probes/ftrace.c | 2 -- arch/parisc/kernel/ftrace.c | 2 -- arch/powerpc/kernel/kprobes-ftrace.c | 2 -- arch/riscv/kernel/probes/ftrace.c | 2 -- arch/x86/kernel/kprobes/ftrace.c | 2 -- include/linux/trace_recursion.h | 22 +++++++++++++++++++++- kernel/livepatch/patch.c | 6 ------ kernel/trace/trace_functions.c | 5 ----- 8 files changed, 21 insertions(+), 22 deletions(-) diff --git a/arch/csky/kernel/probes/ftrace.c b/arch/csky/kernel/probes/ftrace.c index b388228..834cffc 100644 --- a/arch/csky/kernel/probes/ftrace.c +++ b/arch/csky/kernel/probes/ftrace.c @@ -17,7 +17,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, return; regs = ftrace_get_regs(fregs); - preempt_disable_notrace(); p = get_kprobe((kprobe_opcode_t *)ip); if (!p) { p = get_kprobe((kprobe_opcode_t *)(ip - MCOUNT_INSN_SIZE)); @@ -57,7 +56,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, __this_cpu_write(current_kprobe, NULL); } out: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } NOKPROBE_SYMBOL(kprobe_ftrace_handler); diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index 0a1e75a..3543496 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c @@ -216,7 +216,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, return; regs = ftrace_get_regs(fregs); - preempt_disable_notrace(); p = get_kprobe((kprobe_opcode_t *)ip); if (unlikely(!p) || kprobe_disabled(p)) goto out; @@ -245,7 +244,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, } __this_cpu_write(current_kprobe, NULL); out: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } NOKPROBE_SYMBOL(kprobe_ftrace_handler); diff --git a/arch/powerpc/kernel/kprobes-ftrace.c b/arch/powerpc/kernel/kprobes-ftrace.c index 7154d58..072ebe7 100644 --- a/arch/powerpc/kernel/kprobes-ftrace.c +++ b/arch/powerpc/kernel/kprobes-ftrace.c @@ -26,7 +26,6 @@ void kprobe_ftrace_handler(unsigned long nip, unsigned long parent_nip, return; regs = ftrace_get_regs(fregs); - preempt_disable_notrace(); p = get_kprobe((kprobe_opcode_t *)nip); if (unlikely(!p) || kprobe_disabled(p)) goto out; @@ -61,7 +60,6 @@ void kprobe_ftrace_handler(unsigned long nip, unsigned long parent_nip, __this_cpu_write(current_kprobe, NULL); } out: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } NOKPROBE_SYMBOL(kprobe_ftrace_handler); diff --git a/arch/riscv/kernel/probes/ftrace.c b/arch/riscv/kernel/probes/ftrace.c index aab85a8..7142ec4 100644 --- a/arch/riscv/kernel/probes/ftrace.c +++ b/arch/riscv/kernel/probes/ftrace.c @@ -15,7 +15,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, if (bit < 0) return; - preempt_disable_notrace(); p = get_kprobe((kprobe_opcode_t *)ip); if (unlikely(!p) || kprobe_disabled(p)) goto out; @@ -52,7 +51,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, __this_cpu_write(current_kprobe, NULL); } out: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } NOKPROBE_SYMBOL(kprobe_ftrace_handler); diff --git a/arch/x86/kernel/kprobes/ftrace.c b/arch/x86/kernel/kprobes/ftrace.c index 596de2f..dd2ec14 100644 --- a/arch/x86/kernel/kprobes/ftrace.c +++ b/arch/x86/kernel/kprobes/ftrace.c @@ -25,7 +25,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, if (bit < 0) return; - preempt_disable_notrace(); p = get_kprobe((kprobe_opcode_t *)ip); if (unlikely(!p) || kprobe_disabled(p)) goto out; @@ -59,7 +58,6 @@ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, __this_cpu_write(current_kprobe, NULL); } out: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } NOKPROBE_SYMBOL(kprobe_ftrace_handler); diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h index a9f9c57..101e1fb 100644 --- a/include/linux/trace_recursion.h +++ b/include/linux/trace_recursion.h @@ -208,13 +208,29 @@ static __always_inline void trace_clear_recursion(int bit) * Use this for ftrace callbacks. This will detect if the function * tracing recursed in the same context (normal vs interrupt), * + * The ftrace_test_recursion_trylock() will disable preemption, + * which is required for the variant of synchronize_rcu() that is + * used to allow patching functions where RCU is not watching. + * See klp_synchronize_transition() for more details. + * * Returns: -1 if a recursion happened. * >= 0 if no recursion */ static __always_inline int ftrace_test_recursion_trylock(unsigned long ip, unsigned long parent_ip) { - return trace_test_and_set_recursion(ip, parent_ip, TRACE_FTRACE_START, TRACE_FTRACE_MAX); + int bit; + + bit = trace_test_and_set_recursion(ip, parent_ip, TRACE_FTRACE_START, TRACE_FTRACE_MAX); + /* + * The zero bit indicate we are nested + * in another trylock(), which means the + * preemption already disabled. + */ + if (bit > 0) + preempt_disable_notrace(); + + return bit; } /** @@ -222,9 +238,13 @@ static __always_inline int ftrace_test_recursion_trylock(unsigned long ip, * @bit: The return of a successful ftrace_test_recursion_trylock() * * This is used at the end of a ftrace callback. + * + * Preemption will be enabled (if it was previously enabled). */ static __always_inline void ftrace_test_recursion_unlock(int bit) { + if (bit) + preempt_enable_notrace(); trace_clear_recursion(bit); } diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c index e8029ae..6e66ccd 100644 --- a/kernel/livepatch/patch.c +++ b/kernel/livepatch/patch.c @@ -52,11 +52,6 @@ static void notrace klp_ftrace_handler(unsigned long ip, bit = ftrace_test_recursion_trylock(ip, parent_ip); if (WARN_ON_ONCE(bit < 0)) return; - /* - * A variant of synchronize_rcu() is used to allow patching functions - * where RCU is not watching, see klp_synchronize_transition(). - */ - preempt_disable_notrace(); func = list_first_or_null_rcu(&ops->func_stack, struct klp_func, stack_node); @@ -120,7 +115,6 @@ static void notrace klp_ftrace_handler(unsigned long ip, klp_arch_set_pc(fregs, (unsigned long)func->new_func); unlock: - preempt_enable_notrace(); ftrace_test_recursion_unlock(bit); } diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c index 1f0e63f..9f1bfbe 100644 --- a/kernel/trace/trace_functions.c +++ b/kernel/trace/trace_functions.c @@ -186,7 +186,6 @@ static void function_trace_start(struct trace_array *tr) return; trace_ctx = tracing_gen_ctx(); - preempt_disable_notrace(); cpu = smp_processor_id(); data = per_cpu_ptr(tr->array_buffer.data, cpu); @@ -194,7 +193,6 @@ static void function_trace_start(struct trace_array *tr) trace_function(tr, ip, parent_ip, trace_ctx); ftrace_test_recursion_unlock(bit); - preempt_enable_notrace(); } #ifdef CONFIG_UNWINDER_ORC @@ -298,8 +296,6 @@ static inline void process_repeats(struct trace_array *tr, if (bit < 0) return; - preempt_disable_notrace(); - cpu = smp_processor_id(); data = per_cpu_ptr(tr->array_buffer.data, cpu); if (atomic_read(&data->disabled)) @@ -324,7 +320,6 @@ static inline void process_repeats(struct trace_array *tr, out: ftrace_test_recursion_unlock(bit); - preempt_enable_notrace(); } static void -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 3:37 ` [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 王贇 @ 2021-10-13 7:55 ` Miroslav Benes 2021-10-13 8:11 ` 王贇 0 siblings, 1 reply; 8+ messages in thread From: Miroslav Benes @ 2021-10-13 7:55 UTC (permalink / raw) To: 王贇 Cc: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching > diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h > index a9f9c57..101e1fb 100644 > --- a/include/linux/trace_recursion.h > +++ b/include/linux/trace_recursion.h > @@ -208,13 +208,29 @@ static __always_inline void trace_clear_recursion(int bit) > * Use this for ftrace callbacks. This will detect if the function > * tracing recursed in the same context (normal vs interrupt), > * > + * The ftrace_test_recursion_trylock() will disable preemption, > + * which is required for the variant of synchronize_rcu() that is > + * used to allow patching functions where RCU is not watching. > + * See klp_synchronize_transition() for more details. > + * I think that you misunderstood. Steven proposed to put the comment before ftrace_test_recursion_trylock() call site in klp_ftrace_handler(). > * Returns: -1 if a recursion happened. > * >= 0 if no recursion > */ > static __always_inline int ftrace_test_recursion_trylock(unsigned long ip, > unsigned long parent_ip) > { > - return trace_test_and_set_recursion(ip, parent_ip, TRACE_FTRACE_START, TRACE_FTRACE_MAX); > + int bit; > + > + bit = trace_test_and_set_recursion(ip, parent_ip, TRACE_FTRACE_START, TRACE_FTRACE_MAX); > + /* > + * The zero bit indicate we are nested > + * in another trylock(), which means the > + * preemption already disabled. > + */ > + if (bit > 0) > + preempt_disable_notrace(); > + > + return bit; > } [...] > diff --git a/kernel/livepatch/patch.c b/kernel/livepatch/patch.c > index e8029ae..6e66ccd 100644 > --- a/kernel/livepatch/patch.c > +++ b/kernel/livepatch/patch.c > @@ -52,11 +52,6 @@ static void notrace klp_ftrace_handler(unsigned long ip, Here > bit = ftrace_test_recursion_trylock(ip, parent_ip); > if (WARN_ON_ONCE(bit < 0)) > return; > - /* > - * A variant of synchronize_rcu() is used to allow patching functions > - * where RCU is not watching, see klp_synchronize_transition(). > - */ > - preempt_disable_notrace(); > > func = list_first_or_null_rcu(&ops->func_stack, struct klp_func, > stack_node); > @@ -120,7 +115,6 @@ static void notrace klp_ftrace_handler(unsigned long ip, > klp_arch_set_pc(fregs, (unsigned long)func->new_func); > > unlock: > - preempt_enable_notrace(); > ftrace_test_recursion_unlock(bit); > } Side note... the comment will eventually conflict with peterz's https://lore.kernel.org/all/20210929152429.125997206@infradead.org/. Miroslav ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 7:55 ` Miroslav Benes @ 2021-10-13 8:11 ` 王贇 2021-10-13 8:25 ` Miroslav Benes 0 siblings, 1 reply; 8+ messages in thread From: 王贇 @ 2021-10-13 8:11 UTC (permalink / raw) To: Miroslav Benes Cc: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching On 2021/10/13 下午3:55, Miroslav Benes wrote: >> diff --git a/include/linux/trace_recursion.h b/include/linux/trace_recursion.h >> index a9f9c57..101e1fb 100644 >> --- a/include/linux/trace_recursion.h >> +++ b/include/linux/trace_recursion.h >> @@ -208,13 +208,29 @@ static __always_inline void trace_clear_recursion(int bit) >> * Use this for ftrace callbacks. This will detect if the function >> * tracing recursed in the same context (normal vs interrupt), >> * >> + * The ftrace_test_recursion_trylock() will disable preemption, >> + * which is required for the variant of synchronize_rcu() that is >> + * used to allow patching functions where RCU is not watching. >> + * See klp_synchronize_transition() for more details. >> + * > > I think that you misunderstood. Steven proposed to put the comment before > ftrace_test_recursion_trylock() call site in klp_ftrace_handler(). Oh, I see... thanks for pointing out :-) > >> * Returns: -1 if a recursion happened. [snip] >> } > > Side note... the comment will eventually conflict with peterz's > https://lore.kernel.org/all/20210929152429.125997206@infradead.org/. Steven, would you like to share your opinion on this patch? If klp_synchronize_transition() will be removed anyway, the comments will be meaningless and we can just drop it :-P Regards, Michael Wang > > Miroslav > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 8:11 ` 王贇 @ 2021-10-13 8:25 ` Miroslav Benes 2021-10-13 8:34 ` 王贇 0 siblings, 1 reply; 8+ messages in thread From: Miroslav Benes @ 2021-10-13 8:25 UTC (permalink / raw) To: 王贇 Cc: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching > > Side note... the comment will eventually conflict with peterz's > > https://lore.kernel.org/all/20210929152429.125997206@infradead.org/. > > Steven, would you like to share your opinion on this patch? > > If klp_synchronize_transition() will be removed anyway, the comments > will be meaningless and we can just drop it :-P The comment will still be needed in some form. We will handle it depending on what gets merged first. peterz's patches are not ready yet. Miroslav ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 8:25 ` Miroslav Benes @ 2021-10-13 8:34 ` 王贇 2021-10-13 14:24 ` Steven Rostedt 0 siblings, 1 reply; 8+ messages in thread From: 王贇 @ 2021-10-13 8:34 UTC (permalink / raw) To: Miroslav Benes Cc: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching On 2021/10/13 下午4:25, Miroslav Benes wrote: >>> Side note... the comment will eventually conflict with peterz's >>> https://lore.kernel.org/all/20210929152429.125997206@infradead.org/. >> >> Steven, would you like to share your opinion on this patch? >> >> If klp_synchronize_transition() will be removed anyway, the comments >> will be meaningless and we can just drop it :-P > > The comment will still be needed in some form. We will handle it depending > on what gets merged first. peterz's patches are not ready yet. Ok, then I'll move it before trylock() inside klp_ftrace_handler() anyway. Regards, Michael Wang > > Miroslav > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 2021-10-13 8:34 ` 王贇 @ 2021-10-13 14:24 ` Steven Rostedt 0 siblings, 0 replies; 8+ messages in thread From: Steven Rostedt @ 2021-10-13 14:24 UTC (permalink / raw) To: 王贇 Cc: Miroslav Benes, Guo Ren, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching On Wed, 13 Oct 2021 16:34:53 +0800 王贇 <yun.wang@linux.alibaba.com> wrote: > On 2021/10/13 下午4:25, Miroslav Benes wrote: > >>> Side note... the comment will eventually conflict with peterz's > >>> https://lore.kernel.org/all/20210929152429.125997206@infradead.org/. > >> > >> Steven, would you like to share your opinion on this patch? > >> > >> If klp_synchronize_transition() will be removed anyway, the comments > >> will be meaningless and we can just drop it :-P > > > > The comment will still be needed in some form. We will handle it depending > > on what gets merged first. peterz's patches are not ready yet. > > Ok, then I'll move it before trylock() inside klp_ftrace_handler() anyway. +1 -- Steve ^ permalink raw reply [flat|nested] 8+ messages in thread
* [RESEND PATCH v2 2/2] ftrace: do CPU checking after preemption disabled 2021-10-13 3:37 [RESEND PATCH v2 0/2] fix & prevent the missing preemption disabling 王贇 2021-10-13 3:37 ` [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 王贇 @ 2021-10-13 3:38 ` 王贇 1 sibling, 0 replies; 8+ messages in thread From: 王贇 @ 2021-10-13 3:38 UTC (permalink / raw) To: Guo Ren, Steven Rostedt, Ingo Molnar, James E.J. Bottomley, Helge Deller, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Paul Walmsley, Palmer Dabbelt, Albert Ou, Thomas Gleixner, Borislav Petkov, x86, H. Peter Anvin, Josh Poimboeuf, Jiri Kosina, Miroslav Benes, Petr Mladek, Joe Lawrence, Colin Ian King, Masami Hiramatsu, Peter Zijlstra (Intel), Nicholas Piggin, Jisheng Zhang, linux-csky, linux-kernel, linux-parisc, linuxppc-dev, linux-riscv, live-patching With CONFIG_DEBUG_PREEMPT we observed reports like: BUG: using smp_processor_id() in preemptible caller is perf_ftrace_function_call+0x6f/0x2e0 CPU: 1 PID: 680 Comm: a.out Not tainted Call Trace: <TASK> dump_stack_lvl+0x8d/0xcf check_preemption_disabled+0x104/0x110 ? optimize_nops.isra.7+0x230/0x230 ? text_poke_bp_batch+0x9f/0x310 perf_ftrace_function_call+0x6f/0x2e0 ... __text_poke+0x5/0x620 text_poke_bp_batch+0x9f/0x310 This telling us the CPU could be changed after task is preempted, and the checking on CPU before preemption will be invalid. Since now ftrace_test_recursion_trylock() will help to disable the preemption, this patch just do the checking after trylock() to address the issue. CC: Steven Rostedt <rostedt@goodmis.org> Reported-by: Abaci <abaci@linux.alibaba.com> Signed-off-by: Michael Wang <yun.wang@linux.alibaba.com> --- kernel/trace/trace_event_perf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index 6aed10e..fba8cb7 100644 --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -441,13 +441,13 @@ void perf_trace_buf_update(void *record, u16 type) if (!rcu_is_watching()) return; - if ((unsigned long)ops->private != smp_processor_id()) - return; - bit = ftrace_test_recursion_trylock(ip, parent_ip); if (bit < 0) return; + if ((unsigned long)ops->private != smp_processor_id()) + goto out; + event = container_of(ops, struct perf_event, ftrace_ops); /* -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-10-13 14:24 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-13 3:37 [RESEND PATCH v2 0/2] fix & prevent the missing preemption disabling 王贇 2021-10-13 3:37 ` [RESEND PATCH v2 1/2] ftrace: disable preemption between ftrace_test_recursion_trylock/unlock() 王贇 2021-10-13 7:55 ` Miroslav Benes 2021-10-13 8:11 ` 王贇 2021-10-13 8:25 ` Miroslav Benes 2021-10-13 8:34 ` 王贇 2021-10-13 14:24 ` Steven Rostedt 2021-10-13 3:38 ` [RESEND PATCH v2 2/2] ftrace: do CPU checking after preemption disabled 王贇
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).