From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11020123.outbound.protection.outlook.com [52.101.69.123]) by lore.virtuozzo.com (Postfix) with ESMTPS id D5BBF81835 for ; Mon, 16 Nov 2026 13:55:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dDxINBD3EGnJqAzt5zuGjIu1govLj+COKbXFRDFg4BwmqpCkx9RSSvw+EzKb/9GBR6PcL1VRvlvYAZ5PS7pvtpfaopcarvZ4lrXdHXqBHg8Md/mg84XvVQr0jriKj9fQ45sT3mSX5nVDoNCD5blD/GMlJsG7xEaTHa1M48J6ub2i3Y9rWCLm5YrGn/yiNfMQ75GqnwlaH/0kmLHJgTKRThxkiGd+ZuIsIRqPEUuMsZDklgNCblTUGAK7GlkUiwISd3n8MKz8lvhipOOEs208WUXTnci3h7fLdWFQBYgL3JoLN3TbVAWwdboWz/n8INWP24p8Sg5ENX4yPwrjt+/lDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fBOiaCNjxzwdrwVUKJCMKVlzFEP/g9vD8yMYWathTJw=; b=F+0lAqfbkmKJuIHf5wvh+NmYgNV47V++SaqiZcUSyLv27ZAU7P1ib6Bo1ty+LB+GEYSa179g1BxAglsSVzKZB6hvDCFdKl8XKxK4pOaHI08DxNklEpaLkdFOWT2k3mkjtIWF7LTaGhoT7HLdL2vPPLuIvv3/B8oJXaGa3XyjeC83oY3NEWddPTacL6Aabszl+Babx1DVWAXaTBsXGT5hPLYbgaekPXYDTpQDInuuQsiZl1+RnePGbFOEWlwW+fOCd/0r+SszJNo9lOjJ6wD49QlqKSDMMxh4m2flbvAgWKFWKZSTG9yGvgP+HZqKwrDunaNNkiAwy0hyhYn4jKPEAg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fBOiaCNjxzwdrwVUKJCMKVlzFEP/g9vD8yMYWathTJw=; b=iM0UDwWDySuT1o5EOEOkUDJa4rgdBipVvRUzzsH/fnvXhwdPg5b+bxA5XQoUNh1ZnpxhngGujR4mAXeuKrMvc5NWSXZuNpYPVsDET4xxU997jwB3zqLCxIH+EevqeXYT72PguJXXLHwi+CRmiYPhVNNRJ3AjyACyObLN0XS3Hvn8HAtpEQZeHiTFQl3RcAANO9wkEgHFXwIqF6u2DwYifshh2dL/dH37uEk4dwkmUtAV7tZsTii8AJBP6/w2b8EtyHa0csp3AeGpH9riLy9CtPctQh57M3FMt+6ijSOlXhKNH901pMYk6eN6jcFnFTDpC82h8FLhAYzpIsYqWyMOpA== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by AM7PR08MB5368.eurprd08.prod.outlook.com (2603:10a6:20b:103::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.592.13; Mon, 16 Nov 2026 13:55:30 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%4]) with mapi id 15.21.0615.013; Mon, 16 Nov 2026 13:55:30 +0000 Message-ID: Date: Mon, 16 Nov 2026 15:55:29 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH hci-dev] monitor/qmp: cleanup SocketChardev listener sources early to avoid fd handling race #VSTOR-155186 To: Andrey Zhadchenko Cc: svt-core@virtuozzo.com, den@openvz.org References: <20261116133056.1046875-1-andrey.zhadchenko@virtuozzo.com> Content-Language: en-US From: Andrey Drobyshev In-Reply-To: <20261116133056.1046875-1-andrey.zhadchenko@virtuozzo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR2P281CA0067.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::7) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|AM7PR08MB5368:EE_ X-MS-Office365-Filtering-Correlation-Id: 130c38ea-211d-4186-d378-08df43e946be X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024|23010399003|22082099003|18002099003|5113699003|6133799003|10067099003|261028144727099003|261021123027099003|261022075727099003|261026121527099003|56012099006|261009223027099003|261021121427099003|261026140227099003|261022105027099003|261102123227099003; X-Microsoft-Antispam-Message-Info: 2alg5hsFrpvCnj2I1MclelmPd+KC6Q9uVXuxyJSgPD2hnU3PMB5AS/+mq0J7mB9tZmqzqcO44cudeUHQcxRPG9iKbksIfaMaUupTJnRRM60eCWZM4t/CyoO6xqfoS26JRWjMCUR8FpCqPmv6ZAoHM68en4vf4aHKLmcFyf3i43GXBpbEdYXsnrqFELCyOeMh5lTfq8L+mnhA+6bd70Of1bHRYEDKJHSjDPIfEQElApnefe2C0dTsfV/E5VgCDAAgaU6TcJ3vsH9ux4sAwnHdmupQfEwXJZnS4Qowja5HTsKIQNcAhUo9gmO434dv/1ck49TUGKdBidojpDWnVz4/9yzDoQcfnXCVDNgtoZkRpf069QAQStObi2eHdFFmPDhrOvret/qMsUjzIHTk0uF/KD2//5gzd9mmVPZ+X3rOe1g5BJ3VsNY3rMWluHkRaJIlNljXX3RTqmJopCvS6CHka2kXfEKNNEZLpMHvQT5hJw0Fogt2WlqIykQA5KHr/cR3o+DyDJyyLBWexqOt0GsR5Wvflp7VqSrhgmqIyRYm2FaHzsZUAS+7p4rvYBd5gKC4pbLNQTCi/Dx+G+Otmbn7Rw/64m2NefX+FXts8yCJ47y/JLrBndCysU5jc5uWQ0OSWGoBCEv1ue24n4uett7foLFryB/V53gFxxv9oTTswTg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(1800799024)(23010399003)(22082099003)(18002099003)(5113699003)(6133799003)(10067099003)(261028144727099003)(261021123027099003)(261022075727099003)(261026121527099003)(56012099006)(261009223027099003)(261021121427099003)(261026140227099003)(261022105027099003)(261102123227099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cWEvWTU4NGRFSXBjcFJ1TllaNFZwM05BMGFReFFFUXJvUFdxUXRNU0pzQ1ZB?= =?utf-8?B?MWdNYjk0enZEQjI4Ty9oK2VmNWVabUFRMTNsZzRmRUhjVWFKNEVldHkwbmFP?= =?utf-8?B?U0NsV2xDN09Cb0xsNHBZQk1iRGdacEcxVW9JZnBtWHFCVjRQb3VhMkV5OW01?= =?utf-8?B?eVloRGtaTlFZY3RVZlRyVEZEVXdnWjFWb2svaEZ1RDRyTVlBRjMxVHVraWJ4?= =?utf-8?B?eGMwZUY3N0ZGVlJ2NUhsbTVneHNaMXFjeUxxQXBBeHFUeW9Qc2Njcmk4T0ZF?= =?utf-8?B?ZXlBaDBGK205bE9Wcm42dVk3Z1NqUmQ2Wlp0K0JqWGw0L1dJcXRXZVhFR1BG?= =?utf-8?B?WTAyWFF6Q2t3MkIralRYNXdsVEcvc0JSdnJvUWdub2J0K3NrSmI5VjRZZVJZ?= =?utf-8?B?c2wxR2NvL2dNY1c0cGxOUWRsd3RDWGdiQkZTaC9rWHFiOGtpQVBUajRCcWlk?= =?utf-8?B?bEhXU0FBR2x4Y00wekVWVkdpeVAvdlBHVlhRZ2YyTG9rWXBSbVVHdHlnYlZt?= =?utf-8?B?MmpWMUp3ZnFsTEZNSk9jdmR1L2xzdjZJT1BMQWlRWWk5QkV0N2lHQkFDWUU0?= =?utf-8?B?VzJmdWlkeTUrbTlhUE9lVXRIdEM2UFlPQTloUnNUY2d4NmNHYk1xd2RndGVD?= =?utf-8?B?SlhoTDBGbzJqMXdqTzlQYnFjRzZ1dE1GMXpNa2N6eGV0WkVUWVhjRUxvQ1ps?= =?utf-8?B?cG40MzlWTC9peWJ0NnVmVElwTWx3Qk5PbFgyMzdzaDlQNUNkc2d1dHNrTHUz?= =?utf-8?B?TWdnY1JIVS9Mcm1NZ2srMmxjS1JpdW1wRlBGZnVCZTdET2JnZi96Y1YzQ3p4?= =?utf-8?B?ck9ES0pFRkhOV1lJUE5xMjFmbjRYL3NWNm1LR2F0UloydzMvWlFXYjhLUnFJ?= =?utf-8?B?ZXg0TG5yU25KaDRrZnVJc0FLazV3cGNGcUJPVW01VXF3T1JZN21FbTNLY2F1?= =?utf-8?B?SDRGT3lKRThFV20zaE0rVkIyTFpRWDdzMi9BKzYvNTZSdU44eU9Xd0o1SWdQ?= =?utf-8?B?ZEc2UkRyeWs3ai81K1I2VEdMUFpENWtKd0x2Y280Q0l3N09hdDJkTFV3Mlpw?= =?utf-8?B?S0svcTc0bTF3OXpOc2MyTlhrTzVPS3pmNE44VXY1aXgzZysxbHVNdzFJS2M5?= =?utf-8?B?UWo4L1Vqa3pRQ0VyblUzRW5RSTNlZzEzNVRZcEkxNlVDV1owZEdkQ3FkcHd1?= =?utf-8?B?THlveVd5clI4S0FuWEFBUzFyd3JMbUpxWWRlcnZEOFJRWkt2a2xWUE43SDRh?= =?utf-8?B?cXRnQ0Y0M2svbmdUcGtGV2lOaXV6YzZsQW5TM0dNMlJDc1lHQW9YejJvNnd5?= =?utf-8?B?Y2lIeFl4R1VtYTRITlUrK1ozWXVqT1piaFR3VlZ3M2xmRUt5LzVVQmlMN2pR?= =?utf-8?B?bkFDU0Irc3VwaFBCQWpoZy9aVlMxd2FBM1Y1K2l2SVoybmJRRUZHckdPVUh6?= =?utf-8?B?ak0xV29iTUpSTFB6bVdRdEFJQlZ1bjdKQ20zUFlnaVBoK3VmL1kxVk1lOFRO?= =?utf-8?B?V0YvQmw4N1FkTWRWQ2V4RXlPd05EQ2REUHFTTGhmb2Z5bDYzRy9pa0JNNU93?= =?utf-8?B?YnZnOVFWdzV2Tk1TcC8wQXhFbGU0d1pOMEJZRTRSZWI3QWtwaUlEdzNLbDFZ?= =?utf-8?B?RUM2VEs3Q1Qwem5qS1p4T0dCWm9DQTBKclhmemJQSkRRREVKclpyVHZ2RThQ?= =?utf-8?B?NVlJcHR5cUYyRTNQVGh0YUFVbFhYVFYyZUw1N2xmL1BSSlBQOGJEaURqK3VB?= =?utf-8?B?WUsyclh2MG9ENTZCcHkxWldaNDNhWWVQTGFYZUhSNFRiQmhtRjR6T2hZV0Vx?= =?utf-8?B?cGVjTnZoSlRnUWhJNVJiZEJqSFk1RjkzSENrazRGWFlNTnRoZXhMb3JqcThX?= =?utf-8?B?MUNML0ErSVNYZUVsQndkWU1mcWM3aUlVWURRMDFiZGJQQ1Z3THNvL1FBVlpZ?= =?utf-8?B?NHJmeXhoTXM2V25IUW5FbTJ3OUprL1o4eThrM2ExYUV2Zjg5YVVPeDBqemhr?= =?utf-8?B?YW1qRHlHVWdmYUNQZm5EZzJjdGplekw4MFVLM3F0dTA1SGhLSVhPS1pmTCt3?= =?utf-8?B?c0tYeEEyNUp2R3A0cnl2SXZMbFduSnZWaHBlZ0VoOUV5MGlYOHJVMWh5WVQ5?= =?utf-8?B?L1FaT0hUSDVFZEhLbUZHc2JRazdUK1pQMmFrNVJOaDR6ZmRFdDNKTDRyblIr?= =?utf-8?B?UmVBZHpHM3JvUlBTRXk1Y3A2dGpPbU9oeXptaWRHVFlBN0VGVlJQYWlMWWgr?= =?utf-8?B?YXYzNyt0WHVpcTBKTGpYNDZubGk5aVBXSkdtcy80eFhJUTFmYmlzYktGbGxp?= =?utf-8?B?QnNubllFWmc1VWt1aXczOXlZdU0vbXl3VzFlSFVuZ2tSd25TekhUcnRLSk9o?= =?utf-8?Q?V+fWszAIzUGELsDE=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 130c38ea-211d-4186-d378-08df43e946be X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2026 13:55:30.5713 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jmNfY5u1Ky/fyoI4UMaOJGLxsQjf5oyELx6165sFbq2c+lDw6Xx0iYOJoMWnLmQJZPVuhwsMe9O5LTWpgUXVsbKQxJPVSuwnd49IHn3XQ2E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5368 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 > > 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 > Reviewed-by: Marc-André Lureau > 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