From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75835C88E53 for ; Tue, 15 Sep 2026 10:18:35 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6QEc-0003LQ-1z; Tue, 15 Sep 2026 06:17:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x6QEH-0003Im-HC for qemu-devel@nongnu.org; Tue, 15 Sep 2026 06:17:35 -0400 Received: from mail-pj2-x10.google.com ([2607:f8b0:4864:39::10]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1x6QE4-0002ta-Ci for qemu-devel@nongnu.org; Tue, 15 Sep 2026 06:17:31 -0400 Received: by mail-pj2-x10.google.com with SMTP id 98e67ed59e1d1-396ccd5cf03so90654a91.1 for ; Tue, 15 Sep 2026 03:17:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789467438; x=1790072238; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=oeURIEcCI8TbII/h58ISje3mK5oO8wJcPqe347GxoX0=; b=WakNdi6ItIzUUWdER9Nc++QLR1q+Mqg6F8ket8YOxb9mHYiwgn5mNsslo34hOcHrl/ d+YyKZd9htNhP8+rbuhZpoyFNVCRfzulzLL86hz1LZ6sv4r1I+LFx7WUqTfWJOykDfiQ Bey4StrJxP70noOMAToKK+eQH93ftLoNY1cDC5aVmXRJj7i+Asg26/mJ5Y3l3E/d89Ny AMRzaBuK+VRA4WIJ16uFRTZt3+2c1gyEQVYrWJftKQPgpk7jreIQK7q6trhX0e0IfiCd tsiSRiEBEQwjhlt+x25rND/r9PyN2gCmEjmW2immDfeGxIcIP/okHRg9LTIFiGSgDEDq 6l7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789467438; x=1790072238; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=oeURIEcCI8TbII/h58ISje3mK5oO8wJcPqe347GxoX0=; b=msrdAXURIq5qfS4tkuAzwZFarWUqyuM2X2a325LkO87mQL6/Al0hXDPb7yPeDkENg0 jsWyNjXEhNpjjM4bXd8ip18fhCR22oOj1QvpyovNj1FkRIJK+LVSBXArZ0yGZvqIKDs7 TuYb88T+4DLY7voOv0a7ec8kpsaQtfqLUZTdNKrpYrD3E5ObLSBBGHQ9FhCjxBvoXW80 iEC6j3VDOVTHn0yUJ+wHz9y8kC9b1C9s4olk81nc8proCmReVEHaAjjfcG/flkC+6ExG 51Z4L5G6onQpELhb9kyTrOT3JmInoqlBN0J6+Y9bXWkC+vniaPLWpMPVhk5LWglVOKMW U3Rg== X-Gm-Message-State: AFuF++ni7FROSedahFBchXhK+4/Lk6fGlAqhVJLzklPZ1hqa73nLY/mL EmwMucNjZrspG5TtIGX4BKmCOeD+JabTWJcIVJvLg8MY50oTxYd4TUSgtgBrMN/VQMw= X-Gm-Gg: AYBFou3JWRCGN8Vrk4MQFd5BTORKWld6DV/Gre+9/51V4S35R9+TPMjWP7xByUJks+9 /5uDMSdlBhJFSxgo8dnDbTbh23moKzPn9MAKsI4dDXBWYyXyvpBoEwlZjQ8xZfir/8LgPYvLSu6 wHmGsYboBi/vq6uHe82Vg+iHyzUxysV9l4ysrl2uIvFtNqFVCPVGE3vtgq+x4zKgMind8uPaae2 V7HXDdzzPIAZdRgd7OIjMaZNtVrHGmuSnB6fsCywjEqTIQavNg/dEiJkTQPSR/RGRH95H5m04IM M9tDAIybY/Zzy0prEGCnp4X8cIW8DFU+9jVio3rFxfRKZfthtaeWALCTMyoNIALur5X57XilU4c F+eMOIgvDmfs5RZWW2cRb2o1QpeSVFFHdtBxxHGbPd9r1trSSilmD+y3joQRUKXGw34xixiTOY3 fAy6ZHdDdagMu6AVd7dJEQnqvpxehmrNFz67EOmcVLuMYEnHzJFirLEgpJQa4qSoBO9NX7D7hFu RDXT97T0WslsRMMWKclNM41WUg= X-Received: by 2002:a17:90b:3e85:b0:398:c794:ca26 with SMTP id 98e67ed59e1d1-39e1104d9admr386660a91.25.1789467436671; Tue, 15 Sep 2026 03:17:16 -0700 (PDT) Received: from hades-NUC8i7HVK.taila0cd24.ts.net ([222.72.128.122]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39dfdacba6bsm4416868a91.14.2026.09.15.03.17.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 03:17:16 -0700 (PDT) From: Zhang Chen To: qemu-devel , Eric Blake , Markus Armbruster , "'Michael S . Tsirkin'" , Stefan Hajnoczi , Paolo Bonzini , =?UTF-8?q?=27Daniel=20P=20=2E=20Berrang=C3=A9=27?= , Jason Wang Cc: Zhang Chen Subject: [PATCH V17 03/13] block/export: track IOThread references Date: Tue, 15 Sep 2026 18:16:45 +0800 Message-ID: <20260915101655.3216101-4-zhangckid@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260915101655.3216101-1-zhangckid@gmail.com> References: <20260915101655.3216101-1-zhangckid@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:39::10; envelope-from=zhangckid@gmail.com; helo=mail-pj2-x10.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Track the IOThreads used by a block export and identify the holder with the unique BlockExportOptions id. Acquire holder-aware references during export creation and release them on error or export deletion. Support both single- and multi-iothread exports. Reviewed-by: Stefan Hajnoczi Signed-off-by: Zhang Chen --- block/export/export.c | 62 ++++++++++++++++++++++++++++++++++++------ include/block/export.h | 5 ++++ 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/block/export/export.c b/block/export/export.c index b733f269f3..0e019545ef 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" @@ -72,6 +71,32 @@ static const BlockExportDriver *blk_exp_find_driver(BlockExportType type) return NULL; } +static void init_iothreads(const char *holder_id, IOThread **iothreads, + size_t num_iothreads, AioContext **aio_ctxs) +{ + const IOThreadHolder holder = { + .type = IO_THREAD_HOLDER_KIND_BLOCK_EXPORT, + .u.block_export.export_id = (char *)holder_id, + }; + + for (size_t i = 0; i < num_iothreads; i++) { + aio_ctxs[i] = iothread_ref_and_get_aio_context(iothreads[i], &holder); + } +} + +static void cleanup_iothreads(const char *holder_id, IOThread **iothreads, + size_t num_iothreads) +{ + const IOThreadHolder holder = { + .type = IO_THREAD_HOLDER_KIND_BLOCK_EXPORT, + .u.block_export.export_id = (char *)holder_id, + }; + + for (size_t i = 0; i < num_iothreads; i++) { + iothread_unref_and_put_aio_context(iothreads[i], &holder); + } +} + BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp) { bool fixed_iothread = export->has_fixed_iothread && export->fixed_iothread; @@ -85,6 +110,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; + size_t iothread_count = 0; uint64_t perm; int ret; @@ -139,7 +166,10 @@ BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp) goto fail; } - new_ctx = iothread_get_aio_context(iothread); + local_iothreads = g_new0(IOThread *, 1); + local_iothreads[0] = iothread; + init_iothreads(export->id, local_iothreads, 1, &new_ctx); + iothread_count = 1; /* Ignore errors with fixed-iothread=false */ set_context_errp = fixed_iothread ? errp : NULL; @@ -163,8 +193,10 @@ 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; + for (strList *e = iothread_list; e; e = e->next) { IOThread *iothread = iothread_by_id(e->value); @@ -172,9 +204,12 @@ 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; } assert(i == multithread_count); + init_iothreads(export->id, local_iothreads, multithread_count, + multithread_ctxs); + iothread_count = multithread_count; } bdrv_graph_rdlock_main_loop(); @@ -225,12 +260,14 @@ 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 = iothread_count, }; ret = drv->create(exp, export, multithread_ctxs, multithread_count, errp); @@ -250,8 +287,12 @@ fail: blk_unref(blk); } if (exp) { + cleanup_iothreads(exp->id, exp->iothreads, exp->iothread_count); + g_free(exp->iothreads); g_free(exp->id); g_free(exp); + } else { + cleanup_iothreads(export->id, local_iothreads, iothread_count); } g_free(multithread_ctxs); return NULL; @@ -273,6 +314,9 @@ static void blk_exp_delete_bh(void *opaque) exp->drv->delete(exp); blk_set_dev_ops(exp->blk, NULL, NULL); blk_unref(exp->blk); + + cleanup_iothreads(exp->id, exp->iothreads, exp->iothread_count); + g_free(exp->iothreads); qapi_event_send_block_export_deleted(exp->id); g_free(exp->id); g_free(exp); diff --git a/include/block/export.h b/include/block/export.h index ca45da928c..ce8e4eb604 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,10 @@ struct BlockExport { /* List entry for block_exports */ QLIST_ENTRY(BlockExport) next; + + /* The IOThreads utilized by this specific block export */ + IOThread **iothreads; + size_t iothread_count; }; BlockExport *blk_exp_add(BlockExportOptions *export, Error **errp); -- 2.43.0