net: disable preemption before call smp_processor_id()
authorChangli Gao <xiaosuo@gmail.com>
Sun, 8 Aug 2010 03:35:43 +0000 (20:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 8 Aug 2010 03:35:43 +0000 (20:35 -0700)
Although netif_rx() isn't expected to be called in process context with
preemption enabled, it'd better handle this case. And this is why get_cpu()
is used in the non-RPS #ifdef branch. If tree RCU is selected,
rcu_read_lock() won't disable preemption, so preempt_disable() should be
called explictly.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c

index 2b508966146baf8806dfb3716fb027889c113f46..1ae654391442049083fae7040d5d1e5568f2b424 100644 (file)
@@ -2517,6 +2517,7 @@ int netif_rx(struct sk_buff *skb)
                struct rps_dev_flow voidflow, *rflow = &voidflow;
                int cpu;
 
+               preempt_disable();
                rcu_read_lock();
 
                cpu = get_rps_cpu(skb->dev, skb, &rflow);
@@ -2526,6 +2527,7 @@ int netif_rx(struct sk_buff *skb)
                ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
 
                rcu_read_unlock();
+               preempt_enable();
        }
 #else
        {