Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6862baa authored by Toshiaki Makita's avatar Toshiaki Makita Committed by Greg Kroah-Hartman
Browse files

virtio_net: Don't enable NAPI when interface is down 



[ Upstream commit 8be4d9a492f88b96d4d3a06c6cbedbc40ca14c83 ]

Commit 4e09ff53 ("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: 4941d472 ("virtio-net: do not reset during XDP set")
Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37b34a91

drivers/net/virtio_net.c

+4 −2
Original line number Diff line number Diff line
@@ -2380,8 +2380,10 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, 
	return 0;



err:

	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;