From: Stefan Hajnoczi <stefanha@gmail.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 12/13] net: EAGAIN handling for net/socket.c UDP
Date: Fri, 14 Sep 2012 09:46:59 +0100 [thread overview]
Message-ID: <1347612420-5704-13-git-send-email-stefanha@gmail.com> (raw)
In-Reply-To: <1347612420-5704-1-git-send-email-stefanha@gmail.com>
From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Implement asynchronous send for UDP (or other SOCK_DGRAM) sockets. If
send fails with EAGAIN we wait for the socket to become writable again.
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
net/socket.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/net/socket.c b/net/socket.c
index 7bff536..aabf0a4 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -102,9 +102,19 @@ static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf, size_t
static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t *buf, size_t size)
{
NetSocketState *s = DO_UPCAST(NetSocketState, nc, nc);
+ ssize_t ret;
- return sendto(s->fd, (const void *)buf, size, 0,
- (struct sockaddr *)&s->dgram_dst, sizeof(s->dgram_dst));
+ do {
+ ret = sendto(s->fd, buf, size, 0,
+ (struct sockaddr *)&s->dgram_dst,
+ sizeof(s->dgram_dst));
+ } while (ret == -1 && errno == EINTR);
+
+ if (ret == -1 && errno == EAGAIN) {
+ net_socket_write_poll(s, true);
+ return 0;
+ }
+ return ret;
}
static void net_socket_send(void *opaque)
--
1.7.10.4
next prev parent reply other threads:[~2012-09-14 8:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 8:46 [Qemu-devel] [PULL 00/13] Net patches Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 01/13] net: notify iothread after flushing queue Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 02/13] e1000: flush queue whenever can_receive can go from false to true Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 03/13] xen: flush queue when getting an event Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 04/13] eepro100: Fix network hang when rx buffers run out Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 05/13] net: add receive_disabled logic to iov delivery path Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 06/13] net: do not report queued packets as sent Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 07/13] net: add -netdev options to man page Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 08/13] net: clean up usbnet_receive() Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 09/13] net: fix usbnet_receive() packet drops Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 10/13] net: broadcast hub packets if at least one port can receive Stefan Hajnoczi
2012-09-14 8:46 ` [Qemu-devel] [PATCH 11/13] net: asynchronous send/receive infrastructure for net/socket.c Stefan Hajnoczi
2012-09-14 8:46 ` Stefan Hajnoczi [this message]
2012-09-14 8:47 ` [Qemu-devel] [PATCH 13/13] net: EAGAIN handling for net/socket.c TCP Stefan Hajnoczi
2012-09-17 18:19 ` [Qemu-devel] [PULL 00/13] Net patches Anthony Liguori
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=1347612420-5704-13-git-send-email-stefanha@gmail.com \
--to=stefanha@gmail.com \
--cc=aliguori@us.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.com \
/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).