lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 070/148] x86/hpet: Prevent might sleep splat on resume
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Thomas Gleixner <tglx@linutronix.de>


    [ Upstream commit bb1a2c26165640ba2cbcfe06c81e9f9d6db4e643 ]

    Sergey reported a might sleep warning triggered from the hpet resume
    path. It's caused by the call to disable_irq() from interrupt disabled
    context.

    The problem with the low level resume code is that it is not accounted as a
    special system_state like we do during the boot process. Calling the same
    code during system boot would not trigger the warning. That's inconsistent
    at best.

    In this particular case it's trivial to replace the disable_irq() with
    disable_hardirq() because this particular code path is solely used from
    system resume and the involved hpet interrupts can never be force threaded.

    Reported-and-tested-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1703012108460.3684@nanos
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/kernel/hpet.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -354,7 +354,7 @@ static int hpet_resume(struct clock_even

    irq_domain_deactivate_irq(irq_get_irq_data(hdev->irq));
    irq_domain_activate_irq(irq_get_irq_data(hdev->irq));
    - disable_irq(hdev->irq);
    + disable_hardirq(hdev->irq);
    irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu));
    enable_irq(hdev->irq);
    }

    \
     
     \ /
      Last update: 2017-12-12 14:20    [W:4.122 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site