From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11023127.outbound.protection.outlook.com [40.107.159.127]) by lore.virtuozzo.com (Postfix) with ESMTPS id 78C708015A for ; Tue, 8 Sep 2026 12:55:17 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=efaXlRnqjny0ijcv9Vmlog3y2BmWWDDOGPaePS7TkgPUqqxCbkg7RyIJJbs9I2c/MLFULleHBjj/IsEOOFoLoj5qqSHpdGd8Unlkn9eROqBRrZy2qn6X2J9KbviKVQ0Fo3M6vcDJLwyFDX1t1mAzut6LPjXLllbSCIPo1KQY4LXWbtOllVHD6WM4YM2lFSVVPswFNgGy1+JGAKDJAQM0fOxPIWwfFyIuvs8t6VcZ4ED+Pvb6pVK5Td0HWJfnkNh3XTETmvgc9wNIzTG6kfrevJDx9VuS5cy3oLAKCw15OdSmRaO3F4dFcwwDoTveIdcx+Fr0ayJty2vZeJE4tnuq1w== 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=6TtADY1zJfUiyv4HF4DSz3+wUDt/MvxH+eJmH82khQ8=; b=p3cE2lkKWIuesQl7WRCetQPAgfmvYxlPkkxI3mmvQxDN/bVA9X2hmGIHzuTCY7pomdZrzVEWA9lym5VXmoFVGvh/Ty72Q5ILyl3LLtSSOxIg4/vYYJcBbAp7aKlQ17c8Xnx+AJ5+DYyzKSjQWkxba95qO5NhvTc4nCYQADl+3KNbBdj4yzzPLpoqab4R2S6W/imvZAOkzuirkpFxFMZXlwJMjfhenCtwMjcCeTe54zqs8cnJwsKFYxBrThX/oGwbVpSix921UA6NzdZsk4XoXG18edPLpuDRcJapqDzt3oZ+Ls7q3Uih0sWlRkLp7PL6I3lkWirEAViytZL3p/M1gQ== 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=6TtADY1zJfUiyv4HF4DSz3+wUDt/MvxH+eJmH82khQ8=; b=aDNSN0P2Yr23JBxu7mNyFw1kefRPku1T6xntQ3wDMQ1kdcxt1MN3b8cQzFSolWhkNydRSNRKjvYwS7S6FtVgPNXhVbq8lOHp24FvoX42wjKh/0BZjNXTSZDz5R6WEsaher3LjfDqaWYafem3WeFADooNWnqgbq8fd7OoARLwrrjuA0R7SueZhTivTp6pFzkgYXng0DYxvrV+5PSAbme6JvBSAkIHUaGMZ8XqqV7ct8EwXFsdtH9aENP5rly96Jb6BgCD5jcB/+5tQC9b6tsZtjSJYncn9k9EpL9EXrOORuqA/Nm+dSnp6ehgpMkZfEQhAONPB7odU271IXKDwSSV3Q== Received: from PA7P264CA0480.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:3dc::19) by DB9PR08MB9732.eurprd08.prod.outlook.com (2603:10a6:10:460::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.7; Tue, 8 Sep 2026 12:55:10 +0000 Received: from MI3PEPF0000848E.eurprd03.prod.outlook.com (2603:10a6:102:3dc:cafe::2c) by PA7P264CA0480.outlook.office365.com (2603:10a6:102:3dc::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.15 via Frontend Transport; Tue, 8 Sep 2026 12:55:10 +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 MI3PEPF0000848E.mail.protection.outlook.com (10.167.240.149) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Tue, 8 Sep 2026 12:55:09 +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=6TtADY1zJfUiyv4HF4DSz3+wUDt/MvxH+eJmH82khQ8=; b=hAZiWL7D8fYB SA6YzxMA51iPIkn6sHeGszTsazA7HF+pqcTLiV10snGs33pODnEG5Cbg30q8Yroem18CaV7vRC4ZZ +on4Y97l4nKjaPeloU75U2sv8mzPZzjn1mU2Oz09/X1LQI4S1KBff+qgMOcAfMX55femyG/kps9H7 +gB+3cWhExGZ20ntPxi284eBLcEnTdI7VtbcOgO4Igty5RSX0dd1ZAWgD23xRxhHpT6p0EDdg8fwH SrCRSuhvJTwLHxM1iIVO+DRFF499PisFS0MEyHhQ8OZ3EtSpJXePG3zkNhywYxnb1oxy8nxdUra7e pQ0jfDlPcDGmgGYjV+yi9w==; 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 1x3vJP-009opv-10; Tue, 08 Sep 2026 14:54:59 +0200 From: Andrey Zhadchenko To: svt-core@virtuozzo.com Cc: den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [QEMU HCI-8.0 PATCH v4 2/5] vhost-blk: change backend setup Date: Tue, 8 Sep 2026 15:52:05 +0300 Message-ID: <20260908125208.278402-3-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260908125208.278402-1-andrey.zhadchenko@virtuozzo.com> References: <20260908125208.278402-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MI3PEPF0000848E:EE_|DB9PR08MB9732:EE_ X-MS-Office365-Filtering-Correlation-Id: 507f7c6c-56db-49d7-2077-08df0da86a5e List-Id: svt-core@virtuozzo.com X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr 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|1800799024|82310400026|36860700016|23010399003|376014|5113699003|57112099003|18002099003|22082099003|10067099003; X-Microsoft-Antispam-Message-Info: Dy9Lb0HNGgh1BsCI4s6qj6be6k3sYyplJxpSMc7FZWFO1Yxam57EAFqsDvCe8De85406JO4oRSYZ4fMxvatfFGeLkd/Nxqu+bP0nsmP6ICaQ6FYzQB8w/N412/CpSd81wPAX14AKAa8IKJdPKEUjkIE6hRQXAJdWzLWOZMpWiSxTT2UjWH/ZQ39lOYo9K/TbXepRQyAVvGnnZfdk6xBGcSDwYPamHon/NSEQIsv9erTSYtYDO1eCaeA7I+aUeYpCnUAJrzCJW87G/++qdkodXVJK171u/aBmBm1cXuZMouGilHe0wRueYteYCksHByRN/7nYcK39HHc3L01OmwCRjuuOzsW9kjZxAaCdAaR2NuVOPyOTq/2SqimvGaLAhsg/LsZHP+3lGRO4P7ItUk/7HV0xqOhRbKy0PbRShJUUNvcWIHuMq0w3RygEIQCrxBfBbNBkiOKrGbGNN1CZmzpO5HJaO0cSwSZN2hZWctGT6kS2vG8XN7dlGMPiA88H3FGOzMpobSZb7mkYqD7MIID0OsKT5BSvAz4VKzSQ1k9lCUavv13unSOYcjL24ZfoU7d6bVJRcbWZkHarCYdW/IoUsttsi7QN4SIFW3ifMw6IQyQkzuBjyI2r6pZKp6nNm8Q+GQzYSpdoSeHV5DjqiC15wxwVMgJX1EdV2qnp+k7U5CWbnjMYqRzTgIyPVrLrs1j2+E9mt6565s3hUGndfTJQtbWh3coIYQbHKqqTW4gcjxjgSXzLpteKFin0ehEuTaqupddSvdU7D3x0Jy9XIO+wkolxuGYBwd7/P+D+MmqlAh5a19DZxrms1bvmadHVTvAiPbIjWv1x88hCVgKc/MC3cuJ3Yycyns/CaU6VVfM/tnu23hMwnqTt5VrXcjxXVEjRlBTkOLCbF4zLZPBxHGtJle9XdQuJ4HzTrRYYuXy8gOI= 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)(1800799024)(82310400026)(36860700016)(23010399003)(376014)(5113699003)(57112099003)(18002099003)(22082099003)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tjxf+4RMuJkp2JCwPdwx+khRcGNqxtC/wnIlieyYcj6ckvCQHvjk3OiZmhOoEu0zJvxIYmxqMPrIQvC0cH5B8x84WXLIQVfx7z/1wpaRoC7Tjw0MvpAgnuVEey/v8kba7a5Ige1JruBKZ6ZU2GRceEiW5iuWbtGT21BDIk8luekxZYOlPPLlPdfO7Yhv/f8oBN/CcUVs/ubvV/ZZJcxb8WUxX+6+XqyBIHGS91bjEqOr+zBpuv/QSzj4WOeAP62W3kirwSGp2igOxCAVRjE3dLuVgYQvKuFAvj/KX1walxoWC1VmhDa23Gco7uNv6xfLmwI3PiDpmxUsApazVlOyQp6SlkoUE8aOxb7TP2Q7JzqdbBvQ0TBfnwZ8mWKYy7A0HrKxO6F74a5wojiqqh+46eWO59o7IgWlzx1lVJyu1fz6XJZQSFmQBJyY5gxCxlFl X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2026 12:55:09.9716 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 507f7c6c-56db-49d7-2077-08df0da86a5e 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: MI3PEPF0000848E.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB9732 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, etc. Don't be too broad and just do the minimal work. Also drop generic block device properties along with the block node: the kernel module does all IO in terms of 512 sectors, so simply report 512 byte logical/physical block size to the guest. Existing vhost-blk setups will break, but it is expected. We also 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 --- v2: - moved double close fix to 'do not double close vhostfd' patch - dropped DEFINE_BLOCK_PROPERTIES_BASE exposition to the outside. Let's just use defaults for now. We can later check if tweaking this values makes any difference and add them back. - change vhost_blk_update_size() to return zero or error and move 'changed' to a separate argument - changed lseek to BLKGETSIZE64 (we already use BLKROGET anyway) v3: - make vhost_blk_update_size() return the changed flag directly - use ERRP_GUARD() for reliable error propagation v4: - document the default geometry values hw/block/vhost-blk.c | 126 ++++++++++++++++++++-------------- include/hw/virtio/vhost-blk.h | 5 +- 2 files changed, 79 insertions(+), 52 deletions(-) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index 20c2f41691..a517c5e22b 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -25,22 +25,17 @@ #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 +87,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 +203,71 @@ static void vhost_blk_vm_state(void *opaque, bool running, RunState state) } } -static void vhost_blk_resize_cb(void *opaque) +static bool vhost_blk_update_size(VHostBlk *s, Error **errp) { - VirtIODevice *vdev = opaque; + BlockConf *conf = &s->conf.conf; + uint64_t length; + bool changed; + + if (ioctl(s->backend_fd, BLKGETSIZE64, &length) < 0) { + error_setg_errno(errp, errno, + "vhost-blk: unable to determine size of '%s'", + s->conf.devpath); + return false; + } - assert(qemu_get_current_aio_context() == qemu_get_aio_context()); - virtio_notify_config(vdev); + changed = s->length != length; + s->length = length; + + /* Default geometry mimicking hw/block/hd-geometry.c */ + 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); + ERRP_GUARD(); + 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; + } + + vhost_blk_update_size(s, errp); + if (*errp) { + goto fail; + } + + conf->logical_block_size = BDRV_SECTOR_SIZE; + conf->physical_block_size = BDRV_SECTOR_SIZE; + + return true; + +fail: + qemu_close(s->backend_fd); + s->backend_fd = -1; + return false; +} static void vhost_blk_device_realize(DeviceState *dev, Error **errp) { @@ -240,13 +277,8 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) struct vhost_virtqueue *vqs; 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; } @@ -274,17 +306,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; } @@ -313,8 +335,6 @@ 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) { @@ -336,6 +356,10 @@ cleanup: 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); } @@ -351,6 +375,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); } @@ -383,10 +411,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); } @@ -405,7 +429,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); @@ -413,7 +439,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; @@ -432,7 +457,7 @@ static void vhost_blk_update_config(VirtIODevice *vdev, uint8_t *config) } static const Property vhost_blk_properties[] = { - DEFINE_BLOCK_PROPERTIES(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), @@ -478,6 +503,7 @@ 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