|
 |
5544c1b |
From eccdc01e744cf3a389a527406f4d529420133e89 Mon Sep 17 00:00:00 2001
|
|
|
5544c1b |
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
|
5544c1b |
Date: Fri, 17 Aug 2012 21:16:42 +0100
|
|
|
5544c1b |
Subject: [PATCH] net: add receive_disabled logic to iov delivery path
|
|
|
5544c1b |
|
|
|
5544c1b |
This patch adds the missing NetClient->receive_disabled logic in the
|
|
|
5544c1b |
sendv delivery code path. It seems that commit
|
|
|
5544c1b |
893379efd0e1b84ceb0c42a713293f3dbd27b1bd ("net: disable receiving if
|
|
|
5544c1b |
client returns zero") only added the logic to qemu_deliver_packet() and
|
|
|
5544c1b |
not qemu_deliver_packet_iov().
|
|
|
5544c1b |
|
|
|
5544c1b |
The receive_disabled flag should be automatically set when .receive(),
|
|
|
5544c1b |
.receive_raw(), or .receive_iov() return 0. No further packets will be
|
|
|
5544c1b |
delivered to the NetClient until the receive_disabled flag is cleared
|
|
|
5544c1b |
again by calling qemu_flush_queued_packets().
|
|
|
5544c1b |
|
|
|
5544c1b |
Typically the NetClient will wait until its file descriptor becomes
|
|
|
5544c1b |
writable and then invoke qemu_flush_queued_packets() to resume
|
|
|
5544c1b |
transmission.
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
|
5544c1b |
(cherry picked from commit c67f5dc10573687497f0f5c3aec19b15c35c63d7)
|
|
|
5544c1b |
|
|
|
5544c1b |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1b |
---
|
|
|
5544c1b |
net.c | 15 +++++++++++++--
|
|
|
5544c1b |
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
|
5544c1b |
|
|
|
5544c1b |
diff --git a/net.c b/net.c
|
|
|
5544c1b |
index 76a8336..1303819 100644
|
|
|
5544c1b |
--- a/net.c
|
|
|
5544c1b |
+++ b/net.c
|
|
|
5544c1b |
@@ -423,16 +423,27 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender,
|
|
|
5544c1b |
void *opaque)
|
|
|
5544c1b |
{
|
|
|
5544c1b |
NetClientState *nc = opaque;
|
|
|
5544c1b |
+ int ret;
|
|
|
5544c1b |
|
|
|
5544c1b |
if (nc->link_down) {
|
|
|
5544c1b |
return iov_size(iov, iovcnt);
|
|
|
5544c1b |
}
|
|
|
5544c1b |
|
|
|
5544c1b |
+ if (nc->receive_disabled) {
|
|
|
5544c1b |
+ return 0;
|
|
|
5544c1b |
+ }
|
|
|
5544c1b |
+
|
|
|
5544c1b |
if (nc->info->receive_iov) {
|
|
|
5544c1b |
- return nc->info->receive_iov(nc, iov, iovcnt);
|
|
|
5544c1b |
+ ret = nc->info->receive_iov(nc, iov, iovcnt);
|
|
|
5544c1b |
} else {
|
|
|
5544c1b |
- return nc_sendv_compat(nc, iov, iovcnt);
|
|
|
5544c1b |
+ ret = nc_sendv_compat(nc, iov, iovcnt);
|
|
|
5544c1b |
}
|
|
|
5544c1b |
+
|
|
|
5544c1b |
+ if (ret == 0) {
|
|
|
5544c1b |
+ nc->receive_disabled = 1;
|
|
|
5544c1b |
+ }
|
|
|
5544c1b |
+
|
|
|
5544c1b |
+ return ret;
|
|
|
5544c1b |
}
|
|
|
5544c1b |
|
|
|
5544c1b |
ssize_t qemu_sendv_packet_async(NetClientState *sender,
|