From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11021135.outbound.protection.outlook.com [52.101.70.135]) by lore.virtuozzo.com (Postfix) with ESMTPS id 916B78106E for ; Sat, 31 Oct 2026 15:35:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=apt532G1uTPNYlACrWJdulxImUY3R5gO6qLUqh7t3tE1BF+reUq2WnYJGqVAWt3DZbfdyB+n6bCRdU5jjuIRBRWyv7PhKpMk1ojWp++H9+TTUW8zXZAO9hq7Q2+C3PnVql7UAvnOmV6a3oafnVvySHO93kMrchdf/tKDErI3Ob2TH7+295qgkWYIFMovf4KObpTkwBwJpNW/nUKcGVCGrJBC4MNrdkjKln95eoTZdfctpop1OBVTO1Tq4e6j6Ll6fpULQLAUXpk8M6O/H2O1hOmXlAMBAAaYL8/ZzM83fdPQJ/iYvT8L9iwwg8l0oW7njNToL7zQNcmE0DePok4+yQ== 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=pp1Pd3bgXHR/01YtfpWV1/PpD108V7ChXNSOkqwLs2s=; b=dHa9HLicAKSZ0OntErZeutsaifi2MDLCDL79wSgfcLNUoGjcq9vZGeRmbDA+UKYRNFDJ06uC0Tc1cWn+Lmj7jY/UNqJeLkTNW9B+L+YokU6BX31Ot/x7rczzh7JuzzBTrEyPPjZM4AOQ/8Cog2zpLdBraRtkK669xdIvELRx5cLoRUBGzhhMqDA+lsXR5eZQw1NY0SI3oXmIcfGSbGBiskGsdckVTNGjQk3lU7dtbtP+dtZSCoNvrG/As5avron71O6wqdfvNyXG1YRbPT8xBv9YkrjpwtrUpprjY17YUu/IeAcA+HgmHWlm113KfhoeO9LfVUGTC2gOVKnglCohXQ== 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=pp1Pd3bgXHR/01YtfpWV1/PpD108V7ChXNSOkqwLs2s=; b=djb0G22CGi47wtbfqSpKof1htN38vyVz3Xt4jnZ6jHDGKcztVv6XNp8uET9h6+CKKr10ov7jIg8ie1yo1dXmPmbJ6DVdDbJfyiRrG5KBWCkTWo5+UKFxvhtu9qEYX2DLl/gtf8mrKC8b5ijRxjvVzdo+Kml60xqWTI5TKg+eeOOlkQJktAU39y9gY6zoHvaso5mERqq+4CoCMGEePuORAEI36Ul7w0bfKc/6q1PXEba/ialpqxcccSuM0U2MyMJEHWT18Wag7XhA2H7ec+Te/dErPHQzwerTpd/zQr14u/H7QWdYAnoJoikv2PlnhIzHr4D2Nr9INQrbVUzWoF93NA== Received: from DB9PR06CA0013.eurprd06.prod.outlook.com (2603:10a6:10:1db::18) by MI7PR08MB537322.eurprd08.prod.outlook.com (2603:10a6:290:102::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.11; Sat, 31 Oct 2026 15:35:35 +0000 Received: from DB1PEPF000509FE.eurprd03.prod.outlook.com (2603:10a6:10:1db:cafe::8f) by DB9PR06CA0013.outlook.office365.com (2603:10a6:10:1db::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.11 via Frontend Transport; Sat, 31 Oct 2026 15:35:35 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; 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 DB1PEPF000509FE.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.569.4 via Frontend Transport; Sat, 31 Oct 2026 15:35:33 +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=pp1Pd3bgXHR/01YtfpWV1/PpD108V7ChXNSOkqwLs2s=; b=ak5GZfJ82qN6 P2b290E6tMYasXqYbY+p760+7oaPh86ebLvFyRvAq29FP8cqdZLQ5/EdUoG8qIdlYmFFJoheCeRfL nEhQs5EDLuTG2MGQV13NSMxzWuxk7gpKZEtHNLQrbVt229aF0rvHGxUXn5cWN9Ig+bf8k3wfyHp5X 8jNmDJhwwAdmc8cexEgXLdVcChvgytMXVtI/Y5Ejt1G/ghrF4JsDhFIdzjb6biBUL0Nrhs3tiukGq s+U7p+OnQmgcJQUuHxhIzNZli05dwUL5VPnZYYV5Plgfdegegc0oIlhoTuddIhAyy/tgGYxWh+6Ao 89FlgWJH3X/WYNd7Yol8Gw==; 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 1xNB3O-00CuDQ-25; Sat, 31 Oct 2026 16:35:28 +0100 From: Alexander Ivanov To: andrey.zhadchenko@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, svt-core@virtuozzo.com Subject: [PATCH hci-8.1 v5 4/5] vhost-blk: create kernel threads with the mainstream worker ioctls Date: Sat, 31 Oct 2026 16:35:27 +0100 Message-ID: <20261031153528.3857823-5-alexander.ivanov@virtuozzo.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261031153528.3857823-1-alexander.ivanov@virtuozzo.com> References: <20261031153528.3857823-1-alexander.ivanov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB1PEPF000509FE:EE_|MI7PR08MB537322:EE_ X-MS-Office365-Filtering-Correlation-Id: d0d02614-bede-431f-44de-08df37649a98 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|376014|36860700016|82310400026|23010399003|1800799024|5113699003|10067099003|57112099003|18002099003|18092099006|22082099003|261021121427099003|261021123027099003|261026121527099003|261022105027099003|261026140227099003|261022075727099003|261009223027099003|261009221227099003|261028144727099003; X-Microsoft-Antispam-Message-Info: tbi2IEwgyW/WjKNhodBnF29FJikuxUG80AzHQ1n5ZNJ6oqlBI1bAZSL8xDbXVlDwoN1J/65tBWTGZtaLzuDgstyEDY4yecJZnhIT3y4lKk9g7cBCnSNY1nU3Ypit0KSZOZG1GLuvlLp9VOhhfrUymEFnvehn+gohDSwocXSC+PhZgR4RjXkdVvWv90yhsIHSVvvMHa3JJBjxd6yYjLFl8g4GAAraHmQUuEC5DJFIykY6IT1bWZeX2Nd5/Lm6+3MvRE8sAImsUoFJGjTTLvmUhaNbakzF9N0Y4LIZRNEgwCtiwfmupiT27qA5I0ySucG41+c6gMmeSOzfUYE8ORufyc1ii1p9nJ+65CtN/tKfZZkLksgOrH66GhMRvNHP9HlC9Oj0ZpMKKA22TBKWJ4OygVz+HsVJRBCchndAqIpyyy1iPMJClEIKdmZo99G3yb4OVxl9R0DwcIZ7cVypw/L2bqqAHAD9v+LU6sUeN7E4p3DiWoNQbq9S+3LBg3KE7J5gmtnQJpUmhQL2oSU3P+FZljKKYXBb3rNU9Lj5+UQ8W1Y44t2Vb8xOcU7ky4xzwNuQc4ir3IZBavpSuxakH09d8Q8tNyPKL/lkOzyEgm8153m0xjgGR8O3PGQ0O2VkDbOOaJrBHhw3e6Pz0w8RGn1tb1KSCXXUyIU98TF/W6UAUI9AbJwm86cHvW9qtDE0J+OsvlzDoZLdVaeoFEmG1vRrVAFgIX8e1kImTcCkTBqwsABaq52ZUwVY9wNUuxGHNFZd8MZSPp983bRxl1fn9OYt4Jcr+ICuXM5SoTk6fN/XsG1wTqJn9ZHriA6TX04W2LBQmDBygUhq6hyue46M9dDlg87OuIlkypd+9KLHYrlcY3qeC5s4QYogw4DHss/0UeAw 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:ErrorRetry;CAT:NONE;SFS:(13230040)(376014)(36860700016)(82310400026)(23010399003)(1800799024)(5113699003)(10067099003)(57112099003)(18002099003)(18092099006)(22082099003)(261021121427099003)(261021123027099003)(261026121527099003)(261022105027099003)(261026140227099003)(261022075727099003)(261009223027099003)(261009221227099003)(261028144727099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3j/fYzpZ51KK5bU6A9hCY1+GDFSeQ6SeWAsMvsT8NI3TUWhyV0QVKAdm4Zcg9XfpU1thT9jeO39YEiaokM9U9z+Vz1jo3aCEyqpQtv/6gy0lrZE+XydWQTIRZrbdyDG8bgyNgRDJlCkJne4mqXmylp+HGyK8IgXEcNaJnAJdfvGJAp0UosNqg2ermFeQbt5hdb5osNCBVNRZt4fPdMLBxKNruV7GpvkNXn0RpVGKgExtBiBwNxoaFs0RCDKdXullVACalTfRvkPt/1SJpFzgZqt/gJP0QVVy9s9e76VErjbY6aqM64MSyYh9ErSkQ2g4xCGuYk2wo+5Way7dJslrXaLiEnT1HkntcOqf5Dz77yZNOHpVMwvFweA8Imn6mPzxWTuB7pOdLRUgUPykOhkX8THi8L2hO9EIz61qHXzjNnpmDicu83RepCvvSviWoBVu X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2026 15:35:33.9777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0d02614-bede-431f-44de-08df37649a98 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: DB1PEPF000509FE.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI7PR08MB537322 num-threads was passed to our own VHOST_SET_NWORKERS kernel ioctl. The kernel drops it with the revert of "drivers/vhost: add ioctl to increase the number of workers" in favour of the mainstream worker ioctls, which vhost-blk now supports. Create num-threads - 1 workers with VHOST_NEW_WORKER and attach them to the virtqueues round-robin with VHOST_ATTACH_VRING_WORKER, the layout VHOST_SET_NWORKERS produced. Our kernel, unlike mainline, defaults to kthread mode, where VHOST_NEW_WORKER fails with -EFAULT rather than -ENOTTY. So switch the device to vhost_task mode with VHOST_SET_FORK_FROM_OWNER before VHOST_SET_OWNER. Do it for num-threads=1 as well, so the default thread is of the same kind whatever the number of workers. Fail to start vhost-blk if any of these ioctls fails rather than silently run on fewer threads than requested. Released vz10 kernels have VHOST_SET_FORK_FROM_OWNER, but their vhost-blk does not handle the worker ioctls, so num-threads above 1 now requires a kernel that does. https://virtuozzo.atlassian.net/browse/VSTOR-107537 Signed-off-by: Alexander Ivanov --- hw/block/vhost-blk.c | 62 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index b3eb181ceae..3cde12051fb 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -33,6 +33,50 @@ #include "migration/cpr.h" #include "system/runstate.h" +/* + * Spread the virtqueues round-robin over nworkers kernel threads. Thread 0 is + * the default worker VHOST_SET_OWNER created; vq 0 and every nworkers-th vq + * after it stay on it. + */ +static int vhost_blk_set_workers(struct vhost_dev *hdev, int nworkers) +{ + uint32_t ids[VHOST_BLK_MAX_QUEUES]; + int i, ret; + + assert(nworkers <= ARRAY_SIZE(ids)); + + for (i = 1; i < hdev->nvqs; i++) { + int w = i % nworkers; + struct vhost_vring_worker vq_worker = { .index = i }; + + if (w == 0) { + continue; + } + + if (i < nworkers) { + struct vhost_worker_state worker = { }; + + ret = hdev->vhost_ops->vhost_new_worker(hdev, &worker); + if (ret < 0) { + error_report("vhost-blk: unable to create kernel thread: %s", + strerror(-ret)); + return ret; + } + ids[w] = worker.worker_id; + } + + vq_worker.worker_id = ids[w]; + ret = hdev->vhost_ops->vhost_attach_vring_worker(hdev, &vq_worker); + if (ret < 0) { + error_report("vhost-blk: unable to attach kernel thread to " + "queue %d: %s", i, strerror(-ret)); + return ret; + } + } + + return 0; +} + static int vhost_blk_start(VirtIODevice *vdev) { VHostBlk *s = VHOST_BLK(vdev); @@ -52,15 +96,25 @@ static int vhost_blk_start(VirtIODevice *vdev) return 0; } + ret = hdev->vhost_ops->vhost_set_fork_from_owner(hdev, + VHOST_FORK_OWNER_TASK); + if (ret < 0) { + error_report("vhost-blk: unable to set vhost_task mode: %s", + strerror(-ret)); + return ret; + } + if (ioctl(s->vhostfd, VHOST_SET_OWNER, NULL)) { error_report("vhost-blk: unable to set owner"); return -ENOSYS; } - 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; + nworkers = MIN(s->conf.num_threads, hdev->nvqs); + if (nworkers > 1) { + ret = vhost_blk_set_workers(hdev, nworkers); + if (ret < 0) { + return ret; + } } if (s->conf.serial) { -- 2.53.0