monitor: do not rely on O_NONBLOCK for passed file descriptors
Subsystems (3)
cover monitor: do not rely on O_NONBLOCK for passed file descriptors
Backported to QEMU 1.4 stable branch.
Original series:
http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.html
Stefan Hajnoczi (4):
oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
net: ensure "socket" backend uses non-blocking fds
qemu-socket: set passed fd non-blocking in socket_connect()
chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors
block/nbd.c | 2 +- block/sheepdog.c | 6 +++--- include/qemu/sockets.h | 4 ++-- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 2 +- nbd.c | 8 ++++---- net/socket.c | 13 +++++++++---- qemu-char.c | 11 +++++++---- slirp/misc.c | 2 +- slirp/tcp_subr.c | 4 ++-- ui/vnc.c | 2 +- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 4 ++-- util/qemu-sockets.c | 5 +++-- 15 files changed, 40 insertions(+), 31 deletions(-)
Signature · 1 line
1.8.1.4
PATCH 1/4 oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
The fcntl(fd, F_SETFL, O_NONBLOCK) flag is not specific to sockets. Rename to qemu_set_nonblock() just like qemu_set_cloexec().
--- block/nbd.c | 2 +- block/sheepdog.c | 6 +++--- include/qemu/sockets.h | 4 ++-- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 2 +- nbd.c | 8 ++++---- net/socket.c | 6 +++--- qemu-char.c | 8 ++++---- slirp/misc.c | 2 +- slirp/tcp_subr.c | 4 ++-- ui/vnc.c | 2 +- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 4 ++-- util/qemu-sockets.c | 4 ++-- 15 files changed, 30 insertions(+), 30 deletions(-)
block/nbd.c +1 -1
@@ -350,7 +350,7 @@ static int nbd_establish_connection(BlockDriverState *bs)/* Now that we're connected, set the socket to be non-blocking and * kick the reply mechanism. */ -socket_set_nonblock (sock); +qemu_set_nonblock (sock);qemu_aio_set_fd_handler (sock, nbd_reply_ready,NULL , nbd_have_request, s);
block/sheepdog.c +3 -3
@@ -549,7 +549,7 @@ static coroutine_fn void do_co_req(void *opaque) co =qemu_coroutine_self ();qemu_aio_set_fd_handler (sockfd,NULL , restart_co_req,NULL , co); -socket_set_block (sockfd); +qemu_set_block (sockfd); ret =send_co_req (sockfd, hdr, data, wlen);if (ret <0 ) { goto out;
@@ -579,7 +579,7 @@ static coroutine_fn void do_co_req(void *opaque) ret =0 ; out:qemu_aio_set_fd_handler (sockfd,NULL ,NULL ,NULL ,NULL ); -socket_set_nonblock (sockfd); +qemu_set_nonblock (sockfd); srco->ret = ret; srco->finished = true;
@@ -812,7 +812,7 @@ static int get_sheep_fd(BDRVSheepdogState *s)return fd; } -socket_set_nonblock (fd); +qemu_set_nonblock (fd); ret =set_nodelay (fd);if (ret) {
include/qemu/sockets.h +2 -2
@@ -34,8 +34,8 @@ int inet_aton(const char *cp, struct in_addr *ia);int qemu_socket (int domain,int type,int protocol);int qemu_accept (int s,struct sockaddr *addr,socklen_t *addrlen);int socket_set_cork (int fd,int v); -void socket_set_block (int fd); -void socket_set_nonblock (int fd); +void qemu_set_block (int fd); +void qemu_set_nonblock (int fd);int send_all (int fd,const void *buf,int len1);/* callback function for nonblocking connect
migration-tcp.c +1 -1
@@ -60,7 +60,7 @@ static void tcp_wait_for_connect(int fd, void *opaque) }else {DPRINTF ("migrate connect success\n" ); s->fd = fd; -socket_set_block (s->fd); +qemu_set_block (s->fd);migrate_fd_connect (s); } }
migration-unix.c +1 -1
@@ -60,7 +60,7 @@ static void unix_wait_for_connect(int fd, void *opaque) }else {DPRINTF ("migrate connect success\n" ); s->fd = fd; -socket_set_block (s->fd); +qemu_set_block (s->fd);migrate_fd_connect (s); } }
migration.c +1 -1
@@ -120,7 +120,7 @@ void process_incoming_migration(QEMUFile *f)int fd =qemu_get_fd (f);assert (fd !=-1 ); -socket_set_nonblock (fd); +qemu_set_nonblock (fd);qemu_coroutine_enter (co, f); }
nbd.c +4 -4
@@ -393,7 +393,7 @@ static int nbd_send_negotiate(NBDClient *client)[28 .. 151] reserved (0) */ -socket_set_block (csock); +qemu_set_block (csock); rc = -EINVAL ;TRACE ("Beginning negotiation." );
@@ -436,7 +436,7 @@ static int nbd_send_negotiate(NBDClient *client)TRACE ("Negotiation succeeded." ); rc =0 ; fail: -socket_set_nonblock (csock); +qemu_set_nonblock (csock);return rc; }
@@ -450,7 +450,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags,TRACE ("Receiving negotiation." ); -socket_set_block (csock); +qemu_set_block (csock); rc = -EINVAL ;if (read_sync (csock, buf,8 ) !=8 ) {
@@ -565,7 +565,7 @@ int nbd_receive_negotiate(int csock, const char *name, uint32_t *flags, rc =0 ; fail: -socket_set_nonblock (csock); +qemu_set_nonblock (csock);return rc; }
net/socket.c +3 -3
@@ -309,7 +309,7 @@ static int net_socket_mcast_create(struct sockaddr_in *mcastaddr, struct in_addr } } -socket_set_nonblock (fd); +qemu_set_nonblock (fd);return fd; fail:if (fd >=0 )
@@ -517,7 +517,7 @@ static int net_socket_listen_init(NetClientState *peer,perror ("socket" );return -1 ; } -socket_set_nonblock (fd); +qemu_set_nonblock (fd);/* allow fast reuse */ val =1 ;
@@ -563,7 +563,7 @@ static int net_socket_connect_init(NetClientState *peer,perror ("socket" );return -1 ; } -socket_set_nonblock (fd); +qemu_set_nonblock (fd); connected =0 ;for (;;) {
qemu-char.c +4 -4
@@ -2377,7 +2377,7 @@ static int tcp_chr_add_client(CharDriverState *chr, int fd)if (s->fd !=-1 )return -1 ; -socket_set_nonblock (fd); +qemu_set_nonblock (fd);if (s->do_nodelay)socket_set_nodelay (fd); s->fd = fd;
@@ -2512,7 +2512,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay,printf ("QEMU waiting for connection on: %s\n" , chr->filename);tcp_chr_accept (chr); -socket_set_nonblock (s->listen_fd); +qemu_set_nonblock (s->listen_fd); }return chr; }
@@ -2554,7 +2554,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) }if (!is_waitconnect) -socket_set_nonblock (fd); +qemu_set_nonblock (fd); chr =qemu_chr_open_socket_fd (fd, do_nodelay, is_listen, is_telnet, is_waitconnect, &local_err);
@@ -3328,7 +3328,7 @@ static CharDriverState *qmp_chardev_open_serial(ChardevHostdev *serial,if (error_is_set (errp)) {return NULL ; } -socket_set_nonblock (fd); +qemu_set_nonblock (fd);return qemu_chr_open_tty_fd (fd);#else error_setg (errp,"character device backend type 'serial' not supported" );
slirp/misc.c +1 -1
@@ -215,7 +215,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)setsockopt (so->s,SOL_SOCKET ,SO_REUSEADDR , (char *)&opt,sizeof (int )); opt =1 ;setsockopt (so->s,SOL_SOCKET ,SO_OOBINLINE , (char *)&opt,sizeof (int )); -socket_set_nonblock (so->s); +qemu_set_nonblock (so->s);/* Append the telnet options now */ if (so->so_m !=NULL && do_pty ==1 ) {
slirp/tcp_subr.c +2 -2
@@ -336,7 +336,7 @@ int tcp_fconnect(struct socket *so)int opt, s=so->s;struct sockaddr_in addr; -socket_set_nonblock (s); +qemu_set_nonblock (s); opt =1 ;setsockopt (s,SOL_SOCKET ,SO_REUSEADDR ,(char *)&opt,sizeof (opt )); opt =1 ;
@@ -424,7 +424,7 @@ tcp_connect(struct socket *inso)tcp_close (sototcpcb (so));/* This will sofree() as well */ return ; } -socket_set_nonblock (s); +qemu_set_nonblock (s); opt =1 ;setsockopt (s,SOL_SOCKET ,SO_REUSEADDR ,(char *)&opt,sizeof (int )); opt =1 ;
ui/vnc.c +1 -1
@@ -2726,7 +2726,7 @@ static void vnc_connect(VncDisplay *vd, int csock, int skipauth, bool websocket)VNC_DEBUG ("New client on socket %d\n" , csock); dcl->idle =0 ; -socket_set_nonblock (vs->csock); +qemu_set_nonblock (vs->csock);#ifdef CONFIG_VNC_WS if (websocket) { vs->websocket =1 ;
util/oslib-posix.c +2 -2
@@ -134,14 +134,14 @@ void qemu_vfree(void *ptr)free (ptr); } -void socket_set_block (int fd) +void qemu_set_block (int fd) {int f; f =fcntl (fd,F_GETFL );fcntl (fd,F_SETFL , f & ~O_NONBLOCK ); } -void socket_set_nonblock (int fd) +void qemu_set_nonblock (int fd) {int f; f =fcntl (fd,F_GETFL );
util/oslib-win32.c +2 -2
@@ -100,14 +100,14 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)return p; } -void socket_set_block (int fd) +void qemu_set_block (int fd) {unsigned long opt =0 ;WSAEventSelect (fd,NULL ,0 );ioctlsocket (fd,FIONBIO , &opt); } -void socket_set_nonblock (int fd) +void qemu_set_nonblock (int fd) {unsigned long opt =1 ;ioctlsocket (fd,FIONBIO , &opt);
util/qemu-sockets.c +2 -2
@@ -277,7 +277,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress, }qemu_setsockopt (sock,SOL_SOCKET ,SO_REUSEADDR , &on,sizeof (on));if (connect_state !=NULL ) { -socket_set_nonblock (sock); +qemu_set_nonblock (sock); }/* connect to peer */ do {
@@ -733,7 +733,7 @@ int unix_connect_opts(QemuOpts *opts, Error **errp, connect_state =g_malloc0 (sizeof (*connect_state)); connect_state->callback = callback; connect_state->opaque = opaque; -socket_set_nonblock (sock); +qemu_set_nonblock (sock); }memset (&un,0 ,sizeof (un));
Signature · 1 line
1.8.1.4
PATCH 2/4 net: ensure "socket" backend uses non-blocking fds
In reply to Stefan HajnocziThere are several code paths in net_init_socket() depending on how the socket is created: file descriptor passing, UDP multicast, TCP, or UDP. Some of these support both listen and connect.
Not all code paths set the socket to non-blocking. This patch addresses the file descriptor passing and UDP cases which were missing socket_set_nonblock(fd) calls.
I considered moving socket_set_nonblock(fd) to a central location but it turns out the code paths are different enough to require non-blocking at different places.
--- net/socket.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
net/socket.c +6 -1
@@ -672,6 +672,7 @@ static int net_socket_udp_init(NetClientState *peer,closesocket (fd);return -1 ; } +qemu_set_nonblock (fd); s =net_socket_fd_init (peer, model, name, fd,0 );if (!s) {
@@ -710,7 +711,11 @@ int net_init_socket(const NetClientOptions *opts, const char *name,int fd; fd =monitor_handle_fd_param (cur_mon, sock->fd); -if (fd ==-1 || !net_socket_fd_init (peer,"socket" , name, fd,1 )) { +if (fd ==-1 ) { +return -1 ; + } +qemu_set_nonblock (fd); +if (!net_socket_fd_init (peer,"socket" , name, fd,1 )) {return -1 ; }return 0 ;
Signature · 1 line
1.8.1.4
PATCH 3/4 qemu-socket: set passed fd non-blocking in socket_connect()
In reply to Stefan Hajnoczisocket_connect() sets non-blocking on TCP or UNIX domain sockets if a callback function is passed. Do the same for file descriptor passing, otherwise we could unexpectedly be using a blocking file descriptor.
--- util/qemu-sockets.c | 1 + 1 file changed, 1 insertion(+)
util/qemu-sockets.c +1 -0
@@ -906,6 +906,7 @@ int socket_connect(SocketAddress *addr, Error **errp,case SOCKET_ADDRESS_KIND_FD : fd =monitor_get_fd (cur_mon, addr->fd->str, errp);if (callback) { +qemu_set_nonblock (fd);callback (fd, opaque); }break ;
Signature · 1 line
1.8.1.4
PATCH 4/4 chardev: clear O_NONBLOCK on SCM_RIGHTS file descriptors
In reply to Stefan HajnocziWhen we receive a file descriptor over a UNIX domain socket the O_NONBLOCK flag is preserved. Clear the O_NONBLOCK flag and rely on QEMU file descriptor users like migration, SPICE, VNC, block layer, and others to set non-blocking only when necessary.
This change ensures we don't accidentally expose O_NONBLOCK in the QMP API. QMP clients should not need to get the non-blocking state "correct".
A recent real-world example was when libvirt passed a non-blocking TCP socket for migration where we expected a blocking socket. The source QEMU produced a corrupted migration stream since its code did not cope with non-blocking sockets.
--- qemu-char.c | 3 +++ 1 file changed, 3 insertions(+)
qemu-char.c +3 -0
@@ -2252,6 +2252,9 @@ static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg)if (fd <0 )continue ; +/* O_NONBLOCK is preserved across SCM_RIGHTS so reset it */ +qemu_set_block (fd); +#ifndef MSG_CMSG_CLOEXEC qemu_set_cloexec (fd);#endif
Signature · 1 line
1.8.1.4
Quoted 11 lines · Stefan Hajnoczi
Backported to QEMU 1.4 stable branch.
Original series:
http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.htmlStefan Hajnoczi (4):
oslib-posix: renamesocket_set_nonblock()toqemu_set_nonblock()
net: ensure "socket" backend uses non-blocking fds
qemu-socket: set passed fd non-blocking insocket_connect()
chardev: clearO_NONBLOCKonSCM_RIGHTSfile descriptors
Quoted 16 lines
block/nbd.c | 2 +- block/sheepdog.c | 6 +++--- include/qemu/sockets.h | 4 ++-- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 2 +- nbd.c | 8 ++++---- net/socket.c | 13 +++++++++---- qemu-char.c | 11 +++++++---- slirp/misc.c | 2 +- slirp/tcp_subr.c | 4 ++-- ui/vnc.c | 2 +- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 4 ++-- util/qemu-sockets.c | 5 +++-- 15 files changed, 40 insertions(+), 31 deletions(-)
Series: Reviewed-by: Eric Blake <[email protected]>
Is it worth including cherry-pick ids and descriptions of the conflict resolution done during the backport?
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 29 lines · Eric Blake
Quoted 11 lines · Stefan Hajnoczi
Backported to QEMU 1.4 stable branch.
Original series:
http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.htmlStefan Hajnoczi (4):
oslib-posix: renamesocket_set_nonblock()toqemu_set_nonblock()
net: ensure "socket" backend uses non-blocking fds
qemu-socket: set passed fd non-blocking insocket_connect()
chardev: clearO_NONBLOCKonSCM_RIGHTSfile descriptorsQuoted 16 lines
block/nbd.c | 2 +- block/sheepdog.c | 6 +++--- include/qemu/sockets.h | 4 ++-- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 2 +- nbd.c | 8 ++++---- net/socket.c | 13 +++++++++---- qemu-char.c | 11 +++++++---- slirp/misc.c | 2 +- slirp/tcp_subr.c | 4 ++-- ui/vnc.c | 2 +- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 4 ++-- util/qemu-sockets.c | 5 +++-- 15 files changed, 40 insertions(+), 31 deletions(-)
Quoted 4 lines
Series: Reviewed-by: Eric Blake <[email protected]>
Is it worth including cherry-pick ids and descriptions of the conflict resolution done during the backport?
In my opinion, any backport needs to point to the original, and I very much prefer pointers in the form added by git-cherry-pick -x.
Quoted 11 lines · Stefan Hajnoczi
Backported to QEMU 1.4 stable branch.
Original series:
http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg04756.htmlStefan Hajnoczi (4):
oslib-posix: renamesocket_set_nonblock()toqemu_set_nonblock()
net: ensure "socket" backend uses non-blocking fds
qemu-socket: set passed fd non-blocking insocket_connect()
chardev: clearO_NONBLOCKonSCM_RIGHTSfile descriptors
Quoted 16 lines
block/nbd.c | 2 +- block/sheepdog.c | 6 +++--- include/qemu/sockets.h | 4 ++-- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 2 +- nbd.c | 8 ++++---- net/socket.c | 13 +++++++++---- qemu-char.c | 11 +++++++---- slirp/misc.c | 2 +- slirp/tcp_subr.c | 4 ++-- ui/vnc.c | 2 +- util/oslib-posix.c | 4 ++-- util/oslib-win32.c | 4 ++-- util/qemu-sockets.c | 5 +++-- 15 files changed, 40 insertions(+), 31 deletions(-)
Will resend with git cherry-pick -x. This series was git rebase --onto which does not leave references to the original commit IDs.
Stefan