virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, kvm@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH V2 2/6] vhost_net: use vhost_add_used_and_signal_n() in vhost_zerocopy_signal_used()
Date: Fri, 30 Aug 2013 12:29:18 +0800	[thread overview]
Message-ID: <1377836962-49780-3-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1377836962-49780-1-git-send-email-jasowang@redhat.com>

We tend to batch the used adding and signaling in vhost_zerocopy_callback()
which may result more than 100 used buffers to be updated in
vhost_zerocopy_signal_used() in some cases. So wwitch to use
vhost_add_used_and_signal_n() to avoid multiple calls to
vhost_add_used_and_signal(). Which means much more less times of used index
updating and memory barriers.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/vhost/net.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 280ee66..8a6dd0d 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -281,7 +281,7 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net,
 {
 	struct vhost_net_virtqueue *nvq =
 		container_of(vq, struct vhost_net_virtqueue, vq);
-	int i;
+	int i, add;
 	int j = 0;
 
 	for (i = nvq->done_idx; i != nvq->upend_idx; i = (i + 1) % UIO_MAXIOV) {
@@ -289,14 +289,17 @@ static void vhost_zerocopy_signal_used(struct vhost_net *net,
 			vhost_net_tx_err(net);
 		if (VHOST_DMA_IS_DONE(vq->heads[i].len)) {
 			vq->heads[i].len = VHOST_DMA_CLEAR_LEN;
-			vhost_add_used_and_signal(vq->dev, vq,
-						  vq->heads[i].id, 0);
 			++j;
 		} else
 			break;
 	}
-	if (j)
-		nvq->done_idx = i;
+	while (j) {
+		add = min(UIO_MAXIOV - nvq->done_idx, j);
+		vhost_add_used_and_signal_n(vq->dev, vq,
+					    &vq->heads[nvq->done_idx], add);
+		nvq->done_idx = (nvq->done_idx + add) % UIO_MAXIOV;
+		j -= add;
+	}
 }
 
 static void vhost_zerocopy_callback(struct ubuf_info *ubuf, bool success)
-- 
1.7.1

  parent reply	other threads:[~2013-08-30  4:29 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30  4:29 [PATCH V2 0/6] vhost code cleanup and minor enhancement Jason Wang
2013-08-30  4:29 ` [PATCH V2 1/6] vhost_net: make vhost_zerocopy_signal_used() returns void Jason Wang
2013-09-02  5:51   ` Michael S. Tsirkin
2013-09-02  6:29     ` Jason Wang
2013-08-30  4:29 ` Jason Wang [this message]
2013-09-02  5:50   ` [PATCH V2 2/6] vhost_net: use vhost_add_used_and_signal_n() in vhost_zerocopy_signal_used() Michael S. Tsirkin
2013-09-02  6:28     ` Jason Wang
2013-08-30  4:29 ` [PATCH V2 3/6] vhost: switch to use vhost_add_used_n() Jason Wang
2013-08-30  4:29 ` [PATCH V2 4/6] vhost_net: determine whether or not to use zerocopy at one time Jason Wang
2013-08-30 18:35   ` Sergei Shtylyov
2013-09-02  3:15     ` Jason Wang
2013-08-30  4:29 ` [PATCH V2 5/6] vhost_net: poll vhost queue after marking DMA is done Jason Wang
2013-08-30 16:44   ` Ben Hutchings
2013-09-02  3:06     ` Jason Wang
2014-02-12  7:38   ` Qin Chuanyu
     [not found]   ` <52FB24EA.3060001@huawei.com>
2014-02-12 10:06     ` Jason Wang
2014-02-12 16:01     ` Michael S. Tsirkin
2013-08-30  4:29 ` [PATCH V2 6/6] vhost_net: correctly limit the max pending buffers Jason Wang
2013-09-02  5:56   ` Michael S. Tsirkin
2013-09-02  6:30     ` Jason Wang
2013-09-02  8:37       ` Jason Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377836962-49780-3-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).