lkml.org 
[lkml]   [2013]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/16] net: Use local_bh_disable in netif_rx_ni()
    Date
    From: Thomas Gleixner <tglx@linutronix.de>

    This code triggers the new WARN in __raise_softirq_irqsoff() though it
    actually looks at the softirq pending bit and calls into the softirq
    code, but that fits not well with the context related softirq model of
    RT. It's correct on mainline though, but going through
    local_bh_disable/enable here is not going to hurt badly.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    ---
    net/core/dev.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/net/core/dev.c b/net/core/dev.c
    index 7e8f459..9a0ca4d 100644
    --- a/net/core/dev.c
    +++ b/net/core/dev.c
    @@ -3033,11 +3033,9 @@ int netif_rx_ni(struct sk_buff *skb)
    {
    int err;

    - migrate_disable();
    + local_bh_disable();
    err = netif_rx(skb);
    - if (local_softirq_pending())
    - thread_do_softirq();
    - migrate_enable();
    + local_bh_enable();

    return err;
    }
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-02-13 18:01    [W:4.480 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site