From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11022089.outbound.protection.outlook.com [52.101.66.89]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7384C81B5A for ; Tue, 17 Nov 2026 17:37:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EGXxhl4uJNbNm0va57h5UV+2ovOa/Wvgupv5OidoYrvqpGMENgsUdy4vmwJSND/aXQ7/QvaAfEuZMCh+1qca7set8zk53YA9fbR2jPL2gjeQZIXop4Kneqe27l08rQIW7jkBHwjGe2A1eh4Yw+dmbW+/RXPxWH49pdB+JJ58rNkQLt8Z4k6sKOzV2V67I2EGOy049RDFR0UtePiIO6yXFmfAZVzd2fw7zP3pfkKmd907zdOLrFB/iZWUznBJ6vMruo79A0FAovzezVcpFsxgF5PfdsAP6PLUfAcUmB3Yc9zBsP4AfUKyYtp+VGPZnRijiKftncDkbqJQictwNQzZ+A== 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=4gZvXXjBs9HHOtSInOdDG138a2UKYCBL8VYUQOzPRyg=; b=MjqiQtkySKlow4mO7Rg0dZW3urPbgHqNFUTZalsoV7chaHXglJ3EZPh3guUPpAIX2xLUlgsKeuSma96u1iSb4ZXzSwD/KeifEQIGjYmIHUgPU3wjE40zpBjDAjBuetnJeTEcm1U3kvr6eH3rS3R1N6KO6kBF3tt04bcbSKCzYnaWjLqy8TFgn4TwlLHbPl21Vv2hrAVZ1fbOTwp7BWBwiQRE+a9+rgAbGxZEkLPpYVf1Y2rXP8x+409TT9+U/22hUHb1cQUuWEsXV18cxKj7D95lvD0org3Yk/ggc0PkYhFZjhcijwgA4/cJfzmpdi8yAPFfYAVTtRm9w9CjWNMebw== 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=4gZvXXjBs9HHOtSInOdDG138a2UKYCBL8VYUQOzPRyg=; b=ik/P1e3QYeQJzN2OGIu8yBwFI6HkYOS9dwdcefPmO0ser/4NRxVXWtjmePO6Fx3PjncTLhjAqTgM9xcH/opYMhixzMmMiegNLSwUy7zJNcHi1ZOqFfg2pQg7PPl5+NvVEYRi/b2PCr2Nd+dUReO0SDu7tyJMGn9zxkuBmbbKBod+5SJOHCWc0+bvHuwLNpv8vZsZzUI81nB+E1A2Fz4ChM6loTcfWL+0ZSNnkm90e0SRCr0chHy84jRiVcB1ti8Qu7jZcenb9jp9C2H+WdJD3/OadTLM6Aew0Q+uM7uz/fe9IGLTJh3XYIVsJjb497VnHlrbqRA0YztKq/D3tnj6BA== Received: from DUZPR01CA0308.eurprd01.prod.exchangelabs.com (2603:10a6:10:4ba::19) by AS2PR08MB8264.eurprd08.prod.outlook.com (2603:10a6:20b:553::16) 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:39 +0000 Received: from DB1PEPF000509F3.eurprd02.prod.outlook.com (2603:10a6:10:4ba:cafe::a2) by DUZPR01CA0308.outlook.office365.com (2603:10a6:10:4ba::19) 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:38 +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 DB1PEPF000509F3.mail.protection.outlook.com (10.167.242.149) 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=4gZvXXjBs9HHOtSInOdDG138a2UKYCBL8VYUQOzPRyg=; b=GV/GEJS84QlG NsNavl82JnDEznKhQnj3uEmsW4OKquIdFZXqXwc58p2OTtPfRJqcfQUZRVDRJM5Yxq5AKPUkmn2gB 7xc1C38xyaf6nfLlWlgt6Nr5W1spajeB9q15BRLvSoCjFT/UXQoUWJCsZzgCof8LUyYQyUeVTg2ZB EctGE5yw1orgscabC5/QcOw7Gwhgaj6AKYHq8ZGZmWf5blatNmsO+/DsctX9na9nnJM91HDQneG1L EMjZ2fjbSSQu9Hmeobua2sUk06aAbY3Z8BHSE7qkgluBQhdFBd1uvDw1jP5zWJ2PYlbm0RWFkNvst kFjsGIy8ocIGg8InLJjQBA==; 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-1g; 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 6/7] vhost-blk: create kernel threads with the mainstream worker ioctls Date: Tue, 17 Nov 2026 18:37:33 +0100 Message-ID: <20261117173734.3225443-7-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: DB1PEPF000509F3:EE_|AS2PR08MB8264:EE_ X-MS-Office365-Filtering-Correlation-Id: 52412295-dfa4-43b0-8804-08df44d1798b 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|23010399003|36860700016|376014|1800799024|82310400026|261009223027099003|10067099003|56012099006|261102123227099003|261021121427099003|261021123027099003|261009221227099003|261026121527099003|261022075727099003|261026140227099003|261022105027099003|261028144727099003|18092099006|18002099003|22082099003|5113699003|13003099007; X-Microsoft-Antispam-Message-Info: XkHcZ+EqdhunXuzmJsM1S/ibCyq7AJxzc2SgeJx8CPe/8cOEvo0Pb9ua5+ErNmqnKJxwOR2l+0YXHfb5Tvq1xMgQgLXdgkOMAjrM2CTLRb5lPg4Xv7+BEejmp1wBOIaedXJhVGvi1QrsDPNOeN5thmiESzuw5ieEk8qXnkTv2F8vFu87OK98tbNff7EbYk4ScIjYdmjdO8RTGzVhCCReIDta9z3CBkzVUQLpEGaE6W6neG4iOodqLpxGYmx/J3/0tFFWDpg3HDajGYhuaA3rwk0GnjXnIiQGpsdWWAyv841yNZgWDRKUVuAWRtwIRilgZEroh+tJgMC0MqDNawtLO69lCE6rIIZ3y0rvKUiuks2/1++IgrA34ZQaMOsq7q4am9gyOB8IjDAS/3U+3WM5JQ73mJiaSKZlSUMmUOjilDN/AH+g5Gh03keeX82mqtRqou0fXTyy5+Ylw+C61GRMNxRWMZXsVh0Re/ON2oh0OzjUh7qICVuYawXQPCe3JiIeZONspfqqlwKFM5YiamHsNVfsidqHBG72xR3qN8yUYPx87eckoC+48iFKXh+B3rBR07aHzlFC8AMhvWNHb+ZrQpTxlfdznrATeEM5Un3x42utTjsZdI0SJGLojkJm2nx/3bryraHfKJrDtBGBpNkmfQ== 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)(36860700016)(376014)(1800799024)(82310400026)(261009223027099003)(10067099003)(56012099006)(261102123227099003)(261021121427099003)(261021123027099003)(261009221227099003)(261026121527099003)(261022075727099003)(261026140227099003)(261022105027099003)(261028144727099003)(18092099006)(18002099003)(22082099003)(5113699003)(13003099007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LyLauok3szLSvqp/Gq4kkC4qNzZyhPK6DO98Dk93FqX7JathTH8dscLvItaoE0pMo5UHcsUa61h2I4ea1t+nKiDlQiOOyfzrdolP63YXU4KWc6ohUZLFSPgqlFxdfCxeRsbR01hy6j8hOLaM2i2s2UnggKaOrIuga4YQy9ZLv91GfvyAA6T0ZUsHTIx4cPNUF1K+k9NyQPM/vouDfXyxSnNDUPAsRfOB2lb3zlAT8G4xQ3RSAVQ7aCxt5XKr9rwmyagxaVm3htAQinvH6XVLamH90x+OJ7dN6oP9PAD3wuwEx4fTgaxxQYemcyJC9dStntRtFnAqayqcPe5lvWdSZ3eFsydH8v6s5i1IdxUwhzsjiM7GqOa12sUwbRr6CPcXCDxc0zoiFVvlqS3oUrT0EjzUwuX8GW1t1LbUoTWvdPYKLdsGbFaNrEg7LZkKRG8b X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 17:37:38.7699 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 52412295-dfa4-43b0-8804-08df44d1798b 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: DB1PEPF000509F3.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB8264 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. Ignore -ENOTTY from it: older kernels lack the ioctl, and a single thread works in either mode. Fail to start vhost-blk if any of the worker ioctls fails rather than silently run on fewer threads than requested. num-threads above 1 now requires a kernel whose vhost-blk handles them. https://virtuozzo.atlassian.net/browse/VSTOR-107537 Signed-off-by: Alexander Ivanov --- hw/block/vhost-blk.c | 63 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 5 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index c817d0e3edf..c9c7d2d0fee 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,16 +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 && ret != -ENOTTY) { + 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"); - ret = -EINVAL; - goto err_reset_owner; + nworkers = MIN(s->conf.num_threads, hdev->nvqs); + if (nworkers > 1) { + ret = vhost_blk_set_workers(hdev, nworkers); + if (ret < 0) { + goto err_reset_owner; + } } if (s->conf.serial) { -- 2.53.0