From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11020128.outbound.protection.outlook.com [52.101.69.128]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7109F803F6 for ; Mon, 16 Nov 2026 13:50:33 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ikt3W20HJLe4jOZUc3xJqMhc8l/IG1Wfs0nQvoVqooxa2nNKQvegmpqOKwgTge7R7O6QE0V/Vw5FbRNKc4zDaeQoDHw4vtFCQgj83kzrNVh33xo+gDnTs3T5dAvzRd2DZoEaIMczISeQ0QZ5uAB8IPuNu29CqGeT26A1gZOrYSfwznQEj0C2gR9xT5ZRhCkkrdpUGc4i133PE9qdzFf+mXblGZAkqM8llsJuADH11ieqMIlLWDUghKnV1R3ypgQWDNB7yYYF29n/1t+EBZnjvcj2rwjnlacJmULEWF9jrOqU1g1eCjtp1MGd8fjWO/SHXASL5VDxKToNekPAohXi7Q== 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=/kv6CpBNRnqO59eC9mwJekGl3hhRCstUsbCUgjjoo0M=; b=g8TRwjnTjmFJD+Q6gjCpQ1bXjeUzAe8pn/zOb/3NyKk4vYSmfBAgtQ95/2YLSVUwIhipJohdL3zB2wegbnUgALynv4IZo7BaFdaUam961oaPmPMgdaaDQh9D60hU2HtZFcgMgAX4bHMT5utLhfLcBvQvqRPZNgcRXHkoqMOj00mCtDmk54ly7zb4aByF2I6A7xpga1F5QlmdnGqv5NmR+s+yPTusUKqdHL/uq0isTJQzfor6SivsEAZjxLXti596OoLCettZ5LTPa/v9uay9OpIyFTBd6r4dmjthFPb3+U++0pwkKGO1EaGQECzIGdJc149OBWJzb0IDTzf6B1Xvgg== 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=/kv6CpBNRnqO59eC9mwJekGl3hhRCstUsbCUgjjoo0M=; b=RP705LBf7uTv7pytAQ9FavJ6D2zjjLbMT7s2LCdUBF5aW9zFG5FIf2xECID1O1mGdExNp2kirGEHfG3ybCpJbxi/UPPQQZXoSt/586HsMyd4Ot6LR7/jXSXW+Jxs/uBsiUJ7I/Yv3L2rBHIH4Ree8eaIsLi43qhwrHS0mKMuIxra5c4TB4ghTgZmyFXBnQ+K5Hiph395X6XsjY/9N76Enur18Gz9RTnNyg16iPtsKR0AwWlMgFklyO1IzwIdDuVce6SXYhG7yz6QDROlMk3K4175e9lCF01yTu+fkS2eOurJNvouHIu3BaJUt1CW3LMV/MJKuPxaqEBe/55bbt+mvw== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from AM9PR08MB5892.eurprd08.prod.outlook.com (2603:10a6:20b:2dd::16) by AS2PR08MB9152.eurprd08.prod.outlook.com (2603:10a6:20b:578::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Mon, 16 Nov 2026 13:50:31 +0000 Received: from AM9PR08MB5892.eurprd08.prod.outlook.com ([fe80::94bb:633f:1f55:4bbd]) by AM9PR08MB5892.eurprd08.prod.outlook.com ([fe80::94bb:633f:1f55:4bbd%5]) with mapi id 15.21.0615.013; Mon, 16 Nov 2026 13:50:31 +0000 Message-ID: <5850f43c-ed73-4671-aacd-c2da1bb86d73@virtuozzo.com> Date: Mon, 16 Nov 2026 14:50:30 +0100 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 , andrey.drobyshev@virtuozzo.com Cc: svt-core@virtuozzo.com, den@openvz.org References: <20261116133056.1046875-1-andrey.zhadchenko@virtuozzo.com> Content-Language: en-US From: "Denis V. Lunev" In-Reply-To: <20261116133056.1046875-1-andrey.zhadchenko@virtuozzo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: VIUP296CA0063.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:337::17) To AM9PR08MB5892.eurprd08.prod.outlook.com (2603:10a6:20b:2dd::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR08MB5892:EE_|AS2PR08MB9152:EE_ X-MS-Office365-Filtering-Correlation-Id: a8ec3ef3-6a87-49a9-7dd3-08df43e8943e 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|10070799003|1800799024|366016|23010399003|10067099003|56012099006|261022105027099003|261022075727099003|261021121427099003|261021123027099003|261026140227099003|261026121527099003|261028144727099003|261102123227099003|261009223027099003|22082099003|18002099003|5113699003|6133799003; X-Microsoft-Antispam-Message-Info: P1q9fmZJICKFJjgiCPGIHASDpiFmjbbkFI8pl3zdppR1V9H70mAcrKv1WvSprpbNvwdLU6OLRIsstUXlf6MFFHrdVl0XhRut7zspttYj23XAO3fZOP5aQIi0+1Cbavjgq5lt7UsOWITGUTMrU16rwnlfDUxu5zJf+6PhPOn8gbl0ChWzWoUd3e5d73HRT2/tdTbSxZCTB8LOrPpB3Yjla9qS1q80bdbAZzR+ribg9VptYB4VAyMfdFFyyUH44Vs1IjdiJ4bjfPC7gc3TyWHgMZiqhfgmo3+MH+2GRkMKbcstRzNCXRUcT2CX/uf4IZ9X741S96UfU/0QbsHYhmBPb+Pxvy5SCVJFC9feUQZRJSiZW++MKRlt0QbDS6/VIVL93JPUaXG7z26dMRuRqOb9HALtVsYb0uH4r6PINiAAk1AK9WufmkT1/MwRMR29p7wJ+xRxMJfVpC/7IIZnVV6DBBvIEbNL0RzAyPIJ9qUtSPAOWNvz15zjdWCiT9UvRewLlyXAo6M9ox4TQY9bEy3pZuelbp6DkU7iNDnDAzqmZrEltwshub97g3YVrith2KQbDYPNp3ZcA9T6UgOiyRMWsTvVASdzUmNm3Jhh7EcuzyI04NxlLmUXvNBCkFTKeBOIMBZh/CuIw+5J0iDe+Brh8ywIMz9UygfEI7ly9t1wCOA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR08MB5892.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(10070799003)(1800799024)(366016)(23010399003)(10067099003)(56012099006)(261022105027099003)(261022075727099003)(261021121427099003)(261021123027099003)(261026140227099003)(261026121527099003)(261028144727099003)(261102123227099003)(261009223027099003)(22082099003)(18002099003)(5113699003)(6133799003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tkd6ZS9xRW00czQrVk92aWtWVnY1TFJPSjNmMzgwRHk4ZHQxbk91VzE5NFdN?= =?utf-8?B?U2QyNTYzaWg4NXJZV3Rod1lnWXRZbmdZVWR3UWQ0YTFWN0pxSTh1ZE5oZnBO?= =?utf-8?B?cm9KLzlQalE1SXRnbit3OFVCbmJJUUYzeHBGc1RSaVhheCs2RnhmQzN1UEtp?= =?utf-8?B?NkdIbk1IYUk3dzBLYWpqaXowOEpvR2V5L2FmRm51cnlNN0xTdTF1MjJLTDNB?= =?utf-8?B?ajhEL090b0NudUpJeU1MOEF4K2ttZVFMYmtzUkhNdjd2QnJiQTNpSFE3Wk9R?= =?utf-8?B?OEtRWG5jZjdDZ0N1cHZXUmZ3dWF4R1VGZCtuazZpU1p5M1BxclY3Nm4vRnMx?= =?utf-8?B?V1plTWNkVU1rcHFQZlYxdWF3U2ZKUjR0MW8yZ0xSVmV6VlNEck8zcFdzNWY4?= =?utf-8?B?SkF0TmhWdWg0SjVKSUxoaU03bHFGKzF0ZTNjMEg1cVVJb0E4Y3RlZGFvaDZO?= =?utf-8?B?V1RIempoMFUxSGpSYUd1dndmOVFWcDZTbjNueU1jNFVYRVJtM29UL3pMUkRK?= =?utf-8?B?bGhRa3hlWGE0b2FYSmdSSi92dnBxUXRJSXFoa0k4SEVQa2UyVkVZV0RVRXJR?= =?utf-8?B?TlVXWWJMTm9hcm03cEFjRVFxcVA3Y29Fd2pMaUI5Z1B0YjAwVmZIOVArOGlG?= =?utf-8?B?aGd5MHkwTG4wSHMxa2o4bzZGdms5cVRyaEh5Ly9JdEs0d1JnQm45VGJjOWRt?= =?utf-8?B?ZW5DcWtVQUlvL3o3MVYySjhuWm05YzlkUm1hcVJkbGxSejZDMXhvaGZCeVlF?= =?utf-8?B?S0h2NFRaa3NxVE1hNXlZZDI1bWJSQzlWVFRNamN4Yy8yQnY3cWpxdzkvUWtr?= =?utf-8?B?M08vOVB6UHFoVXJTblF0SFVTTGVOV01lZWpBdGFTbyswbmZQKzB4bEk4a1px?= =?utf-8?B?MWpjdFg1dU8rVUhmbG9EbSs4Ymx0MnNmZ1BEMnlENEhqdHBmajIwTTZpTFV2?= =?utf-8?B?TFhFVmlETkg4YnZsT3ZNQlhJM3Fqcy9MdW8wdXpJRFlsc2NiTEZEMURhdisr?= =?utf-8?B?Q21OZ25zMXVYelFsRUhnOWdGeU1oMXhJb01FcU1VRHpZdW1zc0c2NmFWS2Fr?= =?utf-8?B?Zzd4UFk1TSs1NHZESGNzbDcyUW1VVWlSUmFMYmR0c3lNY2N4TFNySjcyVHph?= =?utf-8?B?c1VKRFU2QlpLSGhKVkZYM3RJTDVac0oyai90Qmg5b3ludkI0NjlmVzRxU2J2?= =?utf-8?B?MFdRUFdYbW5tZFBBeXhDNFdYbmtsZXlrOTd6dVd0SzJVM2VlVm5ULytmSldp?= =?utf-8?B?V1ArQVpBVmxFT1RhdW1rc0FLOEhYVFZHSWRvV3hXNFJUbDdqemhuOTFtYVIw?= =?utf-8?B?Z2hkaEJIc0hBU1A4cFBsRm9sWEhWTVZTWHV6RlMwYStsVUorZFl5RE1PNUs3?= =?utf-8?B?blA1QkxJSmY4NUVXS3NXNEk1cnNJdWVWOEUvRnVKUk9Mb25udm1FUVJhNUVQ?= =?utf-8?B?M1RjWFJMVU5MZnJhS1lhQmRaUHZyMUVBK1dGdGlPZjZtZHpjNzNMZnl2cTJo?= =?utf-8?B?bEVUd1JPaHBLakVrMDRrZG83K25OQVBCYm9DMWx4QnF5bmtiaDdsMXphS2tK?= =?utf-8?B?NmFraWVsdjZGMERBM1k3NFBnVkozYTRML2l6ekw1NDFoWk0rTHJ4RWpzQTNG?= =?utf-8?B?OWpaN3N6c2NjN3Uwck9qT29BSzZ0WXJGTUZFcjZZbEYzc0hvRnpSRUJvdVIw?= =?utf-8?B?VmZrb1hLSVVwQ1lWM1RkZVA5UjJ1dVBHYWFJbEJHWG5YYnhsSjVndjNqUmNZ?= =?utf-8?B?ek5pK3VVN0NVbDZWMDNHbTRzT2RVdFZzVUV4eXluMUFqRzNyZVQ1bzNJQklT?= =?utf-8?B?VDVqSW1ONWswTGU3ZnZ0Ukw5dnk3dFE2a2JEa09BUTloUGgvcjhQa1VlM1Zh?= =?utf-8?B?VFd4VWl2a09SL0dmbnl5YThES3A5T3FJRk52VjlVM3FKRWtKamJ3Y0EwRkQv?= =?utf-8?B?RU5iSjBLS2NlY1kwZ2I5QzhpREtuUWtIblQvVlc1b1FtS3cxaXpOamxWQlNZ?= =?utf-8?B?RFY1YkFydlpCaUdYZDBuQmVXTXdaNGJYazhiTHVCb05WaGt4Y1pWMUFmalVh?= =?utf-8?B?R2VQOWtXL09seFFjdWE2UWFaSHNIUVg2Z2FjTnNiZ1h5OWREMU9jS2xoMndS?= =?utf-8?B?NjhKK0pQZUk1V2ZjMXZTSm1DUGtESkx6QXI1bDJyZDNZTEpNMXEzT3hwVkZS?= =?utf-8?B?eFlVQkpzWm5SSGk1ZXFPNzNrZTRGenlmT1lLOHlNTnNNbmJOQW9sQW9DaUFI?= =?utf-8?B?Zk45YXRMVmowMkttaTdWU2srQ1FzRDh6ZGRCbnVyNkZOcm9ZaW5PcThDWm5z?= =?utf-8?B?ZFhuY1duSHBhcEpJTHg4c0tjNmFrcVZkbWg5WlVORjVTNWE3VDcxNUlxZEhr?= =?utf-8?Q?VYg1wpimZwZXwsd4SgDKhN/gbE7U/mrfFVKgpYhvMSfyf?= X-MS-Exchange-AntiSpam-MessageData-1: vR+h8m88fLy5Vw== X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8ec3ef3-6a87-49a9-7dd3-08df43e8943e X-MS-Exchange-CrossTenant-AuthSource: AM9PR08MB5892.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2026 13:50:31.0864 (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: UIANMh3x2/I1K4CSxO0NFXmxRlLFychbHePvJ9jEJIq3dpUXTOKNj5H7G5dc/FhGSQsxUtNKDNYDdKvf+Zp9aw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB9152 @Andrey -> take this to 8.1 pls -> tests suffers from this. Den On 11/16/26 14:30, 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