[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1311100678.8573.16.camel@localhost.localdomain>
Date: Tue, 19 Jul 2011 11:37:58 -0700
From: Shirley Ma <mashirle@...ibm.com>
To: David Miller <davem@...emloft.net>, mst@...hat.com
Cc: netdev@...r.kernel.org, jasowang@...hat.com
Subject: [PATCH net-next]vhost: fix condition check for # of outstanding
dma buffers
Signed-off-by: Shirley Ma <xma@...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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists