Thread (17 messages) read the whole thread 17 messages, 4 authors, 2017-03-08

Re: [PATCH net-next RFC 4/4] virtio-net: clean tx descriptors from rx napi

From: Jason Wang <hidden>
Date: 2017-03-06 09:34:27


On 2017年03月03日 22:39, Willem de Bruijn wrote:
quoted hunk ↗ jump to hunk
From: Willem de Bruijn <willemb@google.com>

Amortize the cost of virtual interrupts by doing both rx and tx work
on reception of a receive interrupt. Together VIRTIO_F_EVENT_IDX and
vhost interrupt moderation, this suppresses most explicit tx
completion interrupts for bidirectional workloads.

Signed-off-by: Willem de Bruijn <willemb@google.com>
---
  drivers/net/virtio_net.c | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 9a9031640179..21c575127d50 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1031,6 +1031,23 @@ static int virtnet_receive(struct receive_queue *rq, int budget)
  	return received;
  }
  
+static unsigned int free_old_xmit_skbs(struct send_queue *sq, int budget);
+
+static void virtnet_poll_cleantx(struct receive_queue *rq)
+{
+	struct virtnet_info *vi = rq->vq->vdev->priv;
+	unsigned int index = vq2rxq(rq->vq);
+	struct send_queue *sq = &vi->sq[index];
+	struct netdev_queue *txq = netdev_get_tx_queue(vi->dev, index);
+
+	__netif_tx_lock(txq, smp_processor_id());
+	free_old_xmit_skbs(sq, sq->napi.weight);
+	__netif_tx_unlock(txq);
Should we check tx napi weight here? Or this was treated as an 
independent optimization?
quoted hunk ↗ jump to hunk
+
+	if (sq->vq->num_free >= 2 + MAX_SKB_FRAGS)
+		netif_wake_subqueue(vi->dev, vq2txq(sq->vq));
+}
+
  static int virtnet_poll(struct napi_struct *napi, int budget)
  {
  	struct receive_queue *rq =
@@ -1039,6 +1056,8 @@ static int virtnet_poll(struct napi_struct *napi, int budget)
  
  	received = virtnet_receive(rq, budget);
  
+	virtnet_poll_cleantx(rq);
+
Better to do the before virtnet_receive() consider refill may allocate 
memory for rx buffers.

Btw, if this is proved to be more efficient. In the future we may 
consider to:

1) use a single interrupt for both rx and tx
2) use a single napi to handle both rx and tx

Thanks
  	/* Out of packets? */
  	if (received < budget)
  		virtqueue_napi_complete(napi, rq->vq, received);
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help