The following commit has been merged into the perf/urgent branch of tip: Commit-ID: ce0f17fc93f63ee91428af10b7b2ddef38cd19e5 Gitweb: https://git.kernel.org/tip/ce0f17fc93f63ee91428af10b7b2ddef38cd19e5 Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx> AuthorDate: Fri, 30 Oct 2020 12:49:45 +01:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Mon, 09 Nov 2020 18:12:34 +01:00 perf: Fix get_recursion_context() One should use in_serving_softirq() to detect SoftIRQ context. Fixes: 96f6d4444302 ("perf_counter: avoid recursion") Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20201030151955.120572175@xxxxxxxxxxxxx --- kernel/events/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/internal.h b/kernel/events/internal.h index fcbf561..402054e 100644 --- a/kernel/events/internal.h +++ b/kernel/events/internal.h @@ -211,7 +211,7 @@ static inline int get_recursion_context(int *recursion) rctx = 3; else if (in_irq()) rctx = 2; - else if (in_softirq()) + else if (in_serving_softirq()) rctx = 1; else rctx = 0;
![]() |