lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 105/151] perf: Fix get_recursion_context()
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit ce0f17fc93f63ee91428af10b7b2ddef38cd19e5 ]

    One should use in_serving_softirq() to detect SoftIRQ context.

    Fixes: 96f6d4444302 ("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>
    ---
    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 3aef4191798c3..6e87b358e0826 100644
    --- a/kernel/events/internal.h
    +++ b/kernel/events/internal.h
    @@ -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;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:39    [W:3.716 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site