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
Cc: Jason Wang <jasowang@redhat.com>
Subject: [PATCH net-next 8/8] vhost_net: use lockless peeking for skb array during busy polling
Date: Tue, 21 Mar 2017 12:04:47 +0800 [thread overview]
Message-ID: <1490069087-4783-9-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1490069087-4783-1-git-send-email-jasowang@redhat.com>
For the socket that exports its skb array, we can use lockless polling
to avoid touching spinlock during busy polling.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/vhost/net.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 53f09f2..41153a3 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -551,10 +551,13 @@ static int peek_head_len(struct vhost_net_virtqueue *rvq, struct sock *sk)
return len;
}
-static int sk_has_rx_data(struct sock *sk)
+static int sk_has_rx_data(struct vhost_net_virtqueue *rvq, struct sock *sk)
{
struct socket *sock = sk->sk_socket;
+ if (rvq->rx_array)
+ return !__skb_array_empty(rvq->rx_array);
+
if (sock->ops->peek_len)
return sock->ops->peek_len(sock);
@@ -579,7 +582,7 @@ static int vhost_net_rx_peek_head_len(struct vhost_net *net,
endtime = busy_clock() + vq->busyloop_timeout;
while (vhost_can_busy_poll(&net->dev, endtime) &&
- !sk_has_rx_data(sk) &&
+ !sk_has_rx_data(rvq, sk) &&
vhost_vq_avail_empty(&net->dev, vq))
cpu_relax();
--
2.7.4
next prev parent reply other threads:[~2017-03-21 4:12 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 4:04 [PATCH net-next 0/8] vhost-net rx batching Jason Wang
2017-03-21 4:04 ` [PATCH net-next 1/8] ptr_ring: introduce batch dequeuing Jason Wang
2017-03-21 10:25 ` Sergei Shtylyov
2017-03-22 3:16 ` Jason Wang
2017-03-22 13:43 ` Michael S. Tsirkin
2017-03-23 5:33 ` Jason Wang
2017-03-21 4:04 ` [PATCH net-next 2/8] skb_array: " Jason Wang
2017-03-21 4:04 ` [PATCH net-next 3/8] tun: export skb_array Jason Wang
2017-03-21 4:04 ` [PATCH net-next 4/8] tap: " Jason Wang
2017-03-21 4:04 ` [PATCH net-next 5/8] tun: support receiving skb through msg_control Jason Wang
2017-03-21 4:04 ` [PATCH net-next 6/8] tap: support receiving skb from msg_control Jason Wang
2017-03-21 4:04 ` [PATCH net-next 7/8] vhost_net: try batch dequing from skb array Jason Wang
2017-03-22 14:16 ` Michael S. Tsirkin
2017-03-23 5:34 ` Jason Wang
2017-03-29 9:58 ` Jason Wang
2017-03-29 10:46 ` Pankaj Gupta
2017-03-29 10:53 ` Jason Wang
2017-03-29 21:47 ` Michael S. Tsirkin
2017-03-21 4:04 ` Jason Wang [this message]
2017-03-29 12:07 ` [PATCH net-next 8/8] vhost_net: use lockless peeking for skb array during busy polling Michael S. Tsirkin
2017-03-30 2:16 ` Jason Wang
2017-03-30 2:33 ` Michael S. Tsirkin
2017-03-30 3:53 ` 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=1490069087-4783-9-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).