Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: dev: Remove preempt_disable() and get_cpu() in netif_rx_internal().

The preempt_disable() () section was introduced in commit
cece1945bffcf ("net: disable preemption before call smp_processor_id()")

and adds it in case this function is invoked from preemtible context and
because get_cpu() later on as been added.

The get_cpu() usage was added in commit
b0e28f1effd1d ("net: netif_rx() must disable preemption")

because ip_dev_loopback_xmit() invoked netif_rx() with enabled preemption
causing a warning in smp_processor_id(). The function netif_rx() should
only be invoked from an interrupt context which implies disabled
preemption. The commit
e30b38c298b55 ("ip: Fix ip_dev_loopback_xmit()")

was addressing this and replaced netif_rx() with in netif_rx_ni() in
ip_dev_loopback_xmit().

Based on the discussion on the list, the former patch (b0e28f1effd1d)
should not have been applied only the latter (e30b38c298b55).

Remove get_cpu() and preempt_disable() since the function is supposed to
be invoked from context with stable per-CPU pointers. Bottom halves have
to be disabled at this point because the function may raise softirqs
which need to be processed.

Link: https://lkml.kernel.org/r/20100415.013347.98375530.davem@davemloft.net
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sebastian Andrzej Siewior and committed by
David S. Miller
f234ae29 88f62aea

+1 -4
+1 -4
net/core/dev.c
··· 4796 4796 struct rps_dev_flow voidflow, *rflow = &voidflow; 4797 4797 int cpu; 4798 4798 4799 - preempt_disable(); 4800 4799 rcu_read_lock(); 4801 4800 4802 4801 cpu = get_rps_cpu(skb->dev, skb, &rflow); ··· 4805 4806 ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); 4806 4807 4807 4808 rcu_read_unlock(); 4808 - preempt_enable(); 4809 4809 } else 4810 4810 #endif 4811 4811 { 4812 4812 unsigned int qtail; 4813 4813 4814 - ret = enqueue_to_backlog(skb, get_cpu(), &qtail); 4815 - put_cpu(); 4814 + ret = enqueue_to_backlog(skb, smp_processor_id(), &qtail); 4816 4815 } 4817 4816 return ret; 4818 4817 }