From: Jason Wang <jasowang@redhat.com>
To: davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, mst@redhat.com
Cc: Jason Wang <jasowang@redhat.com>
Subject: [net-next rfc V2 1/8] macvtap: do not add self to waitqueue if doing a nonblock read
Date: Fri, 31 May 2013 17:53:18 +0800 [thread overview]
Message-ID: <1369994005-5943-2-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1369994005-5943-1-git-send-email-jasowang@redhat.com>
There's no need to add self to waitqueue if doing a nonblock read. This could
help to avoid the spinlock contention.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 59e9605..2395062 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -845,7 +845,9 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
ssize_t ret = 0;
while (len) {
- prepare_to_wait(sk_sleep(&q->sk), &wait, TASK_INTERRUPTIBLE);
+ if (!noblock)
+ prepare_to_wait(sk_sleep(&q->sk), &wait,
+ TASK_INTERRUPTIBLE);
/* Read frames from the queue */
skb = skb_dequeue(&q->sk.sk_receive_queue);
@@ -867,7 +869,8 @@ static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
break;
}
- finish_wait(sk_sleep(&q->sk), &wait);
+ if (!noblock)
+ finish_wait(sk_sleep(&q->sk), &wait);
return ret;
}
--
1.7.1
next prev parent reply other threads:[~2013-05-31 10:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 9:53 [net-next rfc V2 0/8] Multiqueue API for macvtap Jason Wang
2013-05-31 9:53 ` Jason Wang [this message]
2013-05-31 9:53 ` [net-next rfc V2 2/8] macvlan: switch to use IS_ENABLED() Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 3/8] macvtap: introduce macvtap_get_vlan() Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 4/8] macvlan: change the max number of queues to 16 Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 5/8] macvtap: eliminate linear search Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 6/8] macvtap: allow TUNSETIFF to create multiqueue device Jason Wang
2013-05-31 14:48 ` Sergei Shtylyov
2013-06-03 3:05 ` Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 7/8] macvtap: add TUNSETQUEUE ioctl Jason Wang
2013-06-02 11:22 ` Michael S. Tsirkin
2013-06-03 5:20 ` Jason Wang
2013-06-03 11:09 ` Michael S. Tsirkin
2013-06-04 5:54 ` Jason Wang
2013-06-04 7:05 ` Michael S. Tsirkin
2013-06-05 3:01 ` Jason Wang
2013-05-31 9:53 ` [net-next rfc V2 8/8] macvtap: enable multiqueue flag 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=1369994005-5943-2-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.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).