diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2021-06-17 09:38:17 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-21 12:08:02 -0700 |
| commit | 2b4cd14fd995e0a863b2ced4cba0bcd804d89ebc (patch) | |
| tree | 16766a5a25d3999bc9cb777ea105c9fbfc7b6278 /net/core | |
| parent | 89837eb4b2463c556a123437f242d6c2bc62ce81 (diff) | |
| download | linux-2b4cd14fd995e0a863b2ced4cba0bcd804d89ebc.tar.bz2 | |
net/netif_receive_skb_core: Use migrate_disable()
The preempt disable around do_xdp_generic() has been introduced in
commit
bbbe211c295ff ("net: rcu lock and preempt disable missing around generic xdp")
For BPF it is enough to use migrate_disable() and the code was updated
as it can be seen in commit
3c58482a382ba ("bpf: Provide bpf_prog_run_pin_on_cpu() helper")
This is a leftover which was not converted.
Use migrate_disable() before invoking do_xdp_generic().
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ef8cf7619baf..439faadab0c2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5277,9 +5277,9 @@ another_round: if (static_branch_unlikely(&generic_xdp_needed_key)) { int ret2; - preempt_disable(); + migrate_disable(); ret2 = do_xdp_generic(rcu_dereference(skb->dev->xdp_prog), skb); - preempt_enable(); + migrate_enable(); if (ret2 != XDP_PASS) { ret = NET_RX_DROP; |