From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023120.outbound.protection.outlook.com [52.101.72.120]) by lore.virtuozzo.com (Postfix) with ESMTPS id 8D919802E5 for ; Fri, 4 Sep 2026 13:25:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JbgNW4Lt43zyaQUYiB4qC4SJXuTVXWoJpLtkvQIHQ10GRlx/Z43QXaKuLaewQz1/IrX6fiwhfctFHn6AfT4bfkEYEZNquvRAn287dHZ6L0bpBdTunl8zZlR4E8YYaE6pa+GKhuondJlKWdGJbzZHM0yG+EnLTnbBeQGY6iRwChmQco873i9qH2pxQRaM/ooxpXOY/+CFB+41EwfNucGXkDBqi3uX93n9ofzM+TtDomAcUB1uLZH5+Nhp6UHViBKErO92V/1kruHpY+uWWxcvDJ1RmeKo019R3xYzyKLRsqzRXWpOMUhL9PxYx+7J+zJ6sBAMZse43EBrSRb/M+eyCA== 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=+l6JkGnHBRWRFCbs7AM7EMGNQVFUJ+gfEEoi6FPuc7s=; b=Sha8+ZlJnrb5QOKaU2YdJ5gQI3NX+5iXM3rCUTXXRl8jCFO5Oa5PHnW1uHNPwUThS07bPyzq4tuJ6R+d/T/2IutupX5YILIBAApEsfpSkyfgFG5eNxvNfzoP5cmK0DVETcrMnByBdSCa9Ee7sqtDwZ592JYzzfk7V4QyBnlk6Rhpk33Nc2JubVYuwO5j7Pc9Ey9b2iTYM4PUHVaUhlg/kKZn5k694paxBpOicQSQVGKzuZ5THosqZoZ1nkSEebpKV1vYElSlCCjJLtQD869sIN+g+6ic9+PS9YgEbPjG3dkDXeYuYVpwoQMl5VGPllcazuu28SQhJGtajt3iFhuFGA== 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=+l6JkGnHBRWRFCbs7AM7EMGNQVFUJ+gfEEoi6FPuc7s=; b=mkmv4rEegs8moR1BIJQLbWblDPhODoRppi8rDJwaD7REEMJCfo38/Ic1io6yg1+8lnk5EivhVD5bVs9SpGKF4mkhBu3j7Ipw56BYsiwvfBMP2ykjob9OzRmdVp/Z56WnoMOn1ZmbDhxGuruN43xzYr4bpfoUDV4BK/spe1BlAmJLTMSn2dO5WhT/L0rw4ofyagg8pWVa/eObHGEX9tHCEPtxILYSBNGPNiilmoYEFbKnc4XbUN6k0xFLPbRp4bpd2FJGMcZvsnmJoPKg6L7CncDChi/2kDaowFjxj+Aww0VNOTNHjwq3f6uevQrpPtVFGPC9GdadGsdPsC9u1zmaeA== Received: from AS4P190CA0015.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5de::19) by DU0PR08MB9250.eurprd08.prod.outlook.com (2603:10a6:10:419::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.382.10; Fri, 4 Sep 2026 13:24:55 +0000 Received: from DU6PEPF00009529.eurprd02.prod.outlook.com (2603:10a6:20b:5de:cafe::1f) by AS4P190CA0015.outlook.office365.com (2603:10a6:20b:5de::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.12 via Frontend Transport; Fri, 4 Sep 2026 13:24:54 +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 DU6PEPF00009529.mail.protection.outlook.com (10.167.8.10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.382.8 via Frontend Transport; Fri, 4 Sep 2026 13:24:54 +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=+l6JkGnHBRWRFCbs7AM7EMGNQVFUJ+gfEEoi6FPuc7s=; b=GWGFNLixVrNS flWRCBbDx1NxWO7ZknZ72KmIGmPbvePXVD5f6Ar/2KSkNSRWHp9JCS9vt2agM4L0yzZmKrdsk0KJe ncTIT73lCzim5px6wR0ib1RGmZoxTdK4LuI0POOW6DoVyAFx/lRUnf+6NApCG2Qh9l+HXJQb2S4tW eF3pKfafnMszeCNSkIC68/tivQViHWJ77lrJGi3oE0RmHbx9VWxkCHfsxKpNrW7dFMF5nzzfxWBoa 4ZY9idgfMPOKQRknrwhWq1qJTeT8u2zKmUdYhpmH8ugA7G74qU3UhWaorEb0zl/A6cN9UsJra0XkX 1mF0/mCqelCcncwdMr9ddQ==; 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 1x2Ts6-004ouQ-0U; Fri, 04 Sep 2026 15:24:50 +0200 From: Andrey Zhadchenko To: svt-core@virtuozzo.com Cc: den@openvz.org, andrey.drobyshev@virtuozzo.com Subject: [QEMU HCI-8.0 PATCH v2 4/5] vhost-blk: watch the device for resize events Date: Fri, 4 Sep 2026 16:21:54 +0300 Message-ID: <20260904132155.180581-5-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260904132155.180581-1-andrey.zhadchenko@virtuozzo.com> References: <20260904132155.180581-1-andrey.zhadchenko@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU6PEPF00009529:EE_|DU0PR08MB9250:EE_ X-MS-Office365-Filtering-Correlation-Id: a32a99a0-14f7-4ea4-e2f7-08df0a87e888 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|23010399003|36860700016|82310400026|376014|5113699003|13003099007|57112099003|18002099003|22082099003|10067099003|3023799007; X-Microsoft-Antispam-Message-Info: wXHZr95uximHFRwaHnyNJmkcE/psdnEzYmFm+x3DnK8HxSXDK8iOL8dbsGPTFugjC2LhRbJzBZFcb/rahYqlUS1Hsdwc2djV36g2fNhT+DDgUUOulSYiLfQaHQnsTi/ot8Jajxe5yEpq3Ek4w4E8kDBPr91TMGndajMlTWPsLvLpktDkHdzsxIIm9DOMu+tQyUgxtkVPlrTRByM5725PthehuX9rZq1zf54MXkCI1XfQbKIJ8t7HSw6B8zkNYHTGegKWBLO6cOi/+KJZOjcXgLAOm/dbUcU86+QImGgbiASmCSZ//zo9n8cdcRNHjLLv/0fmRigce2WrUHnG9c3v2uQK0YLMMDriQsWYO4ps7U4nXZxidcIatf4tCkmT5KCCcK/z1YBJqGurqcCKtblBwQoSJf5NIaZskbGUZuBA8G3s3lzgHYA+pmQTffapsvZBvu43LcgPPGLNrkX5/oyH0IOxu0AgKnKnuclTMazV8XBdwsXAIxfBgHB64BL1dKVX69V0jfe8ZwzWHQDEZOfTvXPHjmfgUAQa4zXbJhUsgx7selUqxuhD6yv0JRGR5CgWbggc4BCUnf8Gmat04ifMCx7kOJ2cRzfBwdvgc5RmnSxA6KMNxknxjOw4Jkn+d3DaMLS2kwTGGden0coOR1WG/zITKrS+1ZoJxg1E6HzVwtXLXH2syc+pvsf+zSjVxpAL5e1GwuoRgvtCynVk/oszGRSA0k8+GUTc/VG+sjK2ijUusOi4nglbB07RtYqSoPNbVTWE1oS+mqZI9moDAu7WPXAvskfPYbiAkWXzMgkkjhIvBspm0PC5XACyWCS1sIjm5+ajhfoplbDj4iKr73MkTsbSi3+/VbB6F6yVhnWBxk9A+bJlLXWNx2eDpLds/xEyK4ewKtqK2pUKwWJQUrs+Tg== X-Forefront-Antispam-Report: CIP:130.117.225.111;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:relay.virtuozzo.com;PTR:relay.virtuozzo.com;CAT:NONE;SFS:(13230040)(1800799024)(23010399003)(36860700016)(82310400026)(376014)(5113699003)(13003099007)(57112099003)(18002099003)(22082099003)(10067099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OF13oLHUYKXicCeXCBomhrSrG/JvvJ52gJwUDOIv76DcFYxqTcIAagubj37Ktpz67jgNj0bxEw+72DKOHIto9tkTl4PwudOVLMFzPksfDaypXiM0R7NhXQHbt2cIpaZyZBqXI6t936xPa+yFmyJ8HK5vDyrsAtojRZXYaNBUPzT458e35DcOoPkRrgDpIH1idhvS8K+5cjfgwVfV4OaUH54mXJiOfVfNGnJYzQevD31yj1IuVlC+22meM28xwop6IQLLeO6125qeAn2gFVblvqjyKjDsIBb5FVh3axoD/7tf7gsuRpZJMcgTfDzWqrHQ0UBIC3dseWqEwWJVzGGdgoQSBC5hrgMcsmtfwqGKhvajN1Twp9ZmZRKUiollA5hH97DyVVsn4WvIkNtbydPkS1upwavl9Mg6c+Kje0E9DUC4/xnlVnjpGBKBJ011Zwza X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2026 13:24:54.8015 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a32a99a0-14f7-4ea4-e2f7-08df0a87e888 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: DU6PEPF00009529.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9250 Resize was tied to block node, which we removed a few patches ago. Luckily we can make resize automated: receive an uevent socket from the management layer via the new "ueventfd" property (e.g. a /dev/fdset/N path), watch it for relevant netlink messages and call virtio_notify_config() if we detect a capacity change. The socket is set up (possibly with filter) by management layer. We only need to check that it is netlink and do some message filtering. When the property is not set, capacity changes are not detected. https://virtuozzo.atlassian.net/browse/VSTOR-143437 Signed-off-by: Andrey Zhadchenko --- v2: - rework patch a bit: now we expect opened and filtered fd from libvirt. hw/block/vhost-blk.c | 181 ++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost-blk.h | 4 + 2 files changed, 185 insertions(+) diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c index 04a7013e52..7cb842a859 100644 --- a/hw/block/vhost-blk.c +++ b/hw/block/vhost-blk.c @@ -10,7 +10,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qom/object.h" #include "hw/qdev-core.h" #include "hw/boards.h" @@ -25,6 +27,7 @@ #include "linux-headers/linux/vhost.h" #include #include +#include #include "system/runstate.h" static int vhost_blk_start(VirtIODevice *vdev) @@ -228,6 +231,173 @@ static int vhost_blk_update_size(VHostBlk *s, bool *changed, Error **errp) return 0; } +static void vhost_blk_resize_bh(void *opaque) +{ + VHostBlk *s = opaque; + Error *local_err = NULL; + bool changed; + + if (vhost_blk_update_size(s, &changed, &local_err) < 0) { + error_report_err(local_err); + return; + } + + if (changed) { + virtio_notify_config(VIRTIO_DEVICE(s)); + } +} + +/* + * The uevent socket is created, bound and filtered by the management + * layer and passed to us via the "ueventfd" property. + */ +static void vhost_blk_uevent_read(void *opaque) +{ + VHostBlk *s = opaque; + char buffer[64 * 1024 + 1]; + + for (;;) { + struct sockaddr_nl source; + socklen_t source_len = sizeof(source); + uint64_t event_major = UINT64_MAX; + uint64_t event_minor = UINT64_MAX; + bool action_change = false; + bool subsystem_block = false; + bool resize = false; + char *field; + char *end; + ssize_t len; + + memset(&source, 0, sizeof(source)); + len = recvfrom(s->uevent_fd, buffer, sizeof(buffer) - 1, + MSG_DONTWAIT, (struct sockaddr *)&source, &source_len); + if (len < 0) { + if (errno == EINTR) { + continue; + } + if (errno == ENOBUFS) { + /* Some events may be dropped, just re-check */ + qemu_bh_schedule(s->resize_bh); + continue; + } + if (errno != EAGAIN && errno != EWOULDBLOCK) { + error_report("vhost-blk: unable to receive uevent: %s", + strerror(errno)); + } + return; + } + + if (source.nl_family != AF_NETLINK || source.nl_pid != 0) { + continue; + } + + buffer[len] = '\0'; + field = buffer; + end = buffer + len; + while (field < end) { + size_t field_len = strnlen(field, end - field); + + if (!strcmp(field, "ACTION=change")) { + action_change = true; + } else if (!strcmp(field, "SUBSYSTEM=block")) { + subsystem_block = true; + } else if (!strcmp(field, "RESIZE=1")) { + resize = true; + } else if (g_str_has_prefix(field, "MAJOR=")) { + uint64_t value; + + if (!qemu_strtou64(field + strlen("MAJOR="), NULL, 10, + &value)) { + event_major = value; + } + } else if (g_str_has_prefix(field, "MINOR=")) { + uint64_t value; + + if (!qemu_strtou64(field + strlen("MINOR="), NULL, 10, + &value)) { + event_minor = value; + } + } + + if (field_len == end - field) { + break; + } + field += field_len + 1; + } + + if (action_change && subsystem_block && resize && + event_major == major(s->backend_rdev) && + event_minor == minor(s->backend_rdev)) { + qemu_bh_schedule(s->resize_bh); + } + } +} + +static bool vhost_blk_uevent_check(int fd, const char *src, Error **errp) +{ + socklen_t optlen; + int domain; + int protocol; + + optlen = sizeof(domain); + if (getsockopt(fd, SOL_SOCKET, SO_DOMAIN, &domain, &optlen) < 0) { + error_setg_errno(errp, errno, "vhost-blk: '%s' is not a socket", src); + return false; + } + + optlen = sizeof(protocol); + if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &protocol, &optlen) < 0) { + error_setg_errno(errp, errno, + "vhost-blk: unable to get protocol of '%s'", src); + return false; + } + + if (domain != AF_NETLINK || protocol != NETLINK_KOBJECT_UEVENT) { + error_setg(errp, + "vhost-blk: '%s' is not a NETLINK_KOBJECT_UEVENT socket", + src); + return false; + } + + return true; +} + +static bool vhost_blk_uevent_attach(VHostBlk *s, Error **errp) +{ + if (!s->conf.ueventfd) { + return true; + } + + s->uevent_fd = qemu_open(s->conf.ueventfd, O_RDWR, errp); + if (s->uevent_fd < 0) { + error_prepend(errp, "vhost-blk: unable to open uevent socket: "); + return false; + } + + if (!vhost_blk_uevent_check(s->uevent_fd, s->conf.ueventfd, errp)) { + qemu_close(s->uevent_fd); + s->uevent_fd = -1; + return false; + } + + s->resize_bh = qemu_bh_new(vhost_blk_resize_bh, s); + qemu_set_fd_handler(s->uevent_fd, vhost_blk_uevent_read, NULL, s); + return true; +} + +static void vhost_blk_uevent_detach(VHostBlk *s) +{ + if (s->uevent_fd < 0) { + return; + } + + qemu_set_fd_handler(s->uevent_fd, NULL, NULL, NULL); + qemu_bh_delete(s->resize_bh); + s->resize_bh = NULL; + qemu_close(s->uevent_fd); + s->uevent_fd = -1; +} + static bool vhost_blk_open_backend(VHostBlk *s, Error **errp) { BlockConf *conf = &s->conf.conf; @@ -252,6 +422,7 @@ static bool vhost_blk_open_backend(VHostBlk *s, Error **errp) s->conf.devpath); goto fail; } + s->backend_rdev = st.st_rdev; if (!s->conf.readonly) { int readonly; @@ -325,6 +496,12 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) return; } + if (!vhost_blk_uevent_attach(s, errp)) { + qemu_close(s->backend_fd); + s->backend_fd = -1; + return; + } + s->dev.nvqs = conf->num_queues; s->dev.max_queues = conf->num_queues; s->dev.vqs = g_new0(struct vhost_virtqueue, s->dev.nvqs); @@ -374,6 +551,7 @@ cleanup: qemu_close(s->backend_fd); s->backend_fd = -1; } + vhost_blk_uevent_detach(s); for (i = 0; i < conf->num_queues; i++) { virtio_del_queue(vdev, i); } @@ -386,6 +564,7 @@ static void vhost_blk_device_unrealize(DeviceState *dev) VirtIODevice *vdev = VIRTIO_DEVICE(dev); VHostBlk *s = VHOST_BLK(dev); + vhost_blk_uevent_detach(s); qemu_del_vm_change_state_handler(s->mighand); vhost_blk_set_status(vdev, 0); vhost_dev_cleanup(&s->dev); @@ -476,6 +655,7 @@ static void vhost_blk_update_config(VirtIODevice *vdev, uint8_t *config) static const Property vhost_blk_properties[] = { DEFINE_PROP_STRING("devpath", VHostBlk, conf.devpath), + DEFINE_PROP_STRING("ueventfd", VHostBlk, conf.ueventfd), DEFINE_PROP_BOOL("read-only", VHostBlk, conf.readonly, false), DEFINE_PROP_UINT16("num-queues", VHostBlk, conf.num_queues, VHOST_BLK_AUTO_NUM_QUEUES), @@ -523,6 +703,7 @@ static void vhost_blk_instance_init(Object *obj) s->vhostfd = -1; s->backend_fd = -1; + s->uevent_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 c6646f5845..e3ad92bc6e 100644 --- a/include/hw/virtio/vhost-blk.h +++ b/include/hw/virtio/vhost-blk.h @@ -25,6 +25,7 @@ typedef struct VhostBlkConf { BlockConf conf; char *devpath; + char *ueventfd; bool readonly; uint16_t num_queues; uint16_t queue_size; @@ -40,9 +41,12 @@ typedef struct VHostBlk { uint64_t decided_features; int vhostfd; int backend_fd; + int uevent_fd; struct vhost_dev dev; bool vhost_started; uint64_t length; + uint64_t backend_rdev; + QEMUBH *resize_bh; } VHostBlk; #endif -- 2.43.5