lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 400/545] lib/smp_processor_id: fix imbalanced instrumentation_end() call
    Date
    From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

    [ Upstream commit bd27acaac24e4b252ee28dddcabaee80456d0faf ]

    Currently instrumentation_end() won't be called if printk_ratelimit()
    returned false.

    Link: https://lkml.kernel.org/r/a636d8e0-ad32-5888-acac-671f7f553bb3@I-love.SAKURA.ne.jp
    Fixes: 126f21f0e8d46e2c ("lib/smp_processor_id: Move it into noinstr section")
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Alexandre Chartre <alexandre.chartre@oracle.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    lib/smp_processor_id.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
    index 525222e4f409..2916606a9333 100644
    --- a/lib/smp_processor_id.c
    +++ b/lib/smp_processor_id.c
    @@ -46,9 +46,9 @@ unsigned int check_preemption_disabled(const char *what1, const char *what2)

    printk("caller is %pS\n", __builtin_return_address(0));
    dump_stack();
    - instrumentation_end();

    out_enable:
    + instrumentation_end();
    preempt_enable_no_resched_notrace();
    out:
    return this_cpu;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:37    [W:2.671 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site