Patch-mainline: v6.2-rc7

Git-commit: 63b114042d8a9c02d9939889177c36dbdb17a588

References: git-fixes

From: Parav Pandit <parav@nvidia.com>

Date: Thu, 2 Feb 2023 18:35:16 +0200

Subject: [PATCH] virtio-net: Keep stop() to follow mirror sequence of open()

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: 754b8a21a96d ("virtio_net: setup xdp_rxq_info")

Acked-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>

Signed-off-by: Parav Pandit <parav@nvidia.com>

Link: https://lore.kernel.org/r/20230202163516.12559-1-parav@nvidia.com

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Signed-off-by: Juergen Gross <jgross@suse.com>

---

 drivers/net/virtio_net.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c

index 6df14dd5bf46..61e33e4dd0cd 100644

--- a/drivers/net/virtio_net.c

+++ b/drivers/net/virtio_net.c

@@ -2158,8 +2158,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);

 	}

-- 

2.35.3