Commit 986a9304 authored by Joe Damato's avatar Joe Damato Committed by Jakub Kicinski
Browse files

virtio-net: Refactor napi_disable paths 



Create virtnet_napi_disable helper and refactor virtnet_napi_tx_disable
to take a struct send_queue.

Signed-off-by: default avatarJoe Damato <jdamato@fastly.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://patch.msgid.link/20250307011215.266806-3-jdamato@fastly.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2af5adf9

drivers/net/virtio_net.c

+17 −8
Original line number Diff line number Diff line
@@ -2845,12 +2845,21 @@ static void virtnet_napi_tx_enable(struct send_queue *sq) 
	virtnet_napi_do_enable(sq->vq, napi);

}



static void virtnet_napi_tx_disable(struct napi_struct *napi)

static void virtnet_napi_tx_disable(struct send_queue *sq)

{

	struct napi_struct *napi = &sq->napi;



	if (napi->weight)

		napi_disable(napi);

}



static void virtnet_napi_disable(struct receive_queue *rq)

{

	struct napi_struct *napi = &rq->napi;



	napi_disable(napi);

}



static void refill_work(struct work_struct *work)

{

	struct virtnet_info *vi =
@@ -2861,7 +2870,7 @@ static void refill_work(struct work_struct *work) 
	for (i = 0; i < vi->curr_queue_pairs; i++) {

		struct receive_queue *rq = &vi->rq[i];



		napi_disable(&rq->napi);

		virtnet_napi_disable(rq);

		still_empty = !try_fill_recv(vi, rq, GFP_KERNEL);

		virtnet_napi_enable(rq);
@@ -3060,8 +3069,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget) 


static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index)

{

	virtnet_napi_tx_disable(&vi->sq[qp_index].napi);

	napi_disable(&vi->rq[qp_index].napi);

	virtnet_napi_tx_disable(&vi->sq[qp_index]);

	virtnet_napi_disable(&vi->rq[qp_index]);

	xdp_rxq_info_unreg(&vi->rq[qp_index].xdp_rxq);

}
@@ -3333,7 +3342,7 @@ static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue *rq) 
	bool running = netif_running(vi->dev);



	if (running) {

		napi_disable(&rq->napi);

		virtnet_napi_disable(rq);

		virtnet_cancel_dim(vi, &rq->dim);

	}

}
@@ -3375,7 +3384,7 @@ static void virtnet_tx_pause(struct virtnet_info *vi, struct send_queue *sq) 
	qindex = sq - vi->sq;



	if (running)

		virtnet_napi_tx_disable(&sq->napi);

		virtnet_napi_tx_disable(sq);



	txq = netdev_get_tx_queue(vi->dev, qindex);
@@ -5952,8 +5961,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, 
	/* Make sure NAPI is not using any XDP TX queues for RX. */

	if (netif_running(dev)) {

		for (i = 0; i < vi->max_queue_pairs; i++) {

			napi_disable(&vi->rq[i].napi);

			virtnet_napi_tx_disable(&vi->sq[i].napi);

			virtnet_napi_disable(&vi->rq[i]);

			virtnet_napi_tx_disable(&vi->sq[i]);

		}

	}