Skip to content

Commit f234ae2

Browse files
Sebastian Andrzej Siewiordavem330
authored andcommitted
net: dev: Remove preempt_disable() and get_cpu() in netif_rx_internal().
The preempt_disable() () section was introduced in commit cece194 ("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 b0e28f1 ("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 e30b38c ("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 (b0e28f1) should not have been applied only the latter (e30b38c). 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/[email protected] Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Reviewed-by: Toke Høiland-Jørgensen <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 88f62ae commit f234ae2

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

net/core/dev.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4796,7 +4796,6 @@ static int netif_rx_internal(struct sk_buff *skb)
47964796
struct rps_dev_flow voidflow, *rflow = &voidflow;
47974797
int cpu;
47984798

4799-
preempt_disable();
48004799
rcu_read_lock();
48014800

48024801
cpu = get_rps_cpu(skb->dev, skb, &rflow);
@@ -4806,14 +4805,12 @@ static int netif_rx_internal(struct sk_buff *skb)
48064805
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
48074806

48084807
rcu_read_unlock();
4809-
preempt_enable();
48104808
} else
48114809
#endif
48124810
{
48134811
unsigned int qtail;
48144812

4815-
ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
4816-
put_cpu();
4813+
ret = enqueue_to_backlog(skb, smp_processor_id(), &qtail);
48174814
}
48184815
return ret;
48194816
}

0 commit comments

Comments
 (0)