lkml.org 
[lkml]   [2020]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 330/388] lockdep: fix order in trace_hardirqs_off_caller()
    Date
    From: Sven Schnelle <svens@linux.ibm.com>

    [ Upstream commit 73ac74c7d489756d2313219a108809921dbfaea1 ]

    Switch order so that locking state is consistent even
    if the IRQ tracer calls into lockdep again.

    Acked-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
    Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/trace_preemptirq.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c
    index 4d8e99fdbbbee..26b06b09c9f68 100644
    --- a/kernel/trace/trace_preemptirq.c
    +++ b/kernel/trace/trace_preemptirq.c
    @@ -63,14 +63,14 @@ NOKPROBE_SYMBOL(trace_hardirqs_on_caller);

    __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
    {
    + lockdep_hardirqs_off(CALLER_ADDR0);
    +
    if (!this_cpu_read(tracing_irq_cpu)) {
    this_cpu_write(tracing_irq_cpu, 1);
    tracer_hardirqs_off(CALLER_ADDR0, caller_addr);
    if (!in_nmi())
    trace_irq_disable_rcuidle(CALLER_ADDR0, caller_addr);
    }
    -
    - lockdep_hardirqs_off(CALLER_ADDR0);
    }
    EXPORT_SYMBOL(trace_hardirqs_off_caller);
    NOKPROBE_SYMBOL(trace_hardirqs_off_caller);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-29 13:57    [W:2.546 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site