lkml.org 
[lkml]   [2009]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: [PATCH] b44.c box lockup fix (netconsole): ratelimit NAPI poll error message
    From
    From: Andreas Mohr <andi@lisas.de>
    Date: Wed, 25 Nov 2009 22:35:46 +0100

    > See
    > http://bugzilla.kernel.org/show_bug.cgi?id=14691
    > for background information.

    The patch below is what I'll check in to fix this, thanks.

    As for the r8169 side, that case is much more complicated
    to fix. That driver messes with the interrupt masking
    before the NAPI schedule check, instead of after it's
    sure that NAPI isn't already scheduled like b44 does.

    Therefore we might need to undo that programming or move
    it into the code block where __napi_schedule() is actually
    invoked.

    I'll queue this b44 patch up for -stable too.

    b44: Fix wedge when using netconsole.

    Fixes kernel bugzilla #14691

    Due to the way netpoll works, it is perfectly legal to see
    NAPI already scheduled when new device events are pending
    in b44_interrupt().

    So logging a message about it is wrong and in fact harmful.

    Based upon a patch by Andreas Mohr.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    ---
    drivers/net/b44.c | 3 ---
    1 files changed, 0 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/b44.c b/drivers/net/b44.c
    index e046943..2a91323 100644
    --- a/drivers/net/b44.c
    +++ b/drivers/net/b44.c
    @@ -912,9 +912,6 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)
    bp->istat = istat;
    __b44_disable_ints(bp);
    __napi_schedule(&bp->napi);
    - } else {
    - printk(KERN_ERR PFX "%s: Error, poll already scheduled\n",
    - dev->name);
    }

    irq_ack:
    --
    1.6.5


    \
     
     \ /
      Last update: 2009-11-30 09:19    [W:3.510 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site