From: Parav Pandit Date: Thu, 2 Feb 2023 16:35:16 +0000 (+0200) Subject: virtio-net: Keep stop() to follow mirror sequence of open() X-Git-Tag: baikal/aarch64/sdk6.1~123 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=e8fa9c3f320944dca6aeba2f53e85400b96b652c;p=kernel.git virtio-net: Keep stop() to follow mirror sequence of open() [ Upstream commit 63b114042d8a9c02d9939889177c36dbdb17a588 ] Cited commit in fixes tag frees rxq xdp info while RQ NAPI is still enabled and packet processing may be ongoing. Follow the mirror sequence of open() in the stop() callback. This ensures that when rxq info is unregistered, no rx packet processing is ongoing. Fixes: 25f20fd3dd78 ("virtio_net: setup xdp_rxq_info") Acked-by: Michael S. Tsirkin Reviewed-by: Jiri Pirko Signed-off-by: Parav Pandit Link: https://lore.kernel.org/r/20230202163516.12559-1-parav@nvidia.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec388932aacf1..20b1b34a092ad 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2154,8 +2154,8 @@ static int virtnet_close(struct net_device *dev) cancel_delayed_work_sync(&vi->refill); for (i = 0; i < vi->max_queue_pairs; i++) { - xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq); napi_disable(&vi->rq[i].napi); + xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq); virtnet_napi_tx_disable(&vi->sq[i].napi); }