non-blocking connect
cover non-blocking connect
Hi! This fixes real problem (see 04). On the other hand it may be too much for 5.1, and it's not a degradation. So, up to you.
It's based on "[PATCH for-5.1? 0/3] Fix nbd reconnect dead-locks", or in other words
Based-on: <[email protected]>
Vladimir Sementsov-Ogievskiy (4):
qemu-sockets: refactor inet_connect_addr
qemu-sockets: implement non-blocking connect interface io/channel-socket: implement non-blocking connect block/nbd: use non-blocking connect: fix vm hang on connect()
include/io/channel-socket.h | 14 +++++++ include/qemu/sockets.h | 6 +++ block/nbd.c | 11 +++--- io/channel-socket.c | 74 ++++++++++++++++++++++++++++++++++++ util/qemu-sockets.c | 76 ++++++++++++++++++++++++++----------- 5 files changed, 153 insertions(+), 28 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/4 qemu-sockets: refactor inet_connect_addr
We are going to publish inet_connect_addr to be used in separate. Let's move keep_alive handling to it. Pass the whole InetSocketAddress pointer, not only keep_alive, so that future external callers will not care about internals of InetSocketAddress.
While being here, remove redundant inet_connect_addr() declaration.
--- util/qemu-sockets.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-)
util/qemu-sockets.c +16 -21
@@ -354,9 +354,8 @@ listen_ok: ((rc) == -EINPROGRESS)#endif -static int inet_connect_addr (struct addrinfo *addr,Error **errp); - -static int inet_connect_addr (struct addrinfo *addr,Error **errp) +static int inet_connect_addr (InetSocketAddress *saddr, +struct addrinfo *addr,Error **errp) {int sock, rc;
@@ -381,6 +380,18 @@ static int inet_connect_addr(struct addrinfo *addr, Error **errp)return -1 ; } +if (saddr->keep_alive) { +int val =1 ; +int ret =qemu_setsockopt (sock,SOL_SOCKET ,SO_KEEPALIVE , + &val,sizeof (val)); + +if (ret <0 ) { +error_setg_errno (errp, errno,"Unable to set KEEPALIVE" ); +closesocket (sock); +return -1 ; + } + } +return sock; }
@@ -455,7 +466,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)for (e = res; e !=NULL ; e = e->ai_next) {error_free (local_err); local_err =NULL ; - sock =inet_connect_addr (e, &local_err); + sock =inet_connect_addr (saddr, e, &local_err);if (sock >=0 ) {break ; }
@@ -463,23 +474,7 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp)freeaddrinfo (res); -if (sock <0 ) { -error_propagate (errp, local_err); -return sock; - } - -if (saddr->keep_alive) { -int val =1 ; -int ret =qemu_setsockopt (sock,SOL_SOCKET ,SO_KEEPALIVE , - &val,sizeof (val)); - -if (ret <0 ) { -error_setg_errno (errp, errno,"Unable to set KEEPALIVE" ); -close (sock); -return -1 ; - } - } - +error_propagate (errp, local_err);return sock; }
Signature · 1 line
2.21.0
PATCH 2/4 qemu-sockets: implement non-blocking connect interface
In reply to Vladimir Sementsov-OgievskiyWe are going to implement non-blocking connect in io/channel-socket.
non-blocking connect includes three phases:
1. connect() call
2. wait until socket is ready
3. check result
io/channel-socket has wait-on-socket API (qio_channel_yield(), qio_channel_wait()), so it's a good place for [2].
Still, the whole thing is not simple, because socket connect in case of inet socket includes several connect() calls, as SocketAddress may be parsed into a list of inet addresses. And after each non-blocking connect() upper layer should have a possibility to wait on the socket.
We may try to implement a kind of abstract list or iterator for "sub" addresses of SocketAddress, but all this appears to be too complex and not worth doing (as actually, only inet sockets has such a "multiple" SocketAddress).
So, let's instead make public API for inet sockets themselves, to be handled in separate in upper layer, if it needs non-blocking connect.
--- include/qemu/sockets.h | 6 ++++++ util/qemu-sockets.c | 45 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 5 deletions(-)
include/qemu/sockets.h +6 -0
@@ -34,6 +34,12 @@ int inet_ai_family_from_address(InetSocketAddress *addr,int inet_parse (InetSocketAddress *addr,const char *str,Error **errp);int inet_connect (const char *str,Error **errp);int inet_connect_saddr (InetSocketAddress *saddr,Error **errp); +int inet_connect_addr (InetSocketAddress *saddr,struct addrinfo *addr, +bool blocking,bool *in_progress,Error **errp); +struct addrinfo *inet_parse_connect_saddr (InetSocketAddress *saddr, +Error **errp); + +int socket_check (int fd,Error **errp);NetworkAddressFamily inet_netfamily (int family);
util/qemu-sockets.c +40 -5
78 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 3/4 io/channel-socket: implement non-blocking connect
In reply to Vladimir Sementsov-OgievskiyUtilize new socket API to make a non-blocking connect for inet sockets.
--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)
include/io/channel-socket.h +14 -0
@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object
io/channel-socket.c +74 -0
92 lines not on this page · raw message
Signature · 1 line
2.21.0
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 59 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +4
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; } +static int qio_channel_inet_connect_non_blocking_sync(QIOChannelSocket *ioc,
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 10 lines
io/channel-socket.c +10
-0+ InetSocketAddress *addr, Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; + + infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }
This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Quoted 13 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }
...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing qio_channel_socket_connect_async method or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.
I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the qio_task_wait_thread() method that is friendly to coroutines instead of being based on pthread condition variable waits.
Quoted 4 lines
io/channel-socket.c +4
-0+if (socket_check (sock, &local_err) <0 ) { +qio_channel_socket_close (QIO_CHANNEL (ioc),NULL ); +continue ; + }
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 210
Quoted 10 lines
io/channel-socket.c +10
-0+ } + +break ; + } + +freeaddrinfo (infos); + +error_propagate (errp, local_err); +return sock; +}
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 59 lines · Daniel P. Berrangé
Quoted 58 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +3
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; }
Quoted 15 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 11 lines
io/channel-socket.c +11
-0+static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, +InetSocketAddress *addr,Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; + + infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.
The most simple thing is just run qio_channel_socket_connect_sync in a thread with help of thread_pool_submit_co() which is coroutine-friendly. And this don't need any changes in io/channel.
Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
I think, I'll resend based on thread_pool_submit_co().
===
Hmm, there is async getaddrinfo_a function.. What do you think of it? But seems simpler to use a thread than move to async interfaces everywhere.
Quoted 20 lines
Quoted 6 lines
io/channel-socket.c +4
-0+if (socket_check (sock, &local_err) <0 ) { +qio_channel_socket_close (QIO_CHANNEL (ioc),NULL ); +continue ; + }io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 210
Quoted 10 lines
io/channel-socket.c +10
-0+ } + +break ; + } + +freeaddrinfo (infos); + +error_propagate (errp, local_err); +return sock; +}Regards,
Daniel
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, +InetSocketAddress *addr,Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 4 lines
io/channel-socket.c +4
-0+ infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?
It isn't portable, glibc only.
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 136 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, +InetSocketAddress *addr,Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 4 lines
io/channel-socket.c +4
-0+ infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 11 lines
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
So, it may make sense to split connect, and keep it true-async. And call getaddrinfo in a thread (or just keep it synchronous).
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, +InetSocketAddress *addr,Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 4 lines
io/channel-socket.c +4
-0+ infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the _async() method can cope with the cleanup when the work eventually completes, even if you've given up.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, +SocketAddress *addr, +Error **errp); +/** * qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@#include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h" @@ -29,6 +30,8 @@#define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *qio_channel_socket_get_local_address (QIOChannelSocket *ioc,Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc,return 0 ; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, +InetSocketAddress *addr,Error **errp) +{ +Error *local_err =NULL ; +struct addrinfo *infos, *info; +int sock =-1 ; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 173
Quoted 4 lines
io/channel-socket.c +4
-0+ infos =inet_parse_connect_saddr (addr, errp); +if (!infos) { +return -1 ; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ +for (info = infos; info !=NULL ; info = info->ai_next) { +bool in_progress; + +error_free (local_err); + local_err =NULL ; + + sock =inet_connect_addr (addr, info, false, &in_progress, &local_err); +if (sock <0 ) { +continue ; + } + +if (qio_channel_socket_set_fd (ioc, sock, &local_err) <0 ) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 196
Quoted 10 lines
io/channel-socket.c +10
-0+close (sock); +continue ; + } + +if (in_progress) { +if (qemu_in_coroutine ()) { +qio_channel_yield (QIO_CHANNEL (ioc),G_IO_OUT ); + }else { +qio_channel_wait (QIO_CHANNEL (ioc),G_IO_OUT ); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.
At least it's not possible with thread_pool_submit_co as I wanted, because underlying thread pool waits for all its threads to complete on exit.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 163 lines · Vladimir Sementsov-Ogievskiy
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
include/io/channel-socket.h| 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, + SocketAddress *addr, + Error **errp); + /*** qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +3
-0@@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h"@@ -29,6 +30,8 @@ #define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *
qio_channel_socket_get_local_address(QIOChannelSocket *ioc, Error **errp)io/channel-socket.c +7
-0@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, return 0; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, + InetSocketAddress *addr, Error **errp) +{ + Error *local_err = NULL; + struct addrinfo *infos, *info; + int sock = -1; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 172
Quoted 4 lines
io/channel-socket.c +4
-0+ infos = inet_parse_connect_saddr(addr, errp); + if (!infos) { + return -1; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ + for (info = infos; info != NULL; info = info->ai_next) { + bool in_progress; + + error_free(local_err); + local_err = NULL; + + sock = inet_connect_addr(addr, info, false, &in_progress, &local_err); + if (sock < 0) { + continue; + } + + if (qio_channel_socket_set_fd(ioc, sock, &local_err) < 0) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 195
Quoted 10 lines
io/channel-socket.c +10
-0+ close(sock); + continue; + } + + if (in_progress) { + if (qemu_in_coroutine()) { + qio_channel_yield(QIO_CHANNEL(ioc), G_IO_OUT); + } else { + qio_channel_wait(QIO_CHANNEL(ioc), G_IO_OUT); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.
Quoted 4 lines
At least it's not possible with
thread_pool_submit_coas I wanted, because underlying thread pool waits for all its threads to complete on exit.
I'm trying to use qio_channel_socket_connect_async().. But callback is not called.
How to make it be executed? In tests/test-io-channel-socket.c it's done by g_main_loop_new .. g_main_loop_run. But I need to yield. socket_start_outgoing_migration uses qio_channel_socket_connect_async as well, but is not doing any magic with g_main_loop. But it works. How?
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 170 lines · Vladimir Sementsov-Ogievskiy
Quoted 163 lines · Vladimir Sementsov-Ogievskiy
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>---
include/io/channel-socket.h| 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, + SocketAddress *addr, + Error **errp); + /*** qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +3
-0@@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h"@@ -29,6 +30,8 @@ #define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); +SocketAddress *
qio_channel_socket_get_local_address(QIOChannelSocket *ioc, Error **errp)io/channel-socket.c +7
-0@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, return 0; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, + InetSocketAddress *addr, Error **errp) +{ + Error *local_err = NULL; + struct addrinfo *infos, *info; + int sock = -1; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 172
Quoted 4 lines
io/channel-socket.c +4
-0+ infos = inet_parse_connect_saddr(addr, errp); + if (!infos) { + return -1; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ + for (info = infos; info != NULL; info = info->ai_next) { + bool in_progress; + + error_free(local_err); + local_err = NULL; + + sock = inet_connect_addr(addr, info, false, &in_progress, &local_err); + if (sock < 0) { + continue; + } + + if (qio_channel_socket_set_fd(ioc, sock, &local_err) < 0) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 195
Quoted 10 lines
io/channel-socket.c +10
-0+ close(sock); + continue; + } + + if (in_progress) { + if (qemu_in_coroutine()) { + qio_channel_yield(QIO_CHANNEL(ioc), G_IO_OUT); + } else { + qio_channel_wait(QIO_CHANNEL(ioc), G_IO_OUT); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.Quoted 4 lines
At least it's not possible with
thread_pool_submit_coas I wanted, because underlying thread pool waits for all its threads to complete on exit.
Quoted 7 lines
I'm trying to use
qio_channel_socket_connect_async().. But callback is not called.How to make it be executed? In
tests/test-io-channel-socket.cit's done byg_main_loop_new..g_main_loop_run. But I need to yield.socket_start_outgoing_migrationusesqio_channel_socket_connect_asyncas well, but is not doing any magic withg_main_loop. But it works. How?
The _async() impls uses qio_task_run_in_thread to spawn the background thread. When the thread finishes, it uses g_idle_add to invoke the callback so that it runs in the context of the main thread, not the background thread. So something needs to be running the main loop in QEMU.
If that isn't viable for the scenario you're in, then you can create your own async version by spawning the thread yourself and running the _sync() function - the _async() function is ajust a convenient wrapper combining QIOTask + _sync(), but doesn't always do what
everyone might need. In the char-socket.c for example, I do the
async bit manually instead of using teh _async() wrapper.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 179 lines · Daniel P. Berrangé
Quoted 170 lines · Vladimir Sementsov-Ogievskiy
Quoted 163 lines · Vladimir Sementsov-Ogievskiy
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, + SocketAddress *addr, + Error **errp); + /*** qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h"@@ -29,6 +30,8 @@ #define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); + SocketAddress * qio_channel_socket_get_local_address(QIOChannelSocket *ioc, Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, return 0; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, + InetSocketAddress *addr, Error **errp) +{ + Error *local_err = NULL; + struct addrinfo *infos, *info; + int sock = -1; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 172
Quoted 4 lines
io/channel-socket.c +4
-0+ infos = inet_parse_connect_saddr(addr, errp); + if (!infos) { + return -1; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ + for (info = infos; info != NULL; info = info->ai_next) { + bool in_progress; + + error_free(local_err); + local_err = NULL; + + sock = inet_connect_addr(addr, info, false, &in_progress, &local_err); + if (sock < 0) { + continue; + } + + if (qio_channel_socket_set_fd(ioc, sock, &local_err) < 0) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 195
Quoted 10 lines
io/channel-socket.c +10
-0+ close(sock); + continue; + } + + if (in_progress) { + if (qemu_in_coroutine()) { + qio_channel_yield(QIO_CHANNEL(ioc), G_IO_OUT); + } else { + qio_channel_wait(QIO_CHANNEL(ioc), G_IO_OUT); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.Quoted 4 lines
At least it's not possible with
thread_pool_submit_coas I wanted, because underlying thread pool waits for all its threads to complete on exit.Quoted 7 lines
I'm trying to use
qio_channel_socket_connect_async().. But callback is not called.How to make it be executed? In
tests/test-io-channel-socket.cit's done byg_main_loop_new..g_main_loop_run. But I need to yield.socket_start_outgoing_migrationusesqio_channel_socket_connect_asyncas well, but is not doing any magic withg_main_loop. But it works. How?
Quoted 5 lines
The
_async()impls usesqio_task_run_in_threadto spawn the background thread. When the thread finishes, it usesg_idle_addto invoke the callback so that it runs in the context of the main thread, not the background thread. So something needs to be running the main loop in QEMU.
I came to same idea. But still, I don't see where g_main_loop is run inside qemu_main_loop(). Only iothread_run() does it. But what if we don't have iothreads?
OK, it's obvious that when qemu parses -drive options it doesn't run any main-loop. But on reconnect attempts it should run qemu_main_loop, but callback still is not called for me..
I understand, that I can create custom wrapper on sync connect, to run it in a thread. But I just try to understand:
- how qemu_main_loop and all these g_main_loop* things are connected?
- if they are not, how qio_channel_socket_connect_async() works in socket_start_outgoing_migration(), where nobody run the g_main_loop_run() ?
Quoted 11 lines
If that isn't viable for the scenario you're in, then you can create your own async version by spawning the thread yourself and running the
_sync()function - the_async()function is ajust a convenient wrapper combining QIOTask +_sync(), but doesn't always do what
everyone might need. In thechar-socket.cfor example, I do the
async bit manually instead of using teh_async()wrapper.Regards,
Daniel
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 186 lines · Vladimir Sementsov-Ogievskiy
Quoted 179 lines · Daniel P. Berrangé
Quoted 170 lines · Vladimir Sementsov-Ogievskiy
Quoted 163 lines · Vladimir Sementsov-Ogievskiy
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, + SocketAddress *addr, + Error **errp); + /*** qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h"@@ -29,6 +30,8 @@ #define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); + SocketAddress * qio_channel_socket_get_local_address(QIOChannelSocket *ioc, Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, return 0; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, + InetSocketAddress *addr, Error **errp) +{ + Error *local_err = NULL; + struct addrinfo *infos, *info; + int sock = -1; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 172
Quoted 4 lines
io/channel-socket.c +4
-0+ infos = inet_parse_connect_saddr(addr, errp); + if (!infos) { + return -1; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ + for (info = infos; info != NULL; info = info->ai_next) { + bool in_progress; + + error_free(local_err); + local_err = NULL; + + sock = inet_connect_addr(addr, info, false, &in_progress, &local_err); + if (sock < 0) { + continue; + } + + if (qio_channel_socket_set_fd(ioc, sock, &local_err) < 0) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 195
Quoted 10 lines
io/channel-socket.c +10
-0+ close(sock); + continue; + } + + if (in_progress) { + if (qemu_in_coroutine()) { + qio_channel_yield(QIO_CHANNEL(ioc), G_IO_OUT); + } else { + qio_channel_wait(QIO_CHANNEL(ioc), G_IO_OUT); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.Quoted 4 lines
At least it's not possible with
thread_pool_submit_coas I wanted, because underlying thread pool waits for all its threads to complete on exit.Quoted 7 lines
I'm trying to use
qio_channel_socket_connect_async().. But callback is not called.How to make it be executed? In
tests/test-io-channel-socket.cit's done byg_main_loop_new..g_main_loop_run. But I need to yield.socket_start_outgoing_migrationusesqio_channel_socket_connect_asyncas well, but is not doing any magic withg_main_loop. But it works. How?Quoted 5 lines
The
_async()impls usesqio_task_run_in_threadto spawn the background thread. When the thread finishes, it usesg_idle_addto invoke the callback so that it runs in the context of the main thread, not the background thread. So something needs to be running the main loop in QEMU.
Quoted 3 lines
I came to same idea. But still, I don't see where
g_main_loopis run insideqemu_main_loop(). Onlyiothread_run()does it. But what if we don't have iothreads?
There's no requirement to use g_main_loop, what matters is actually that something runs the default GMainContext. qemu_main_loop satisfies this.
If you have a different GMainLoop that you want to use, then you can pass its GMainContext into the _async() functions, and the result will get dispatched from whatever thread runs that GMainContext/GMainLoop. So you could use this to get the callback to be invoked in your iothread context if that's desirable. If a NULL GMainContext is passed to _async(), then the callback is dispatched from qemu_main_loop() thread.
Regards,
Daniel
Signature · 3 lines
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
Re: [PATCH 3/4] io/channel-socket: implement non-blocking connect
Quoted 187 lines · Daniel P. Berrangé
Quoted 186 lines · Vladimir Sementsov-Ogievskiy
Quoted 184 lines · Daniel P. Berrangé
Quoted 170 lines · Vladimir Sementsov-Ogievskiy
Quoted 163 lines · Vladimir Sementsov-Ogievskiy
Quoted 154 lines · Daniel P. Berrangé
Quoted 145 lines · Vladimir Sementsov-Ogievskiy
Quoted 144 lines · Daniel P. Berrangé
Quoted 135 lines · Vladimir Sementsov-Ogievskiy
Quoted 62 lines · Daniel P. Berrangé
Quoted 61 lines · Vladimir Sementsov-Ogievskiy
Utilize new socket API to make a non-blocking connect for inet sockets.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- include/io/channel-socket.h | 14 +++++++ io/channel-socket.c | 74 +++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+)include/io/channel-socket.h +14
-0@@ -94,6 +94,20 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, SocketAddress *addr, Error **errp); +/** +* qio_channel_socket_connect_non_blocking_sync: +* @ioc: the socket channel object +* @addr: the address to connect to +* @errp: pointer to a NULL-initialized error object +* +* Attempt to connect to the address @addr using non-blocking mode of +* the socket. Function is synchronous, but being called from +* coroutine context will yield during connect operation. +*/ +int qio_channel_socket_connect_non_blocking_sync (QIOChannelSocket *ioc, + SocketAddress *addr, + Error **errp); + /*** qio_channel_socket_connect_async: * @ioc: the socket channel object io/channel-socket.c +10
-0@@ -22,6 +22,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-sockets.h" #include "qemu/module.h" +#include "qemu/sockets.h" #include "io/channel-socket.h" #include "io/channel-watch.h" #include "trace.h"@@ -29,6 +30,8 @@ #define SOCKET_MAX_FDS 16 +static int qio_channel_socket_close (QIOChannel *ioc,Error **errp); + SocketAddress * qio_channel_socket_get_local_address(QIOChannelSocket *ioc, Error **errp)@@ -157,6 +160,77 @@ int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, return 0; } +static int qio_channel_inet_connect_non_blocking_sync (QIOChannelSocket *ioc, + InetSocketAddress *addr, Error **errp) +{ + Error *local_err = NULL; + struct addrinfo *infos, *info; + int sock = -1; +Quoted 8 lines
io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 172
Quoted 4 lines
io/channel-socket.c +4
-0+ infos = inet_parse_connect_saddr(addr, errp); + if (!infos) { + return -1; + }This call is blocking since it calls getaddrinfo whose design offers no ability todo non-blocking DNS lookups. Given this call, ...
Oh, that's bad, thanks for taking a look on that early stage!
Quoted 44 lines
Quoted 14 lines
io/channel-socket.c +13
-0+ + for (info = infos; info != NULL; info = info->ai_next) { + bool in_progress; + + error_free(local_err); + local_err = NULL; + + sock = inet_connect_addr(addr, info, false, &in_progress, &local_err); + if (sock < 0) { + continue; + } + + if (qio_channel_socket_set_fd(ioc, sock, &local_err) < 0) {io/channel-socket.c int qio_channel_socket_connect_sync(QIOChannelSocket *ioc, · line 195
Quoted 10 lines
io/channel-socket.c +10
-0+ close(sock); + continue; + } + + if (in_progress) { + if (qemu_in_coroutine()) { + qio_channel_yield(QIO_CHANNEL(ioc), G_IO_OUT); + } else { + qio_channel_wait(QIO_CHANNEL(ioc), G_IO_OUT); + }...this is offering false assurances of being non-blocking.
If we don't want the current thread to be blocked then we need to be using the existing
qio_channel_socket_connect_asyncmethod or similar. It uses a throw away background thread to run the connection attempt, and then reports completion back later, thus avoiding the getaddrinfo design flaw for the callers.I explicitly didn't want to add an method like the impl in this patch, because getaddrinfo dooms it and we already had bugs in the pre-QIOChannel code where QEMU thought it was non-blocking but wasn't due to getaddrinfo lookups.
IIUC, the main appeal of this method is that the non-blocking nature is hidden from the caller who can continue to treat it as a synchronous call and have the coroutine magic happen in behind the scenes.
Quoted 8 lines
IOW, What's needed is a simple way to run the operation in a thread, and sleep for completion while having the coroutine yield.
I think this could likely be achieved with QIOTask with an alternate impl of the
qio_task_wait_thread()method that is friendly to coroutines instead of being based on pthread condition variable waits.The most simple thing is just run
qio_channel_socket_connect_syncin a thread with help ofthread_pool_submit_co()which is coroutine-friendly. And this don't need any changes in io/channel.Actually, I've started with such design, but decided that better use non-blocking connect to not deal with cancelling the connecting thread on shutdown.
Quoted 5 lines
I think, I'll resend based on
thread_pool_submit_co().===
Hmm, there is async
getaddrinfo_afunction.. What do you think of it?It isn't portable, glibc only.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
But seems simpler to use a thread than move to async interfaces everywhere.
Hmm.. Still, on shutdown, how to cancel this connect and getaddrinfo ? I'm not sure how much time may getaddrinfo take, but connect can take about a minute. It's not really good to wait for it on shutdown.
Quoted 7 lines
The intention was that if you don't want to carry on waiting for the async operation to complete you just give and pretend it no longer exists. Eventually it will fail or complete and the thread will exit. The only important thing there is making sure that the callback you are passing to the
_async()method can cope with the cleanup when the work eventually completes, even if you've given up.Quoted 4 lines
At least it's not possible with
thread_pool_submit_coas I wanted, because underlying thread pool waits for all its threads to complete on exit.Quoted 7 lines
I'm trying to use
qio_channel_socket_connect_async().. But callback is not called.How to make it be executed? In
tests/test-io-channel-socket.cit's done byg_main_loop_new..g_main_loop_run. But I need to yield.socket_start_outgoing_migrationusesqio_channel_socket_connect_asyncas well, but is not doing any magic withg_main_loop. But it works. How?The
_async()impls usesqio_task_run_in_threadto spawn the background thread. When the thread finishes, it usesg_idle_addto invoke the callback so that it runs in the context of the main thread, not the background thread. So something needs to be running the main loop in QEMU.
Quoted 6 lines
Quoted 3 lines
I came to same idea. But still, I don't see where
g_main_loopis run insideqemu_main_loop(). Onlyiothread_run()does it. But what if we don't have iothreads?There's no requirement to use
g_main_loop, what matters is actually that something runs the default GMainContext.
O, I see now, g_main_context_dispatch() in glib_pollfds_poll() does it, yes?
Quoted 11 lines
qemu_main_loop
satisfies this.If you have a different GMainLoop that you want to use, then you can pass its GMainContext into the
_async()functions, and the result will get dispatched from whatever thread runs that GMainContext/GMainLoop. So you could use this to get the callback to be invoked in your iothread context if that's desirable. If a NULL GMainContext is passed to_async(), then the callback is dispatched fromqemu_main_loop()thread.
Thanks for your help!
Signature · 2 lines
Best regards, Vladimir
PATCH 4/4 block/nbd: use non-blocking connect: fix vm hang on connect()
In reply to Vladimir Sementsov-OgievskiyThis make nbd connection_co to yield during reconnects, so that reconnect doesn't hang up the main thread. This is very important in case of unavailable nbd server host: connect() call may take a long time, blocking the main thread (and due to reconnect, it will hang again and again with small gaps of working time during pauses between connection attempts).
How to reproduce the bug:
1. Create an image on node1:
qemu-img create -f qcow2 xx 100M
2. Start NBD server on node1:
qemu-nbd xx
3. Start vm with second nbd disk on node2, like this:
./x86_64-softmmu/qemu-system-x86_64 -nodefaults -drive \
file=/work/images/cent7.qcow2 -drive file=nbd+tcp://192.168.100.2 \
-vnc :0 -qmp stdio -m 2G -enable-kvm -vga std4. Access the vm through vnc (or some other way?), and check that NBD drive works:
dd if=/dev/sdb of=/dev/null bs=1M count=10
- the command should succeed.
5. Now, let's trigger nbd-reconnect loop in Qemu process. For this:
5.1 Kill NBD server on node1
5.2 run "dd if=/dev/sdb of=/dev/null bs=1M count=10" in the guest
again. The command should fail and a lot of error messages about failing disk may appear as well.
Now NBD client driver in Qemu tries to reconnect. Still, VM works well.
6. Make node1 unavailable on NBD port, so connect() from node2 will last for a long time:
On node1 (Note, that 10809 is just a default NBD port):
sudo iptables -A INPUT -p tcp --dport 10809 -j DROP
After some time the guest hangs, and you may check in gdb that Qemu hangs in connect() call, issued from the main thread. This is the BUG.
7. Don't forget to drop iptables rule from your node1:
sudo iptables -D INPUT -p tcp --dport 10809 -j DROP
--- block/nbd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
block/nbd.c +6 -5
@@ -1421,16 +1421,19 @@ static void nbd_client_close(BlockDriverState *bs)nbd_teardown_connection (bs); } -static QIOChannelSocket *nbd_establish_connection (SocketAddress *saddr, +static QIOChannelSocket *nbd_establish_connection (BlockDriverState *bs, +SocketAddress *saddr,Error **errp) {ERRP_GUARD ();QIOChannelSocket *sioc; +AioContext *aio_context =bdrv_get_aio_context (bs); sioc =qio_channel_socket_new ();qio_channel_set_name (QIO_CHANNEL (sioc),"nbd-client" ); -qio_channel_socket_connect_sync (sioc, saddr, errp); +qio_channel_attach_aio_context (QIO_CHANNEL (sioc), aio_context); +qio_channel_socket_connect_non_blocking_sync (sioc, saddr, errp);if (*errp) {object_unref (OBJECT (sioc));return NULL ;
@@ -1451,7 +1454,7 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp)* establish TCP connection, return error if it fails * TODO: Configurable retry-until-timeout behaviour. */ -QIOChannelSocket *sioc =nbd_establish_connection (s->saddr, errp); +QIOChannelSocket *sioc =nbd_establish_connection (bs, s->saddr, errp);if (!sioc) {return -ECONNREFUSED ;
@@ -1461,8 +1464,6 @@ static int nbd_client_connect(BlockDriverState *bs, Error **errp)/* NBD handshake */ trace_nbd_client_connect (s->export); -qio_channel_set_blocking (QIO_CHANNEL (sioc), false,NULL ); -qio_channel_attach_aio_context (QIO_CHANNEL (sioc), aio_context); s->info.request_sizes = true; s->info.structured_reply = true;
Signature · 1 line
2.21.0
Quoted 2 lines · Vladimir Sementsov-Ogievskiy
Hi! This fixes real problem (see 04). On the other hand it may be too much for 5.1, and it's not a degradation. So, up to you.
Given the concerns raised on 3, I think I'll wait for v2 of the series, and defer it to 5.2.
Quoted 18 lines
It's based on "[PATCH for-5.1? 0/3] Fix nbd reconnect dead-locks", or in other words
Based-on: <[email protected]>Vladimir Sementsov-Ogievskiy (4):
qemu-sockets: refactorinet_connect_addr
qemu-sockets: implement non-blocking connect interface io/channel-socket: implement non-blocking connect block/nbd: use non-blocking connect: fix vm hang onconnect()include/io/channel-socket.h | 14 +++++++ include/qemu/sockets.h | 6 +++ block/nbd.c | 11 +++--- io/channel-socket.c | 74 ++++++++++++++++++++++++++++++++++++ util/qemu-sockets.c | 76 ++++++++++++++++++++++++++----------- 5 files changed, 153 insertions(+), 28 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org