From: Zhang Chen <zhangckid@gmail.com>
To: qemu-devel <qemu-devel@nongnu.org>,
"Dr . David Alan Gilbert" <dave@treblig.org>,
Eric Blake <eblake@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Kevin Wolf <kwolf@redhat.com>, Jason Wang <jasowang@redhat.com>,
Fam Zheng <fam@euphon.net>
Cc: Zhang Chen <zhangckid@gmail.com>
Subject: [PATCH V9 05/17] block/export: track IOThread reference in BlockExport
Date: Wed, 24 Jun 2026 15:08:39 +0800 [thread overview]
Message-ID: <20260624070851.13342-6-zhangckid@gmail.com> (raw)
In-Reply-To: <20260624070851.13342-1-zhangckid@gmail.com>
Users currently lack visibility into which block exports
are utilizing specific IOThreads. This patch integrates IOThread
referencing into the BlockExport lifecycle.
- Add iothreads array and holder_name to BlockExport struct.
- Use iothread_ref_and_get_aio_context during export creation.
- Implement proper cleanup in blk_exp_add fail path and blk_exp_delete_bh.
- Support both single and multi-iothread export configurations.
This ensures IOThread 'holders' status correctly reflects active block
exports for better debugging and resource tracking.
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
---
block/export/export.c | 63 ++++++++++++++++++++++++++++++++++++------
include/block/export.h | 6 ++++
2 files changed, 60 insertions(+), 9 deletions(-)
diff --git a/block/export/export.c b/block/export/export.c
index b733f269f3..b6c07f69b5 100644
--- a/block/export/export.c
+++ b/block/export/export.c
@@ -15,7 +15,6 @@
#include "block/block.h"
#include "system/block-backend.h"
-#include "system/iothread.h"
#include "block/export.h"
#include "block/fuse.h"
#include "block/nbd.h"
@@ -85,6 +84,8 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
AioContext *ctx;
AioContext **multithread_ctxs = NULL;
size_t multithread_count = 0;
+ g_autofree IOThread **local_iothreads = NULL;
+ const char *holder_name = NULL;
uint64_t perm;
int ret;
@@ -139,7 +140,16 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
goto fail;
}
- new_ctx = iothread_get_aio_context(iothread);
+ holder_name = bdrv_get_node_name(bs);
+ IOThreadHolder holder = {
+ .type = IO_THREAD_HOLDER_KIND_BLOCK_NODE,
+ .u.block_node.node_name = (char *)holder_name,
+ };
+
+ new_ctx = iothread_ref_and_get_aio_context(iothread, &holder);
+ multithread_count = 1;
+ local_iothreads = g_new0(IOThread *, 1);
+ local_iothreads[0] = iothread;
/* Ignore errors with fixed-iothread=false */
set_context_errp = fixed_iothread ? errp : NULL;
@@ -163,8 +173,15 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
return NULL;
}
+ local_iothreads = g_new0(IOThread *, multithread_count);
multithread_ctxs = g_new(AioContext *, multithread_count);
i = 0;
+ holder_name = bdrv_get_node_name(bs);
+ IOThreadHolder holder = {
+ .type = IO_THREAD_HOLDER_KIND_BLOCK_NODE,
+ .u.block_node.node_name = (char *)holder_name,
+ };
+
for (strList *e = iothread_list; e; e = e->next) {
IOThread *iothread = iothread_by_id(e->value);
@@ -172,7 +189,9 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
error_setg(errp, "iothread \"%s\" not found", e->value);
goto fail;
}
- multithread_ctxs[i++] = iothread_get_aio_context(iothread);
+ local_iothreads[i] = iothread;
+ multithread_ctxs[i++] = iothread_ref_and_get_aio_context(iothread,
+ &holder);
}
assert(i == multithread_count);
}
@@ -225,12 +244,15 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp)
assert(drv->instance_size >= sizeof(BlockExport));
exp = g_malloc0(drv->instance_size);
*exp = (BlockExport) {
- .drv = drv,
- .refcount = 1,
- .user_owned = true,
- .id = g_strdup(export->id),
- .ctx = ctx,
- .blk = blk,
+ .drv = drv,
+ .refcount = 1,
+ .user_owned = true,
+ .id = g_strdup(export->id),
+ .ctx = ctx,
+ .blk = blk,
+ .iothreads = g_steal_pointer(&local_iothreads),
+ .iothread_count = multithread_count,
+ .iothread_holder_name = g_strdup(holder_name),
};
ret = drv->create(exp, export, multithread_ctxs, multithread_count, errp);
@@ -253,6 +275,18 @@ fail:
g_free(exp->id);
g_free(exp);
}
+ if (local_iothreads) {
+ IOThreadHolder holder = {
+ .type = IO_THREAD_HOLDER_KIND_BLOCK_NODE,
+ .u.block_node.node_name = (char *)holder_name,
+ };
+
+ for (size_t j = 0; j < multithread_count; j++) {
+ if (local_iothreads[j]) {
+ iothread_put_aio_context(local_iothreads[j], &holder);
+ }
+ }
+ }
g_free(multithread_ctxs);
return NULL;
}
@@ -269,6 +303,17 @@ static void blk_exp_delete_bh(void *opaque)
BlockExport *exp = opaque;
assert(exp->refcount == 0);
+ if (exp->iothreads) {
+ IOThreadHolder holder = {
+ .type = IO_THREAD_HOLDER_KIND_BLOCK_NODE,
+ .u.block_node.node_name = (char *)exp->iothread_holder_name,
+ };
+
+ for (size_t i = 0; i < exp->iothread_count; i++) {
+ iothread_put_aio_context(exp->iothreads[i], &holder);
+ }
+ g_free(exp->iothreads);
+ }
QLIST_REMOVE(exp, next);
exp->drv->delete(exp);
blk_set_dev_ops(exp->blk, NULL, NULL);
diff --git a/include/block/export.h b/include/block/export.h
index ca45da928c..2bb98aae31 100644
--- a/include/block/export.h
+++ b/include/block/export.h
@@ -16,6 +16,7 @@
#include "qapi/qapi-types-block-export.h"
#include "qemu/queue.h"
+#include "system/iothread.h"
typedef struct BlockExport BlockExport;
@@ -89,6 +90,11 @@ struct BlockExport {
/* List entry for block_exports */
QLIST_ENTRY(BlockExport) next;
+
+ /* The iothreads list for block_exports */
+ IOThread **iothreads;
+ size_t iothread_count;
+ char *iothread_holder_name;
};
BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp);
--
2.49.0
next prev parent reply other threads:[~2026-06-24 7:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-24 7:08 [PATCH V9 00/17] iothread: Support tracking and querying IOThread holders Zhang Chen
2026-06-24 7:08 ` [PATCH V9 01/17] qapi/misc: Fix missed query-iothreads items Zhang Chen
2026-06-24 7:08 ` [PATCH V9 02/17] iothread: introduce iothread_ref/unref to track attached devices Zhang Chen
2026-06-24 15:51 ` Stefan Hajnoczi
2026-06-24 7:08 ` [PATCH V9 03/17] iothread: tracking iothread users with holder name Zhang Chen
2026-06-24 17:10 ` Stefan Hajnoczi
2026-06-24 7:08 ` [PATCH V9 04/17] iothread: introduce iothread_unsafe_get_aio_context() Zhang Chen
2026-06-24 17:19 ` Stefan Hajnoczi
2026-06-24 7:08 ` Zhang Chen [this message]
2026-06-24 17:51 ` [PATCH V9 05/17] block/export: track IOThread reference in BlockExport Stefan Hajnoczi
2026-06-24 7:08 ` [PATCH V9 06/17] monitor: refactor monitor_data_init() to pass ID Zhang Chen
2026-06-24 7:08 ` [PATCH V9 07/17] monitor: support iothread ref/unref for anonymous monitors Zhang Chen
2026-06-24 7:08 ` [PATCH V9 08/17] monitor: switch to iothread_unsafe_get_aio_context() Zhang Chen
2026-06-24 7:08 ` [PATCH V9 09/17] virtio-vq-mapping: track iothread-vq-mapping references using device path Zhang Chen
2026-06-24 7:08 ` [PATCH V9 10/17] virtio: use iothread_get/put_aio_context for thread pinning Zhang Chen
2026-06-24 7:08 ` [PATCH V9 11/17] net/colo: track IOThread references using path-based holder Zhang Chen
2026-06-24 7:08 ` [PATCH V9 12/17] virtio-balloon: Update tracking iothread users with holder Zhang Chen
2026-06-24 7:08 ` [PATCH V9 13/17] vfio-user/proxy: Update tracking iothread users with holder name Zhang Chen
2026-06-24 7:08 ` [PATCH V9 14/17] xen-block: " Zhang Chen
2026-06-24 7:08 ` [PATCH V9 15/17] qapi: examine IOThread attachment status via query-iothreads Zhang Chen
2026-06-24 7:08 ` [PATCH V9 16/17] iothread: simplify API by merging iothread_get_aio_context variants Zhang Chen
2026-06-24 7:08 ` [PATCH V9 17/17] tests/unit/iothread: Update the iothread_get_aio_context Zhang Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260624070851.13342-6-zhangckid@gmail.com \
--to=zhangckid@gmail.com \
--cc=armbru@redhat.com \
--cc=dave@treblig.org \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=jasowang@redhat.com \
--cc=kwolf@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.