diff options
| author | Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp> | 2019-01-29 01:45:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-30 23:02:43 +0100 |
| commit | 8be4d9a492f88b96d4d3a06c6cbedbc40ca14c83 (patch) | |
| tree | adb4a58955d6ca3dc7674da78d0c3f04069ffa09 /drivers/net | |
| parent | Merge branch 'erspan-always-reports-output-key-to-userspace' (diff) | |
| download | linux-8be4d9a492f88b96d4d3a06c6cbedbc40ca14c83.tar.xz linux-8be4d9a492f88b96d4d3a06c6cbedbc40ca14c83.zip | |
virtio_net: Don't enable NAPI when interface is down
Commit 4e09ff536284 ("virtio-net: disable NAPI only when enabled during
XDP set") tried to fix inappropriate NAPI enabling/disabling when
!netif_running(), but was not complete.
On error path virtio_net could enable NAPI even when !netif_running().
This can cause enabling NAPI twice on virtnet_open(), which would
trigger BUG_ON() in napi_enable().
Fixes: 4941d472bf95b ("virtio-net: do not reset during XDP set")
Signed-off-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/virtio_net.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 8fadd8eaf601..8e4c5d432206 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2430,8 +2430,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, return 0; err: - for (i = 0; i < vi->max_queue_pairs; i++) - virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi); + if (netif_running(dev)) { + for (i = 0; i < vi->max_queue_pairs; i++) + virtnet_napi_enable(vi->rq[i].vq, &vi->rq[i].napi); + } if (prog) bpf_prog_sub(prog, vi->max_queue_pairs - 1); return err; |