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 863C5C88E75 for ; Tue, 15 Sep 2026 10:18:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6QEO-0003JB-E8; Tue, 15 Sep 2026 06:17:40 -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 1x6QEA-0003I9-Hm for qemu-devel@nongnu.org; Tue, 15 Sep 2026 06:17:26 -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 1x6QDv-0002ih-VA for qemu-devel@nongnu.org; Tue, 15 Sep 2026 06:17:22 -0400 Received: by mail-pj2-x10.google.com with SMTP id 98e67ed59e1d1-39b350c6920so2836192a91.1 for ; Tue, 15 Sep 2026 03:17:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789467429; x=1790072229; 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=Er4P8E9bwo23WMOqnc3KMSVAUjE4O4btiiMlCHE7dwc=; b=L9ULX1a94ALnvw9ETC4T62ygfqmDAKKZYCF264GfDFe8NcOfgOgkHi0vTL+nhsvE7d rm6FMp2gbT4oxsjzbFsaHnCEDOQHpyfynhltaskmXRNpwiwrloff9OoHdvI6JMCkzmOE vZhK5Gkt+AakgRCy8JGNUMl0tN3cK2kNuXQ0Eo0xR8cLDuKdzZYQhAVqdRcmQZ/7tL+9 lGGOQ7DU2AI5Qs4aM17XUpKFuO5cy3FH2W2jhbhabwalCkcgQFiTCtembfJPJGT5V/2i Wah6WQ2KjNEYFYXWlZUNLvrdLV3MEiDIvBjXH0fosBPKx5IeTq60VsPHSajP5EvP/fHx hVYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1789467429; x=1790072229; 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=Er4P8E9bwo23WMOqnc3KMSVAUjE4O4btiiMlCHE7dwc=; b=08POYbu0/Rf+1fOlaIjQ1jrwvM1Hhz10MIRNbz7WN0zEAJ7Jk3HVHf1N/vV9xTP/hX VtUho1viMh8agD94AZcbMu+b0fRQY2A8MqLJn2R62XyJIQZZ4V1AwucHfoWCl+Y9faBI a+5qAeEFMhZqaupQBCEWRpsSb1e9qxU1VL2/AU9e7d+QiZyOpI+kgPcieLydeAnC4PIl 5Pz6hJc/HNhhk8HEauRtEfeANfcebK738wLgy961/ry4bNza6y6DabzojM2xHvBU7PbZ UFiL4o5Vrr6/TkwIn3YTMYioKRRsCX3IQLwO/b8K1DZJa2nJYO54W1bIIUlZzURlE1Eg GAXQ== X-Gm-Message-State: AFuF++lDxjH7NrNdxqJfYLJX/IArolIIxC55aTFG7vOoVwd6YJseFF4k s/mIey5Nr9v7ZrqDmWT2eO1Ux2kc9QJY5lTNHS++ML8i5Ml1c/uZCe4DJGDOJFIxffg= X-Gm-Gg: AYBFou24Pq107Fq6LG+Z+cvxfTGoB7It03W54kRLEmwuPDXGX0Ufolr2+1gIzsK3rhm UDaWBFlbKLapjfb/ANFRfeyZ15UN2RQC7H9B9IolDmL7uZ29GyJgmb+FXtgxyGEXSCRTl1/FMPR k51uHu74p133UsNts8NFE/ARX8X5AYY5TPGtSItFZtzsOC4Vn4YYKFAzcaO2NCefW5AhrjPoUOb IxqEjZPeWkWm3w450R4z2lZDFi+7/2gZOQ224RiHQ048rUeC6UuFMnnP+JrxHSukAX9gG3en3Kx 5IV+bSyfrOZEJvngsihWiqm+knrlEQwxSqDI175WU8L7rwjF7aCYPsMS6G/YXwfNe8uEqXJkHln pq4i1VfTvL03iVvgCMgc9BryWDDpEsO3xIFFSRX5tvwxDrt2VjzgP1y4Ma1iPoRXzSTctO4FKVz eI8vqzY9WS6o8V3kD1kg6SaLpqk7HBHvCxjq0xbqGAHZavUb+YLB6Wt5GPq5mDFQNSgoXJ2MrW/ DWgpY8qk8EFfwN+0EK22ZfOurgFPLs4Dcv19w== X-Received: by 2002:a17:90b:1642:b0:398:dc16:3c29 with SMTP id 98e67ed59e1d1-39debf7a8e2mr13348196a91.7.1789467428926; Tue, 15 Sep 2026 03:17:08 -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.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2026 03:17:08 -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 01/13] iothread: introduce holder tracking Date: Tue, 15 Sep 2026 18:16:43 +0800 Message-ID: <20260915101655.3216101-2-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 IOThreads do not record the QOM objects and block exports that use them, making runtime introspection and hotplug debugging difficult. Add: - holders: a list describing what is holding an iothread - iothread_ref(): add a holder to the list - iothread_unref(): remove a holder from the list A holder can identify either a QOM object or a block export. A later patch will expose this information through query-iothreads. Reviewed-by: Stefan Hajnoczi Reviewed-by: Markus Armbruster Signed-off-by: Zhang Chen --- include/system/iothread.h | 5 +++ iothread.c | 63 ++++++++++++++++++++++++++ qapi/misc.json | 94 ++++++++++++++++++++++++++++++++++----- 3 files changed, 150 insertions(+), 12 deletions(-) diff --git a/include/system/iothread.h b/include/system/iothread.h index a1ef7696cb..b8aeb32b0e 100644 --- a/include/system/iothread.h +++ b/include/system/iothread.h @@ -18,6 +18,7 @@ #include "qemu/thread.h" #include "qom/object.h" #include "system/event-loop-base.h" +#include "qapi/qapi-types-misc.h" #define TYPE_IOTHREAD "iothread" @@ -50,6 +51,7 @@ struct IOThread { bool stopping; /* has iothread_stop() been called? */ bool running; /* should iothread_run() continue? */ int thread_id; + IOThreadHolderList *holders; /* AioContext poll parameters */ int64_t poll_max_ns; @@ -82,4 +84,7 @@ void iothread_destroy(IOThread *iothread); */ bool qemu_in_iothread(void); +void iothread_ref(IOThread *iothread, const IOThreadHolder *holder); +void iothread_unref(IOThread *iothread, const IOThreadHolder *holder); + #endif /* IOTHREAD_H */ diff --git a/iothread.c b/iothread.c index 76eea6df38..6b0a7c557a 100644 --- a/iothread.c +++ b/iothread.c @@ -21,10 +21,71 @@ #include "system/iothread.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" +#include "qapi/clone-visitor.h" +#include "qapi/qapi-visit-misc.h" #include "qemu/error-report.h" #include "qemu/rcu.h" #include "qemu/main-loop.h" +/* Add a deep copy of @holder to @iothread's list of holders. */ +void iothread_ref(IOThread *iothread, const IOThreadHolder *holder) +{ + assert(holder); + + QAPI_LIST_PREPEND(iothread->holders, QAPI_CLONE(IOThreadHolder, holder)); +} + +static int iothread_holder_compare(const IOThreadHolder *holder_a, + const IOThreadHolder *holder_b) +{ + const char *name_a, *name_b; + + if (holder_a->type != holder_b->type) { + return holder_a->type - holder_b->type; + } + + switch (holder_a->type) { + case IO_THREAD_HOLDER_KIND_QOM_OBJECT: + name_a = holder_a->u.qom_object.qom_path; + name_b = holder_b->u.qom_object.qom_path; + break; + case IO_THREAD_HOLDER_KIND_BLOCK_EXPORT: + name_a = holder_a->u.block_export.export_id; + name_b = holder_b->u.block_export.export_id; + break; + default: + g_assert_not_reached(); + } + + return strcmp(name_a, name_b); +} + +/* + * Remove @holder from @iothread's list of holders. + * + * It is a programming error if @holder is not present. + */ +void iothread_unref(IOThread *iothread, const IOThreadHolder *holder) +{ + IOThreadHolderList **prev = &iothread->holders; + IOThreadHolderList *curr; + + assert(holder); + + while (*prev) { + curr = *prev; + if (iothread_holder_compare(curr->value, holder) == 0) { + *prev = curr->next; + curr->next = NULL; + qapi_free_IOThreadHolderList(curr); + return; + } + prev = &curr->next; + } + + g_assert_not_reached(); +} + static void *iothread_run(void *opaque) { IOThread *iothread = opaque; @@ -129,6 +190,7 @@ static void iothread_instance_finalize(Object *obj) iothread->main_loop = NULL; } qemu_sem_destroy(&iothread->init_done_sem); + qapi_free_IOThreadHolderList(iothread->holders); } static void iothread_init_gcontext(IOThread *iothread, const char *thread_name) @@ -373,6 +435,7 @@ static int query_one_iothread(Object *object, void *opaque) info = g_new0(IOThreadInfo, 1); info->id = iothread_get_id(iothread); info->thread_id = iothread->thread_id; + info->holders = QAPI_CLONE(IOThreadHolderList, iothread->holders); info->poll_max_ns = iothread->poll_max_ns; info->poll_grow = iothread->poll_grow; info->poll_shrink = iothread->poll_shrink; diff --git a/qapi/misc.json b/qapi/misc.json index baa50cc844..bb49969b4b 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -67,6 +67,55 @@ ## { 'command': 'query-name', 'returns': 'NameInfo', 'allow-preconfig': true } +## +# @IOThreadHolderBlockExport: +# +# @export-id: The unique block export identifier. +# +# Since: 11.2 +# +## +{ 'struct': 'IOThreadHolderBlockExport', + 'data': { 'export-id': 'str' } } + +## +# @IOThreadHolderQomObject: +# +# @qom-path: Path to the object in the QOM tree. +# +# Since: 11.2 +# +## +{ 'struct': 'IOThreadHolderQomObject', + 'data': { 'qom-path': 'str' } } + +## +# @IOThreadHolderKind: +# +# @block-export: A block export. +# @qom-object: A QOM object. +# +# Since: 11.2 +## +{ 'enum': 'IOThreadHolderKind', + 'data': [ 'block-export', 'qom-object' ] } + +## +# @IOThreadHolder: +# +# The block export or QOM object holding the iothread. +# +# @type: the kind of iothread holder. +# +# Since: 11.2 +## +{ 'union': 'IOThreadHolder', + 'base': { 'type': 'IOThreadHolderKind' }, + 'discriminator': 'type', + 'data': { + 'block-export': 'IOThreadHolderBlockExport', + 'qom-object': 'IOThreadHolderQomObject' } } + ## # @IOThreadInfo: # @@ -76,6 +125,10 @@ # # @thread-id: ID of the underlying host thread # +# @holders: the QOM objects or block exports currently holding this +# iothread. When a holder is detached or destroyed, it is removed +# from this list. (Since 11.2) +# # @poll-max-ns: maximum polling time in ns, 0 means polling is # disabled (since 2.9) # @@ -98,6 +151,7 @@ { 'struct': 'IOThreadInfo', 'data': {'id': 'str', 'thread-id': 'int', + 'holders': ['IOThreadHolder'], 'poll-max-ns': 'int', 'poll-grow': 'int', 'poll-shrink': 'int', @@ -122,20 +176,36 @@ # -> { "execute": "query-iothreads" } # <- { "return": [ # { -# "id":"iothread0", -# "thread-id":3134, -# "poll-max-ns":32768, -# "poll-grow":0, -# "poll-shrink":0, -# "aio-max-batch":0 +# "id": "iothread0", +# "thread-id": 3134, +# "holders": [ +# { +# "qom-path": "/machine/peripheral/blk1/virtio-backend", +# "type": "qom-object" +# }, +# { +# "qom-path": "/machine/peripheral/blk2/virtio-backend", +# "type": "qom-object" +# } +# ], +# "poll-max-ns": 32768, +# "poll-grow": 0, +# "poll-shrink": 0, +# "aio-max-batch": 0 # }, # { -# "id":"iothread1", -# "thread-id":3135, -# "poll-max-ns":32768, -# "poll-grow":0, -# "poll-shrink":0, -# "aio-max-batch":0 +# "id": "iothread1", +# "thread-id": 3135, +# "holders": [ +# { +# "export-id": "export0", +# "type": "block-export" +# } +# ], +# "poll-max-ns": 32768, +# "poll-grow": 0, +# "poll-shrink": 0, +# "aio-max-batch": 0 # } # ] # } -- 2.43.0