[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/13] net: add receive_disabled logic to iov delive
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 05/13] net: add receive_disabled logic to iov delivery path |
Date: |
Fri, 14 Sep 2012 09:46:52 +0100 |
From: Stefan Hajnoczi <address@hidden>
This patch adds the missing NetClient->receive_disabled logic in the
sendv delivery code path. It seems that commit
893379efd0e1b84ceb0c42a713293f3dbd27b1bd ("net: disable receiving if
client returns zero") only added the logic to qemu_deliver_packet() and
not qemu_deliver_packet_iov().
The receive_disabled flag should be automatically set when .receive(),
.receive_raw(), or .receive_iov() return 0. No further packets will be
delivered to the NetClient until the receive_disabled flag is cleared
again by calling qemu_flush_queued_packets().
Typically the NetClient will wait until its file descriptor becomes
writable and then invoke qemu_flush_queued_packets() to resume
transmission.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
net.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/net.c b/net.c
index d9ba1e5..a187a7b 100644
--- a/net.c
+++ b/net.c
@@ -423,16 +423,27 @@ ssize_t qemu_deliver_packet_iov(NetClientState *sender,
void *opaque)
{
NetClientState *nc = opaque;
+ int ret;
if (nc->link_down) {
return iov_size(iov, iovcnt);
}
+ if (nc->receive_disabled) {
+ return 0;
+ }
+
if (nc->info->receive_iov) {
- return nc->info->receive_iov(nc, iov, iovcnt);
+ ret = nc->info->receive_iov(nc, iov, iovcnt);
} else {
- return nc_sendv_compat(nc, iov, iovcnt);
+ ret = nc_sendv_compat(nc, iov, iovcnt);
}
+
+ if (ret == 0) {
+ nc->receive_disabled = 1;
+ }
+
+ return ret;
}
ssize_t qemu_sendv_packet_async(NetClientState *sender,
--
1.7.10.4
- [Qemu-devel] [PULL 00/13] Net patches, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PULL 00/13] Net patches, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 02/13] e1000: flush queue whenever can_receive can go from false to true, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 01/13] net: notify iothread after flushing queue, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 03/13] xen: flush queue when getting an event, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 04/13] eepro100: Fix network hang when rx buffers run out, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 05/13] net: add receive_disabled logic to iov delivery path,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 07/13] net: add -netdev options to man page, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 08/13] net: clean up usbnet_receive(), Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 06/13] net: do not report queued packets as sent, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 11/13] net: asynchronous send/receive infrastructure for net/socket.c, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 09/13] net: fix usbnet_receive() packet drops, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 12/13] net: EAGAIN handling for net/socket.c UDP, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 10/13] net: broadcast hub packets if at least one port can receive, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 13/13] net: EAGAIN handling for net/socket.c TCP, Stefan Hajnoczi, 2012/09/14
- Re: [Qemu-devel] [PULL 00/13] Net patches, Anthony Liguori, 2012/09/17