From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11021111.outbound.protection.outlook.com [52.101.70.111]) by lore.virtuozzo.com (Postfix) with ESMTPS id 72D93804C3 for ; Thu, 3 Sep 2026 12:35:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hmEcRaW3cFMvMI02L31nqE6yAPv0r7oE8vXVaSNL8lxTBNDWUbvt2YcE8zSUASeaIYPC8q3EbZhLj3QyJGWyVZB/Htf/0nvchcMhRhl+qYR5E7G2uYo7/vrqu5051IR8fckTKYyO+znZOaxVfNaWI4QNoNijeYRl/2dZW1ryxm09c3UN8vqpgJkmVuonhXtqK80JbThGJcM6AURnEda7SZTKBCfIVvR+0wtY4qGzTu2dP7PXP2q6NlXLcwEftl/7OmDsUIMkPRxD3gJm6nYKfCidsCvW1XwvTX/ll6jjNC8sUnQXJF5H5ePYZIwLGNnQ6yDUGTPUn26pX0K77BSN/g== 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=61kf/b6/fOofTDAa3j490rcEYLy9iZin+zZdIGnvSpA=; b=ODO3ciMfFVt8xR5Ifxm03kNyeMY4bP+tmUezZLbeqwqQPRDUu5d2bTLsJRhBtxHqvu8ey9Paru3Ph7ZBvZBLlVA3PuACsvTrJmZKEmgHVLH9plXnwtpsJ1/OLFj+Idysm8wUEEYwh3VLn7q9vQcEbU1KlzQkV9wU872Jcg8aIX5O3CE7tJeNNzBusJ8eG/kd5t8Wrabrz14PELfYR14uTGYBIczOpgiZbkuHXFupGajiwm1kVNKp5iJ4E6HRH7HMo86ZvRWo9nzehwV6nc+97Z9sgRmifH+skvC+Ljp/Mn7CGkWDxpsK7rnq3CgVQM8znFR+7cZ0MBW008seEQ3pqA== 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=61kf/b6/fOofTDAa3j490rcEYLy9iZin+zZdIGnvSpA=; b=ZdMJO44jdB//f6Wjcph8t7UrBvr2l6fyMKFGReRTsqnhp9ihRyNLFaS5rS65xLDU0BYla7zVGrRvVPvG2Ik3BiqFz4hGkzdeRzTs9LAxp1PvwUmH4pDb/9vMnfJvQ/Nn6vlxu+kcuXF7Qe1mXzIT2pGHy0vEqXrDfuOpiPHVe7LONmqN2zWwwzt05XZPBQ8n2dWnJqwjCzWjY40st68/0GZGtdtujLB6AU31OH8QdNXLRfo3gFJBkBf83WOgwHuiVHNUB1aaMrIPoTLvg9NjK1ocua3S/m2wzcgGBb+WXqB3cft8YAQQv4Kda7aqs2WCyKKg/vS+B1vwm9VsVVCUEg== Received: from PAZP264CA0194.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:237::27) by AS2PR08MB8782.eurprd08.prod.outlook.com (2603:10a6:20b:5e4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.10; Thu, 3 Sep 2026 12:35:00 +0000 Received: from MAD0EPF000008B7.eurprd04.prod.outlook.com (2603:10a6:102:237:cafe::91) by PAZP264CA0194.outlook.office365.com (2603:10a6:102:237::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.11 via Frontend Transport; Thu, 3 Sep 2026 12:34:58 +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 MAD0EPF000008B7.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Thu, 3 Sep 2026 12:34:58 +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=61kf/b6/fOofTDAa3j490rcEYLy9iZin+zZdIGnvSpA=; b=VMBsYHH6bGc3 pDB5WN3+9h73J/Mnmeg41/vS8+ZpCnAXCt63s9e3zU/nBee5mc6F9hL902sXnLoPFt4An30SKIG4X 1My8jWBM8QaVxwOIvi+ryM+B7ur44zl1gNWPhfVTy0sKgiMjAThphr4qJx/nWMjWi8xiJ/22HtFmI dsMLPieMEX2uoy0o4Sp/yCZocORrSAm0rUoS0h7VOjZd0P/sy/JJCM4xzVvxnq3ElSjluPmAjTMOb az+TvmWu4XxfMsC6p2FKKH/eikiPwzf2kJ6WVNgBnw49f3fdfSXcJcYeQu49/FtEpRD2KZENV0agT cmdXSswy8TTtBQGwtEZkpg==; Received: from [130.117.225.5] (helo=vz9-demens-1.aci.vzint.dev) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1x26cF-00AcxS-1B; Thu, 03 Sep 2026 14:34:55 +0200 From: Andrey Zhadchenko To: svt-core@virtuozzo.com Cc: den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [QEMU HCI-8.0 PATCH 2/5] vhost-blk: change backend setup Date: Thu, 3 Sep 2026 15:32:01 +0300 Message-ID: <20260903123204.24035-3-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260903123204.24035-1-andrey.zhadchenko@virtuozzo.com> References: <20260903123204.24035-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MAD0EPF000008B7:EE_|AS2PR08MB8782:EE_ X-MS-Office365-Filtering-Correlation-Id: 74c30e2b-4713-4719-2f5f-08df09b7c43e 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|36860700016|82310400026|376014|1800799024|23010399003|56012099006|10067099003|13003099007|6133799003|5113699003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: WkWGhvcP/MdAteqHc9wEhy2rbIvWM4q0CYY9atqwGT71WtLxN7KaPJ0ie70PkmriobYkcHo+VzcR8I/4Znj5L4/DpPDgoZ4JHEOkJGoIh2p/Z7R2HsxrJP2vXtXffkj9W5eaYlyw46BY3A4L5nbxjxLQw/FoqS5nIMyQlx9xg15rQv1A7qbrKZWKC9JFuenuVeuTymX94Y21fNK8Hs5tHi1xGuq24BRqKD720S6GtuevPYX6ASUR+D78ObDzUtQJraTgUwBe5Qlc935nZ3Q8wqF61VUTRCz+AO7Caxgf2Vt2XJXBvAeUZwQCqJdvnPwMkv4UOyx6EC6veFM6grK/HW0YOfa17fHHmQlZSU3hyftGX8nZjZU6z+q0xlfcMg1XJ9I+XQ+JRlBgPl1EULgWh5J9gP009tKnq4TaQ4eTNkOsHXxg0wG57wS4E7Em7GAmy/3yxwSrxAwl0iZNUO7BWS212V8+AHBeTo7njF536Ly3Cj5eYMb1iHicyzHN9DoU70cehTxcEu89CTNhimtylZFx7Yi+FaoQSb+t5xt9ooxqAoBzEazH3qO6xdh58VA1q3xY2NexVHoKL0oAjbZgnfBJXv+nM2CxxRqrhNYgZcq3GYiFOneXmCR7swkZaKV0Y66sHc2/U62UCC0XudvLBgcSB3jp9Bkra9TV1qXTnZvJODltgHv9EpCINqLyxZKohA+1E6kF2kHw51MisArXzA== 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)(36860700016)(82310400026)(376014)(1800799024)(23010399003)(56012099006)(10067099003)(13003099007)(6133799003)(5113699003)(18002099003)(22082099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1SU+JARPhnGmjwOfwTKeIfQ35pTpfg9LBggqH/2/Ijeew3o8ghPUt+NRvbIXgG5fKbCvYFhrNb+DAJfXefvvAtJ05P/GCwCoJQRrJNuwkF0NMANM2X23QRVsVOP+45Yz/jqL0PHRLlEZN/qBoaGFHlT+T4toZaar0HUbnzHnSRRTwzKin4VEPU1vHQOx7LgyAqsOCAvZ8xM+HDM4z/JNyms2/qfPCOnW4QX6hH6aMcLj67wFw3uMQ3OYBc8AteePeicshI8BjUuisV30FzD/4dDCSgw9ZcW/Pf5D89om9WI21td6EGecr2xSi0gC/QJWjuJEJ/oOSq1TJA9ai6a/M4mrLNfCssMVGByhLMYTMDW4KFQiOYJlHxLyVbp6jZSyUy9nTHmewOxinb4Vo7K+pM/Ff4E7yXVsq942SmhIge0eW1crOxX4Ow7K7AipHFQ+ X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2026 12:34:58.5369 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74c30e2b-4713-4719-2f5f-08df09b7c43e 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: MAD0EPF000008B7.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR08MB8782 Previously we used very ugly and incapsulation-breaking assignment fd = blk_bs(s->conf.conf.blk)->file->bs->opaque; It is wrong in a many ways, so let's rework this. Patch changes default `drive` to new `devpath` option so device fd is managed by vhost-blk itself. Unfortunately this way we need a bit more preparational work: finding out disk length, block size, etc. Don't be too broad and just do the minimal and set reasonable default values. Validate with previously introduced blkconf_validate_blocksizes(). Also we lose resize, as this is tied to the block node, which is now have no place in the setup. We will add this in the next patches as well as RO mode. https://virtuozzo.atlassian.net/browse/VSTOR-143437 Signed-off-by: Andrey Zhadchenko --- hw/block/vhost-blk.c | 144 ++++++++++++++++++++++------------ include/hw/virtio/vhost-blk.h | 5 +- 2 files changed, 95 insertions(+), 54 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index c52851fcf8..a3e0010982 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -24,23 +24,17 @@ #include "system/system.h" #include "linux-headers/linux/vhost.h" #include -#include -#include "include/block/block_int-common.h" #include "system/runstate.h" static int vhost_blk_start(VirtIODevice *vdev) { VHostBlk *s = VHOST_BLK(vdev); struct vhost_vring_file backend; - int ret, i, nworkers, *fd; + int ret, i, nworkers; BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev))); VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus); char serial[VIRTIO_BLK_ID_BYTES] = {0}; - bdrv_graph_rdlock_main_loop(); - fd = blk_bs(s->conf.conf.blk)->file->bs->opaque; - bdrv_graph_rdunlock_main_loop(); - if (!k->set_guest_notifiers) { error_report("vhost-blk: binding does not support guest notifiers"); return -ENOSYS; @@ -92,7 +86,7 @@ static int vhost_blk_start(VirtIODevice *vdev) memset(&backend, 0, sizeof(backend)); backend.index = 0; - backend.fd = *fd; + backend.fd = s->backend_fd; if (ioctl(s->vhostfd, VHOST_BLK_SET_BACKEND, &backend)) { error_report("vhost-blk: unable to set backend"); ret = -errno; @@ -208,29 +202,79 @@ static void vhost_blk_vm_state(void *opaque, bool running, RunState state) } } -static void vhost_blk_resize_cb(void *opaque) +static int vhost_blk_update_size(VHostBlk *s, Error **errp) { - VirtIODevice *vdev = opaque; + BlockConf *conf = &s->conf.conf; + off_t length; + bool changed; + + length = lseek(s->backend_fd, 0, SEEK_END); + if (length < 0) { + int error = errno; + + error_setg_errno(errp, error, + "vhost-blk: unable to determine size of '%s'", + s->conf.devpath); + return -error; + } - assert(qemu_get_current_aio_context() == qemu_get_aio_context()); - virtio_notify_config(vdev); + changed = s->length != length; + s->length = length; + conf->heads = 16; + conf->secs = 63; + conf->cyls = s->length / BDRV_SECTOR_SIZE / + (conf->heads * conf->secs); + conf->cyls = MIN(MAX(conf->cyls, 2U), 16383U); + + return changed; } -static void vhost_blk_resize(void *opaque) +static bool vhost_blk_open_backend(VHostBlk *s, Error **errp) { - VirtIODevice *vdev = VIRTIO_DEVICE(opaque); + BlockConf *conf = &s->conf.conf; + struct stat st; - /* - * virtio_notify_config() needs to acquire the global mutex, - * so it can't be called from an iothread. Instead, schedule - * it to be run in the main context BH. - */ - aio_bh_schedule_oneshot(qemu_get_aio_context(), vhost_blk_resize_cb, vdev); -} + s->backend_fd = qemu_open(s->conf.devpath, O_RDWR, errp); + if (s->backend_fd < 0) { + error_prepend(errp, "vhost-blk: unable to open backend: "); + return false; + } -static const BlockDevOps vhost_blk_block_ops = { - .resize_cb = vhost_blk_resize, -}; + if (fstat(s->backend_fd, &st) < 0) { + error_setg_errno(errp, errno, "vhost-blk: unable to stat '%s'", + s->conf.devpath); + goto fail; + } + + if (!S_ISBLK(st.st_mode)) { + error_setg(errp, "vhost-blk: '%s' is not a block device", + s->conf.devpath); + goto fail; + } + + if (vhost_blk_update_size(s, errp) < 0) { + goto fail; + } + + if (!conf->logical_block_size) { + conf->logical_block_size = BDRV_SECTOR_SIZE; + } + + if (!conf->physical_block_size) { + conf->physical_block_size = BDRV_SECTOR_SIZE; + } + + if (!blkconf_validate_blocksizes(conf, errp)) { + goto fail; + } + + return true; + +fail: + qemu_close(s->backend_fd); + s->backend_fd = -1; + return false; +} static void vhost_blk_device_realize(DeviceState *dev, Error **errp) { @@ -239,13 +283,8 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) VhostBlkConf *conf = &s->conf; int i, ret; - if (!conf->conf.blk) { - error_setg(errp, "vhost-blk: drive property not set"); - return; - } - - if (!blk_is_inserted(conf->conf.blk)) { - error_setg(errp, "vhost-blk: device needs media, but drive is empty"); + if (!conf->devpath) { + error_setg(errp, "vhost-blk: devpath property must be set"); return; } @@ -273,17 +312,7 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) return; } - if (!blkconf_apply_backend_options(&conf->conf, - !blk_supports_write_perm(conf->conf.blk), - true, errp)) { - return; - } - - if (!blkconf_geometry(&conf->conf, NULL, 65535, 255, 255, errp)) { - return; - } - - if (!blkconf_blocksizes(&conf->conf, errp)) { + if (!vhost_blk_open_backend(s, errp)) { return; } @@ -311,13 +340,13 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) goto cleanup; } - blk_set_dev_ops(s->conf.conf.blk, &vhost_blk_block_ops, s); - ret = vhost_dev_init(&s->dev, (void *)((size_t)s->vhostfd), VHOST_BACKEND_TYPE_KERNEL, 0, NULL); if (ret < 0) { error_setg(errp, "vhost-blk: vhost initialization failed: %s", strerror(-ret)); + /* vhost_dev_init() closes vhostfd on failure */ + s->vhostfd = -1; goto cleanup; } @@ -328,7 +357,14 @@ cleanup: qemu_del_vm_change_state_handler(s->mighand); } g_free(s->dev.vqs); - close(s->vhostfd); + if (s->vhostfd >= 0) { + close(s->vhostfd); + s->vhostfd = -1; + } + if (s->backend_fd >= 0) { + qemu_close(s->backend_fd); + s->backend_fd = -1; + } for (i = 0; i < conf->num_queues; i++) { virtio_del_queue(vdev, i); } @@ -344,6 +380,10 @@ static void vhost_blk_device_unrealize(DeviceState *dev) qemu_del_vm_change_state_handler(s->mighand); vhost_blk_set_status(vdev, 0); vhost_dev_cleanup(&s->dev); + if (s->backend_fd >= 0) { + qemu_close(s->backend_fd); + s->backend_fd = -1; + } g_free(s->dev.vqs); virtio_cleanup(vdev); } @@ -376,10 +416,6 @@ static uint64_t vhost_blk_get_features(VirtIODevice *vdev, virtio_add_feature(&features, VIRTIO_F_VERSION_1); - if (!blk_is_writable(s->conf.conf.blk)) { - virtio_add_feature(&features, VIRTIO_BLK_F_RO); - } - if (s->conf.num_queues > 1) { virtio_add_feature(&features, VIRTIO_BLK_F_MQ); } @@ -398,7 +434,9 @@ static void vhost_blk_update_config(VirtIODevice *vdev, uint8_t *config) int64_t length; int blk_size = conf->logical_block_size; - blk_get_geometry(s->conf.conf.blk, &capacity); + length = s->length; + capacity = length / BDRV_SECTOR_SIZE; + memset(&blkcfg, 0, sizeof(blkcfg)); virtio_stq_p(vdev, &blkcfg.capacity, capacity); virtio_stl_p(vdev, &blkcfg.seg_max, s->conf.queue_size - 2); @@ -406,7 +444,6 @@ static void vhost_blk_update_config(VirtIODevice *vdev, uint8_t *config) virtio_stl_p(vdev, &blkcfg.blk_size, blk_size); blkcfg.geometry.heads = conf->heads; - length = blk_getlength(s->conf.conf.blk); if (length > 0 && length / conf->heads / conf->secs % blk_size) { unsigned short mask; @@ -425,7 +462,8 @@ static void vhost_blk_update_config(VirtIODevice *vdev, uint8_t *config) } static const Property vhost_blk_properties[] = { - DEFINE_BLOCK_PROPERTIES(VHostBlk, conf.conf), + DEFINE_BLOCK_PROPERTIES_BASE(VHostBlk, conf.conf), + DEFINE_PROP_STRING("devpath", VHostBlk, conf.devpath), DEFINE_PROP_UINT16("num-queues", VHostBlk, conf.num_queues, VHOST_BLK_AUTO_NUM_QUEUES), DEFINE_PROP_UINT16("queue-size", VHostBlk, conf.queue_size, 256), @@ -470,6 +508,8 @@ static void vhost_blk_instance_init(Object *obj) { VHostBlk *s = VHOST_BLK(obj); + s->vhostfd = -1; + s->backend_fd = -1; device_add_bootindex_property(obj, &s->conf.conf.bootindex, "bootindex", "/disk@0,0", DEVICE(obj)); diff --git a/include/hw/virtio/vhost-blk.h b/include/hw/virtio/vhost-blk.h index 0c7e212595..c194b421d9 100644 --- a/include/hw/virtio/vhost-blk.h +++ b/include/hw/virtio/vhost-blk.h @@ -14,7 +14,6 @@ #include "standard-headers/linux/virtio_blk.h" #include "hw/block/block.h" #include "hw/virtio/vhost.h" -#include "system/block-backend.h" #define TYPE_VHOST_BLK "vhost-blk" #define VHOST_BLK(obj) \ @@ -25,6 +24,7 @@ typedef struct VhostBlkConf { BlockConf conf; + char *devpath; uint16_t num_queues; uint16_t queue_size; uint16_t num_threads; @@ -37,10 +37,11 @@ typedef struct VHostBlk { VMChangeStateEntry *mighand; uint64_t host_features; uint64_t decided_features; - struct virtio_blk_config blkcfg; int vhostfd; + int backend_fd; struct vhost_dev dev; bool vhost_started; + uint64_t length; } VHostBlk; #endif -- 2.43.5