lkml.org 
[lkml]   [2007]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [9/12] x86_64: Avoid NMI Watchdog and/or long wait in setup_APIC_timer
    Date

    From: Aaron Durbin <adurbin@google.com>
    In setup_APIC_timer with the HPET in use, a condition can arise while
    waiting for the next irq slice to expire on the HPET which will either
    cause an NMI watchdog to fire or a 3 minute busy loop if the NMI
    watchdog is disabled.

    The HPET comparator and the counter keep incrementing during its normal
    operation. When a comparison event fires the comparator will increment
    by the designated period. If the HPET trigger occurs right after
    the 'int trigger = hpet_readl(HPET_T0_CMP);' line, we will will spin
    for up to 3 minutes (with a clock of 25MHz) waiting for the HPET
    counter to wrap around. However, when the NMI watchdog is enabled the
    NMI watchdog will detect a lockup and reboot the machine. This
    scenario can be exasperated by the presence of an SMI which will
    increase the window of opportunity for the condition to occur.

    The fix is to wait for the compartor to change which signals the
    end of the tick slice.

    Signed-off-by: Andi Kleen <ak@suse.de>

    ---
    arch/x86_64/kernel/apic.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    Index: linux/arch/x86_64/kernel/apic.c
    ===================================================================
    --- linux.orig/arch/x86_64/kernel/apic.c
    +++ linux/arch/x86_64/kernel/apic.c
    @@ -791,10 +791,12 @@ static void setup_APIC_timer(unsigned in

    /* wait for irq slice */
    if (hpet_address && hpet_use_timer) {
    + /*
    + * Wait for the comparator value to change which signals that
    + * the tick slice has expired.
    + */
    int trigger = hpet_readl(HPET_T0_CMP);
    - while (hpet_readl(HPET_COUNTER) >= trigger)
    - /* do nothing */ ;
    - while (hpet_readl(HPET_COUNTER) < trigger)
    + while (trigger == hpet_readl(HPET_T0_CMP))
    /* do nothing */ ;
    } else {
    int c1, c2;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-08-09 14:49    [W:5.442 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site