From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11020138.outbound.protection.outlook.com [52.101.69.138]) by lore.virtuozzo.com (Postfix) with ESMTPS id 6E99E81B59 for ; Tue, 17 Nov 2026 17:37:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ez9Dz/K/nCukNxMcztpY8SLb7bW4bP+0jWMS7djQDjui/z1SUXV2mA3fQIKIMvNJVxmB57aIZuB1aWGU4gWkc7F6dD4y6THYJJ/EqhVWRXF9ERq9K/YRJapK45vueoguATd8d3715/zIFq+25+eT3pYLtqpg4cYQRyKfefYjKbN/gcAD2iiyjD5oPOZxxCJ5upiu1WGg2kTENBbYQh08j2FL/gJDZCKR25S96tmxeLT3Nf5JZmW68U+7f3MXuby/YlWnWqMSwPlu3pqPiUQQ0GRB2ihNLPq5akWhwO20TvGkKMtfOchAjgipagVfLYDF3w/yBG8Fr9Rfvl+JjuVT9Q== 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=41HZdH3hJDrmrLB+AfzY9AKQeF7J8tHj/yn5lhpwebs=; b=DC/ccaDfVhkKin1epSGTer+ZLAMDxla5P3LmOjdi1MZNogs8eIZ8ZcaBvPv1El7VPZJrR52hmNmu/1vd8JCx2xm11qbNNyu9IgtpJebelyJOa0QIUhSyVXHgMxoyzcaJePhf+SEPItogcDDc8cI8LfBUVbYop8wRUWcjgwphpVK+OKseEeLqegu75ZJxfaqej2INsyiYeBAhkX3UscbZ8/kErirD+pRnAI1Hi0MkJuCPogvxyyzk2AAt05ny5yMDJv2wDKa5e5fWqi8JxIJVjvVq4fPVPI7lbW0r+OHwz1v/hqFJU9KROfPoHBB3MtrIbukon9P4ijkgFQ0yPF6xyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 130.117.225.111) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=virtuozzo.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com; arc=none (0) 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=41HZdH3hJDrmrLB+AfzY9AKQeF7J8tHj/yn5lhpwebs=; b=SarHNG8kXiQXTyiRoBAbZumecAn18JxpwqbDHLVlZWXi29Olv/OE2ahVHgTD+QEjszP3HtqR3zbazzA9DsWoQiRHSOXAqHP1bfbBc9dQW2Mfrcp7cd0vRmCUS8k59j4+r/uR9gLG5QQq2Kr8WusMyIIPqet4yvFrt9Ceh1q837o9bxTgDNTEtIrJwu1ZCMPs1ohrK97gyiZjAs78w4Ur7MpYObGZqBdaEYiQM56xXbVOuru7tsX0OmevtHuITG+cZv5zuZf/a2IUFaGQcyuUXCXcdHXqpJfrmqQFB59uVCspn31o81UzRSF/lehwrO4nHqm3acISTnh5YtY5q4PtcQ== Received: from MA3P292CA0061.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250:49::14) by DU0PR08MB7486.eurprd08.prod.outlook.com (2603:10a6:10:356::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 17:37:40 +0000 Received: from MAD0EPF000008BB.eurprd04.prod.outlook.com (2603:10a6:250:49:cafe::13) by MA3P292CA0061.outlook.office365.com (2603:10a6:250:49::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.14 via Frontend Transport; Tue, 17 Nov 2026 17:37:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 130.117.225.111) smtp.mailfrom=virtuozzo.com; dkim=pass (signature was verified) header.d=virtuozzo.com;dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 130.117.225.111 as permitted sender) receiver=protection.outlook.com; client-ip=130.117.225.111; helo=relay.virtuozzo.com; pr=C Received: from relay.virtuozzo.com (130.117.225.111) by MAD0EPF000008BB.mail.protection.outlook.com (10.167.241.170) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.615.4 via Frontend Transport; Tue, 17 Nov 2026 17:37:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=41HZdH3hJDrmrLB+AfzY9AKQeF7J8tHj/yn5lhpwebs=; b=euVNs4zzcRKI m+RuBZdSdZ8ls+672JPBPJb4WwFkX/dST/n+b25kvhk9JUO15fXKirBdeZ+JoFcxsD3u1opsVJ+gu kBXo5beN70goEhbv58gb+YUY65O6DrTRq0vmjz+oi0cBEW3TTnDk2JO8bQn2HgymxsqVHoqu/tntG j+KSXGdWubuM7MCdZCVaMlOgfRXr3hrdoL5IKmCshFV/S0izhz72E1u6gVU6jXga9GA8XPalzuGSM lAATw9Ge9LEp5g1tlP0RZNq4EKT22gzW+4cCSmbPwUXBaQ4moFQcAZR4oPMIu0Nom7DcxnW92TctA GHYBVGdWlTVLGcd6YrFI+Q==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=sky) by relay.virtuozzo.com with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xTN3R-000AxI-10; Tue, 17 Nov 2026 18:37:28 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, svt-core@virtuozzo.com Subject: [PATCH hci-8.1 v6 5/7] vhost-blk: reset the owner when vhost_blk_start() fails Date: Tue, 17 Nov 2026 18:37:32 +0100 Message-ID: <20261117173734.3225443-6-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261117173734.3225443-1-alexander.ivanov@virtuozzo.com> References: <20261117173734.3225443-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MAD0EPF000008BB:EE_|DU0PR08MB7486:EE_ X-MS-Office365-Filtering-Correlation-Id: 824a82bc-50f8-406f-92f3-08df44d17973 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-Transport-Rules-Loop: 1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|82310400026|376014|36860700016|1800799024|22082099003|18002099003|5113699003|13003099007|56012099006|261026140227099003|261028144727099003|261009223027099003|10067099003|261021121427099003|261021123027099003|261102123227099003|261026121527099003|261022105027099003; X-Microsoft-Antispam-Message-Info: ZWp6Leey+f1iwP7q22PQu753EU3aoJmfb1w+6mmq3AIV+flb9SqweiYuqOxwYSmeaLmnjOn5VBXRTjcNlHcS51E90mwOyb4jxjOzZ4o2mIJb2iRQM8oPrWkiD5uqbG9t/cd7q3SudRCDL1CpnnDP2/9jI2SJXsZNeuDgzuczOe3yR29Dvf6aQoYOYappcrgBQG2oS5q8mYizYfdn4GQ0HLPCjkfsx37DhKckJWji7Olxh5nrwvIqi4ZlbilDCSWNDgSTaGTFZheJfHQt2U2VcuVKJp993n6mjCojbUUpAf0ySAHbGD6JeRsZ9wT/lZvWb95VQkXlTpwrKTreDtK6URYYEAinKLQ85QAZKf4yWfh62KOA3tlFou0WzaZ5bvx3mQcQ5bYpA0Xef2kSozxyBkby54e4k0w5GiOg+ntfF6YxdvsdW1af3NsQHZflcmhxZS7/i2r+7d+6RxZyOEEwU80p8SVweNiOpQ4Y/ajMc/CO6ycUDrNTBurQrJkslJSIZc+iXhrmQEFHl6DhAjl8tdn8/S+SOiAVhmzx4K5mElXoSLVfGTN7ZdZtDFFkyHXpNFl77ZVJWpLC83ZOI5idbEBNcczBtaxbOSloLWNlRHm+z46sWZK4/YbkWLda4SyOEoyak3V56CRrImSIiSg8Xw== X-Forefront-Antispam-Report: CIP:130.117.225.111;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:relay.virtuozzo.com;PTR:relay.virtuozzo.com;CAT:NONE;SFS:(13230040)(23010399003)(82310400026)(376014)(36860700016)(1800799024)(22082099003)(18002099003)(5113699003)(13003099007)(56012099006)(261026140227099003)(261028144727099003)(261009223027099003)(10067099003)(261021121427099003)(261021123027099003)(261102123227099003)(261026121527099003)(261022105027099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YAksGEPHPCt7weFLpBCQZvqKAV42plwKfe0RJVvBVZlAZTS8ovGTRn0n02Qvochu5HI/P7M1tkRPS9bhQalQidFFTLG+zuSlsSypFvxQm1aqisxfPHiQFSOP/Mw3wPCKnXyUqifd8O9yI1fwhzSD9kP9RSIdS9HHp8FRia7mZ1+mFfgE2wGWUC0aeHo4V7jp8gFAQZkme83a16KVs2Tx5ICH3Q59mh1vgUntlHrBRopB7MqAMFFbEOCdTNELkYs+ZfBPCUn9tQlhyQaGe2WMIRuyHip6KugNCYWupy6cf3P4Wtj8XatAD9GGTg7kayeupAt0G/v728w+mMdeTR7eqK91rf+ektuA0BJPPyEWgIX6jGRICLw4YM18XPgXboiniFjW2mm22nxOINmqOBKCXqS1/vhn0O1bszBLUqA9v6X4KTRgJU60r/+Oo/RD95AJ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 17:37:38.6086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 824a82bc-50f8-406f-92f3-08df44d17973 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f;Ip=[130.117.225.111];Helo=[relay.virtuozzo.com] X-MS-Exchange-CrossTenant-AuthSource: MAD0EPF000008BB.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7486 Every failure after VHOST_SET_OWNER leaves QEMU the owner of the vhost device with its worker threads running. The next start attempt then fails on VHOST_SET_OWNER with -EBUSY until the guest resets the device. Undo VHOST_SET_OWNER on these paths, as vhost_blk_reset() does. https://virtuozzo.atlassian.net/browse/VSTOR-107537 Fixes: 0ff3cb5ff28f ("block: add vhost-blk backend") Signed-off-by: Alexander Ivanov --- hw/block/vhost-blk.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index 1db8cfc7445..c817d0e3edf 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -60,21 +60,23 @@ static int vhost_blk_start(VirtIODevice *vdev) nworkers = s->conf.num_threads; if (nworkers != 1 && ioctl(s->vhostfd, VHOST_SET_NWORKERS, &nworkers)) { error_report("vhost-blk: unable to set number of kernel threads"); - return -EINVAL; + ret = -EINVAL; + goto err_reset_owner; } if (s->conf.serial) { strncpy(serial, s->conf.serial, VIRTIO_BLK_ID_BYTES - 1); if (ioctl(s->vhostfd, VHOST_BLK_SET_SERIAL, serial)) { error_report("vhost-blk: unable to set drive serial %s", serial); - return -EINVAL; + ret = -EINVAL; + goto err_reset_owner; } } ret = k->set_guest_notifiers(qbus->parent, hdev->nvqs, true); if (ret < 0) { error_report("vhost-blk: unable to bind guest notifiers"); - return ret; + goto err_reset_owner; } ret = vhost_dev_enable_notifiers(hdev, vdev); @@ -121,6 +123,10 @@ err_set: if (k->set_guest_notifiers(qbus->parent, hdev->nvqs, false) < 0) { error_report("vhost-blk: unable to unbind guest notifiers"); } +err_reset_owner: + if (ioctl(s->vhostfd, VHOST_RESET_OWNER, NULL)) { + error_report("vhost-blk: unable to reset owner: %s", strerror(errno)); + } return ret; -- 2.53.0