summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-08-07 20:35:43 -0700
committerDavid S. Miller <davem@davemloft.net>2010-08-07 20:35:43 -0700
commitcece1945bffcf1a823cdfa36669beae118419351 (patch)
treea3bd2c2a1953624b710524f56d98d7b1496f60a6 /net
parentba78e2ddca844598c0efcbf2c76d73519a61b902 (diff)
downloadlinux-cece1945bffcf1a823cdfa36669beae118419351.tar.gz
linux-cece1945bffcf1a823cdfa36669beae118419351.tar.bz2
linux-cece1945bffcf1a823cdfa36669beae118419351.zip
net: disable preemption before call smp_processor_id()
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 2b508966146b..1ae654391442 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -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
{