* [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186
@ 2026-11-16 13:30 Andrey Zhadchenko
2026-11-16 13:37 ` no-reply
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andrey Zhadchenko @ 2026-11-16 13:30 UTC (permalink / raw)
To: andrey.drobyshev; +Cc: svt-core, den
From: Jie Song <songjie_yewu@cmss.chinamobile.com>
When starting a dummy QEMU process with virsh version, monitor_init_qmp()
enables IOThread monitoring of the QMP fd by default. However, a race
condition exists during the initialization phase: the IOThread only removes
the main thread's fd watch when it reaches qio_net_listener_set_client_func_full(),
which may be delayed under high system load.
This creates a window between monitor_qmp_setup_handlers_bh() and
qio_net_listener_set_client_func_full() where both the main thread and
IOThread are simultaneously monitoring the same fd and processing events.
This race can cause either the main thread or the IOThread to hang and
become unresponsive.
Fix this by proactively cleaning up the listener's IO sources in
monitor_init_qmp() before the IOThread initializes QMP monitoring,
ensuring exclusive fd ownership and eliminating the race condition.
Signed-off-by: Jie Song <songjie_yewu@cmss.chinamobile.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20251125140706.114197-1-mail@jiesong.me>
(cherry picked from commit e714f1a3d4d1e66b9a3ff4be1ff999c32bbef29e)
---
chardev/char-io.c | 8 ++++++++
chardev/char-socket.c | 10 ++++++++++
include/chardev/char-io.h | 2 ++
include/chardev/char.h | 2 ++
monitor/qmp.c | 5 +++++
5 files changed, 27 insertions(+)
diff --git a/chardev/char-io.c b/chardev/char-io.c
index d9b11f335ff..0e5ba316ed9 100644
--- a/chardev/char-io.c
+++ b/chardev/char-io.c
@@ -187,3 +187,11 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len)
{
return io_channel_send_full(ioc, buf, len, NULL, 0);
}
+
+void remove_listener_fd_in_watch(Chardev *chr)
+{
+ ChardevClass *cc = CHARDEV_GET_CLASS(chr);
+ if (cc->chr_listener_cleanup) {
+ cc->chr_listener_cleanup(chr);
+ }
+}
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index c73a3dd0f7a..7eaa4f9301c 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1695,6 +1695,15 @@ static void char_socket_cpr_claim_fds(Chardev *chr)
}
}
+static void tcp_chr_listener_cleanup(Chardev *chr)
+{
+ SocketChardev *s = SOCKET_CHARDEV(chr);
+ if (s->listener) {
+ qio_net_listener_set_client_func_full(s->listener, NULL, NULL,
+ NULL, chr->gcontext);
+ }
+}
+
static void char_socket_class_init(ObjectClass *oc, const void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
@@ -1713,6 +1722,7 @@ static void char_socket_class_init(ObjectClass *oc, const void *data)
cc->chr_add_watch = tcp_chr_add_watch;
cc->chr_update_read_handler = tcp_chr_update_read_handler;
cc->cpr_claim_fds = char_socket_cpr_claim_fds;
+ cc->chr_listener_cleanup = tcp_chr_listener_cleanup;
object_class_property_add(oc, "addr", "SocketAddress",
char_socket_get_addr, NULL,
diff --git a/include/chardev/char-io.h b/include/chardev/char-io.h
index ac379ea70e3..540131346d1 100644
--- a/include/chardev/char-io.h
+++ b/include/chardev/char-io.h
@@ -43,4 +43,6 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len);
int io_channel_send_full(QIOChannel *ioc, const void *buf, size_t len,
int *fds, size_t nfds);
+void remove_listener_fd_in_watch(Chardev *chr);
+
#endif /* CHAR_IO_H */
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 968766fd5d5..62cfdc2d3d7 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -313,6 +313,8 @@ struct ChardevClass {
/* handle various events */
void (*chr_be_event)(Chardev *s, QEMUChrEvent event);
+
+ void (*chr_listener_cleanup)(Chardev *chr);
};
Chardev *qemu_chardev_new(const char *id, const char *typename,
diff --git a/monitor/qmp.c b/monitor/qmp.c
index 22e253bfcd4..bb89141baca 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -549,6 +549,11 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
* e.g. the chardev is in client mode, with wait=on.
*/
remove_fd_in_watch(chr);
+ /*
+ * Clean up listener IO sources early to prevent racy fd
+ * handling between the main thread and the I/O thread.
+ */
+ remove_listener_fd_in_watch(chr);
/*
* We can't call qemu_chr_fe_set_handlers() directly here
* since chardev might be running in the monitor I/O
--
2.43.5
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186
2026-11-16 13:30 [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186 Andrey Zhadchenko
@ 2026-11-16 13:37 ` no-reply
2026-11-16 13:50 ` Denis V. Lunev
2026-11-16 13:55 ` Andrey Drobyshev
2 siblings, 0 replies; 4+ messages in thread
From: no-reply @ 2026-11-16 13:37 UTC (permalink / raw)
To: Andrey Zhadchenko, andrey.drobyshev; +Cc: svt-core, den
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] chardev: misleading name and no docs for chr_listener_cleanup
hook
--
commit 5c8cab67961662e98b03d6e5525ecf5fdb9c1a1e
Author: Jie Song <songjie_yewu@cmss.chinamobile.com>
monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186
This commit adds an optional chr_listener_cleanup hook to ChardevClass. The socket chardev implements it by dropping the listener's accept handler and IO sources. monitor_init_qmp() calls the hook through a new helper, remove_listener_fd_in_watch(), before the IOThread takes over the QMP fd.
> diff --git a/chardev/char-io.c b/chardev/char-io.c
> index d9b11f335ffb6..0e5ba316ed9fb 100644
> --- a/chardev/char-io.c
> +++ b/chardev/char-io.c
> @@ -187,3 +187,11 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len)
> {
> return io_channel_send_full(ioc, buf, len, NULL, 0);
> }
> +
> +void remove_listener_fd_in_watch(Chardev *chr)
> +{
> + ChardevClass *cc = CHARDEV_GET_CLASS(chr);
> + if (cc->chr_listener_cleanup) {
> + cc->chr_listener_cleanup(chr);
> + }
> +}
[Severity: Low]
This isn't a bug, but the name is misleading. Sitting next to remove_fd_in_watch(), remove_listener_fd_in_watch() suggests it removes an fd watch. It actually calls the backend hook, which for sockets detaches the listener's accept handler via qio_net_listener_set_client_func_full() with a NULL func. Could the helper get a name or a comment that says so?
[ ... ]
> diff --git a/include/chardev/char.h b/include/chardev/char.h
> index 968766fd5d5ee..62cfdc2d3d765 100644
> --- a/include/chardev/char.h
> +++ b/include/chardev/char.h
> @@ -313,6 +313,8 @@ struct ChardevClass {
>
> /* handle various events */
> void (*chr_be_event)(Chardev *s, QEMUChrEvent event);
> +
> + void (*chr_listener_cleanup)(Chardev *chr);
> };
The new chr_listener_cleanup field has no comment, unlike its neighbouring hooks. Could it document that the hook is optional, which thread may call it, and that the backend must re-arm the listener later? For the socket backend, that re-arm happens in tcp_chr_update_read_handler() when the state is TCP_CHARDEV_STATE_DISCONNECTED.
Also, the commit message says the IOThread only removes the main thread's fd watch when it reaches qio_net_listener_set_client_func_full(). That is imprecise. The function destroys the old listener sources and creates new ones in the target context.
--
Sashiko AI review · https://sashiko.vzint.dev/#/patchset/20261116133056.1046875-1-andrey.zhadchenko@virtuozzo.com?part=1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186
2026-11-16 13:30 [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186 Andrey Zhadchenko
2026-11-16 13:37 ` no-reply
@ 2026-11-16 13:50 ` Denis V. Lunev
2026-11-16 13:55 ` Andrey Drobyshev
2 siblings, 0 replies; 4+ messages in thread
From: Denis V. Lunev @ 2026-11-16 13:50 UTC (permalink / raw)
To: Andrey Zhadchenko, andrey.drobyshev; +Cc: svt-core, den
@Andrey -> take this to 8.1 pls -> tests suffers from this.
Den
On 11/16/26 14:30, Andrey Zhadchenko wrote:
> From: Jie Song <songjie_yewu@cmss.chinamobile.com>
>
> When starting a dummy QEMU process with virsh version, monitor_init_qmp()
> enables IOThread monitoring of the QMP fd by default. However, a race
> condition exists during the initialization phase: the IOThread only removes
> the main thread's fd watch when it reaches qio_net_listener_set_client_func_full(),
> which may be delayed under high system load.
>
> This creates a window between monitor_qmp_setup_handlers_bh() and
> qio_net_listener_set_client_func_full() where both the main thread and
> IOThread are simultaneously monitoring the same fd and processing events.
> This race can cause either the main thread or the IOThread to hang and
> become unresponsive.
>
> Fix this by proactively cleaning up the listener's IO sources in
> monitor_init_qmp() before the IOThread initializes QMP monitoring,
> ensuring exclusive fd ownership and eliminating the race condition.
>
> Signed-off-by: Jie Song <songjie_yewu@cmss.chinamobile.com>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Message-ID: <20251125140706.114197-1-mail@jiesong.me>
> (cherry picked from commit e714f1a3d4d1e66b9a3ff4be1ff999c32bbef29e)
> ---
> chardev/char-io.c | 8 ++++++++
> chardev/char-socket.c | 10 ++++++++++
> include/chardev/char-io.h | 2 ++
> include/chardev/char.h | 2 ++
> monitor/qmp.c | 5 +++++
> 5 files changed, 27 insertions(+)
>
> diff --git a/chardev/char-io.c b/chardev/char-io.c
> index d9b11f335ff..0e5ba316ed9 100644
> --- a/chardev/char-io.c
> +++ b/chardev/char-io.c
> @@ -187,3 +187,11 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len)
> {
> return io_channel_send_full(ioc, buf, len, NULL, 0);
> }
> +
> +void remove_listener_fd_in_watch(Chardev *chr)
> +{
> + ChardevClass *cc = CHARDEV_GET_CLASS(chr);
> + if (cc->chr_listener_cleanup) {
> + cc->chr_listener_cleanup(chr);
> + }
> +}
> diff --git a/chardev/char-socket.c b/chardev/char-socket.c
> index c73a3dd0f7a..7eaa4f9301c 100644
> --- a/chardev/char-socket.c
> +++ b/chardev/char-socket.c
> @@ -1695,6 +1695,15 @@ static void char_socket_cpr_claim_fds(Chardev *chr)
> }
> }
>
> +static void tcp_chr_listener_cleanup(Chardev *chr)
> +{
> + SocketChardev *s = SOCKET_CHARDEV(chr);
> + if (s->listener) {
> + qio_net_listener_set_client_func_full(s->listener, NULL, NULL,
> + NULL, chr->gcontext);
> + }
> +}
> +
> static void char_socket_class_init(ObjectClass *oc, const void *data)
> {
> ChardevClass *cc = CHARDEV_CLASS(oc);
> @@ -1713,6 +1722,7 @@ static void char_socket_class_init(ObjectClass *oc, const void *data)
> cc->chr_add_watch = tcp_chr_add_watch;
> cc->chr_update_read_handler = tcp_chr_update_read_handler;
> cc->cpr_claim_fds = char_socket_cpr_claim_fds;
> + cc->chr_listener_cleanup = tcp_chr_listener_cleanup;
>
> object_class_property_add(oc, "addr", "SocketAddress",
> char_socket_get_addr, NULL,
> diff --git a/include/chardev/char-io.h b/include/chardev/char-io.h
> index ac379ea70e3..540131346d1 100644
> --- a/include/chardev/char-io.h
> +++ b/include/chardev/char-io.h
> @@ -43,4 +43,6 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len);
> int io_channel_send_full(QIOChannel *ioc, const void *buf, size_t len,
> int *fds, size_t nfds);
>
> +void remove_listener_fd_in_watch(Chardev *chr);
> +
> #endif /* CHAR_IO_H */
> diff --git a/include/chardev/char.h b/include/chardev/char.h
> index 968766fd5d5..62cfdc2d3d7 100644
> --- a/include/chardev/char.h
> +++ b/include/chardev/char.h
> @@ -313,6 +313,8 @@ struct ChardevClass {
>
> /* handle various events */
> void (*chr_be_event)(Chardev *s, QEMUChrEvent event);
> +
> + void (*chr_listener_cleanup)(Chardev *chr);
> };
>
> Chardev *qemu_chardev_new(const char *id, const char *typename,
> diff --git a/monitor/qmp.c b/monitor/qmp.c
> index 22e253bfcd4..bb89141baca 100644
> --- a/monitor/qmp.c
> +++ b/monitor/qmp.c
> @@ -549,6 +549,11 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
> * e.g. the chardev is in client mode, with wait=on.
> */
> remove_fd_in_watch(chr);
> + /*
> + * Clean up listener IO sources early to prevent racy fd
> + * handling between the main thread and the I/O thread.
> + */
> + remove_listener_fd_in_watch(chr);
> /*
> * We can't call qemu_chr_fe_set_handlers() directly here
> * since chardev might be running in the monitor I/O
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186
2026-11-16 13:30 [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186 Andrey Zhadchenko
2026-11-16 13:37 ` no-reply
2026-11-16 13:50 ` Denis V. Lunev
@ 2026-11-16 13:55 ` Andrey Drobyshev
2 siblings, 0 replies; 4+ messages in thread
From: Andrey Drobyshev @ 2026-11-16 13:55 UTC (permalink / raw)
To: Andrey Zhadchenko; +Cc: svt-core, den
Thanks, applied to hci-8.1
Ignoring Sashiko this is upstream cherry-pick and he hasn't found
anything real.
Andrey
On 11/16/26 3:30 PM, Andrey Zhadchenko wrote:
> From: Jie Song <songjie_yewu@cmss.chinamobile.com>
>
> When starting a dummy QEMU process with virsh version, monitor_init_qmp()
> enables IOThread monitoring of the QMP fd by default. However, a race
> condition exists during the initialization phase: the IOThread only removes
> the main thread's fd watch when it reaches qio_net_listener_set_client_func_full(),
> which may be delayed under high system load.
>
> This creates a window between monitor_qmp_setup_handlers_bh() and
> qio_net_listener_set_client_func_full() where both the main thread and
> IOThread are simultaneously monitoring the same fd and processing events.
> This race can cause either the main thread or the IOThread to hang and
> become unresponsive.
>
> Fix this by proactively cleaning up the listener's IO sources in
> monitor_init_qmp() before the IOThread initializes QMP monitoring,
> ensuring exclusive fd ownership and eliminating the race condition.
>
> Signed-off-by: Jie Song <songjie_yewu@cmss.chinamobile.com>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Message-ID: <20251125140706.114197-1-mail@jiesong.me>
> (cherry picked from commit e714f1a3d4d1e66b9a3ff4be1ff999c32bbef29e)
> ---
> chardev/char-io.c | 8 ++++++++
> chardev/char-socket.c | 10 ++++++++++
> include/chardev/char-io.h | 2 ++
> include/chardev/char.h | 2 ++
> monitor/qmp.c | 5 +++++
> 5 files changed, 27 insertions(+)
>
> diff --git a/chardev/char-io.c b/chardev/char-io.c
> index d9b11f335ff..0e5ba316ed9 100644
> --- a/chardev/char-io.c
> +++ b/chardev/char-io.c
> @@ -187,3 +187,11 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len)
> {
> return io_channel_send_full(ioc, buf, len, NULL, 0);
> }
> +
> +void remove_listener_fd_in_watch(Chardev *chr)
> +{
> + ChardevClass *cc = CHARDEV_GET_CLASS(chr);
> + if (cc->chr_listener_cleanup) {
> + cc->chr_listener_cleanup(chr);
> + }
> +}
> diff --git a/chardev/char-socket.c b/chardev/char-socket.c
> index c73a3dd0f7a..7eaa4f9301c 100644
> --- a/chardev/char-socket.c
> +++ b/chardev/char-socket.c
> @@ -1695,6 +1695,15 @@ static void char_socket_cpr_claim_fds(Chardev *chr)
> }
> }
>
> +static void tcp_chr_listener_cleanup(Chardev *chr)
> +{
> + SocketChardev *s = SOCKET_CHARDEV(chr);
> + if (s->listener) {
> + qio_net_listener_set_client_func_full(s->listener, NULL, NULL,
> + NULL, chr->gcontext);
> + }
> +}
> +
> static void char_socket_class_init(ObjectClass *oc, const void *data)
> {
> ChardevClass *cc = CHARDEV_CLASS(oc);
> @@ -1713,6 +1722,7 @@ static void char_socket_class_init(ObjectClass *oc, const void *data)
> cc->chr_add_watch = tcp_chr_add_watch;
> cc->chr_update_read_handler = tcp_chr_update_read_handler;
> cc->cpr_claim_fds = char_socket_cpr_claim_fds;
> + cc->chr_listener_cleanup = tcp_chr_listener_cleanup;
>
> object_class_property_add(oc, "addr", "SocketAddress",
> char_socket_get_addr, NULL,
> diff --git a/include/chardev/char-io.h b/include/chardev/char-io.h
> index ac379ea70e3..540131346d1 100644
> --- a/include/chardev/char-io.h
> +++ b/include/chardev/char-io.h
> @@ -43,4 +43,6 @@ int io_channel_send(QIOChannel *ioc, const void *buf, size_t len);
> int io_channel_send_full(QIOChannel *ioc, const void *buf, size_t len,
> int *fds, size_t nfds);
>
> +void remove_listener_fd_in_watch(Chardev *chr);
> +
> #endif /* CHAR_IO_H */
> diff --git a/include/chardev/char.h b/include/chardev/char.h
> index 968766fd5d5..62cfdc2d3d7 100644
> --- a/include/chardev/char.h
> +++ b/include/chardev/char.h
> @@ -313,6 +313,8 @@ struct ChardevClass {
>
> /* handle various events */
> void (*chr_be_event)(Chardev *s, QEMUChrEvent event);
> +
> + void (*chr_listener_cleanup)(Chardev *chr);
> };
>
> Chardev *qemu_chardev_new(const char *id, const char *typename,
> diff --git a/monitor/qmp.c b/monitor/qmp.c
> index 22e253bfcd4..bb89141baca 100644
> --- a/monitor/qmp.c
> +++ b/monitor/qmp.c
> @@ -549,6 +549,11 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
> * e.g. the chardev is in client mode, with wait=on.
> */
> remove_fd_in_watch(chr);
> + /*
> + * Clean up listener IO sources early to prevent racy fd
> + * handling between the main thread and the I/O thread.
> + */
> + remove_listener_fd_in_watch(chr);
> /*
> * We can't call qemu_chr_fe_set_handlers() directly here
> * since chardev might be running in the monitor I/O
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-11-16 13:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-16 13:30 [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186 Andrey Zhadchenko
2026-11-16 13:37 ` no-reply
2026-11-16 13:50 ` Denis V. Lunev
2026-11-16 13:55 ` Andrey Drobyshev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.