Commit 09b0d47b authored Oct 30, 2020 by Peter Zijlstra Committed by Greg Kroah-Hartman Nov 18, 2020

perf: Fix get_recursion_context()



[ Upstream commit ce0f17fc93f63ee91428af10b7b2ddef38cd19e5 ]

One should use in_serving_softirq() to detect SoftIRQ context.

Fixes: 96f6d444 ("perf_counter: avoid recursion")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20201030151955.120572175@infradead.org


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 70867a9d

kernel/events/internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,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;