From: Shirley Ma <mashirle@us.ibm.com>
To: David Miller <davem@davemloft.net>, mst@redhat.com
Cc: netdev@vger.kernel.org, jasowang@redhat.com
Subject: [PATCH net-next]vhost: fix condition check for # of outstanding dma buffers
Date: Tue, 19 Jul 2011 11:37:58 -0700 [thread overview]
Message-ID: <1311100678.8573.16.camel@localhost.localdomain> (raw)
Signed-off-by: Shirley Ma <xma@us.ibm.com>
---
drivers/vhost/net.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 70ac604..83cb738 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -189,8 +189,10 @@ static void handle_tx(struct vhost_net *net)
break;
}
/* If more outstanding DMAs, queue the work */
- if (unlikely(vq->upend_idx - vq->done_idx >
- VHOST_MAX_PEND)) {
+ if (unlikely((vq->upend_idx - vq->done_idx >
+ VHOST_MAX_PEND) ||
+ (vq->upend_idx - vq->done_idx >
+ VHOST_MAX_PEND - UIO_MAXIOV))) {
tx_poll_start(net, sock);
set_bit(SOCK_ASYNC_NOSPACE, &sock->flags);
break;
next reply other threads:[~2011-07-19 18:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-19 18:37 Shirley Ma [this message]
2011-07-19 19:09 ` [PATCH net-next]vhost: fix condition check for # of outstanding dma buffers Michael S. Tsirkin
2011-07-19 20:56 ` Shirley Ma
2011-07-20 10:28 ` Michael S. Tsirkin
2011-07-20 15:43 ` Shirley Ma
2011-07-20 16:17 ` Michael S. Tsirkin
2011-07-20 16:49 ` Shirley Ma
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=1311100678.8573.16.camel@localhost.localdomain \
--to=mashirle@us.ibm.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--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).