From nobody Thu May 16 12:06:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1675410245; cv=none; d=zohomail.com; s=zohoarc; b=ZICs+VFrYnbWM5rWoStSCApOMxfNlalp2wiokcEH6vCwzeyuvz9ihp1uVDF9HT8IbeLPen9TXiJ599vJgpdmOGzx7Bv8ekdLSLM780QSolIns5mnTMjGvZxg6Q9AoVAzs3MYddm0NJvb4g6Nnj8wLsx+Q+sU6qK5vDHeoelVJbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675410245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=pFy8HJr1INWOdYA2HW9k5ln/TOcjtbyU387nWXmA9XQ=; b=cRFhUrDaWhl1uY2z/2S99AL1LYqcRt3Ak+wIC11sfQwnJM7tvZgEH8vtDUbBtF3S7MTYvtYfDIr/mgkhH+nPTPUVKBnGkOK9dRdpmhKjMTEXjh0i26DNHInRvsZ6vh9oKnxp5H6cYOpJRkMaUk/nRDS4wdS2U92WkL0QfCYFnss= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675410245106941.3811145555485; Thu, 2 Feb 2023 23:44:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNqjJ-0001FP-Ej; Fri, 03 Feb 2023 02:43:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNqjF-0001DR-De for qemu-devel@nongnu.org; Fri, 03 Feb 2023 02:43:27 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNqjC-00030j-A4 for qemu-devel@nongnu.org; Fri, 03 Feb 2023 02:43:24 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4P7SLN2YdhzfZ57; Fri, 3 Feb 2023 15:42:52 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 3 Feb 2023 15:43:03 +0800 To: CC: , , , , , , , Subject: [PATCH V2 1/2] migration: Introduce interface query-migrationthreads Date: Fri, 3 Feb 2023 15:35:18 +0800 Message-ID: <20230203073519.2969147-2-jiangjiacheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230203073519.2969147-1-jiangjiacheng@huawei.com> References: <20230203073519.2969147-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.187; envelope-from=jiangjiacheng@huawei.com; helo=szxga01-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jiang Jiacheng From: Jiang Jiacheng via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675410246004100009 Content-Type: text/plain; charset="utf-8" Introduce interface query-migrationthreads. The interface is used to query information about migration threads and returns with migration thread's name and its id. Introduce threadinfo.c to manage threads with migration. Signed-off-by: Jiang Jiacheng Reviewed-by: Juan Quintela --- migration/meson.build | 1 + migration/threadinfo.c | 54 ++++++++++++++++++++++++++++++++++++++++++ migration/threadinfo.h | 28 ++++++++++++++++++++++ qapi/migration.json | 29 +++++++++++++++++++++++ 4 files changed, 112 insertions(+) create mode 100644 migration/threadinfo.c create mode 100644 migration/threadinfo.h diff --git a/migration/meson.build b/migration/meson.build index 690487cf1a..ed7d27f11a 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -25,6 +25,7 @@ softmmu_ss.add(files( 'savevm.c', 'socket.c', 'tls.c', + 'threadinfo.c', ), gnutls) =20 softmmu_ss.add(when: rdma, if_true: files('rdma.c')) diff --git a/migration/threadinfo.c b/migration/threadinfo.c new file mode 100644 index 0000000000..cfb27be77b --- /dev/null +++ b/migration/threadinfo.c @@ -0,0 +1,54 @@ +/* + * Migration Threads info + * + * Copyright (c) 2022 HUAWEI TECHNOLOGIES CO., LTD. + * + * Authors: + * Jiang Jiacheng + * + * This work is licensed under the terms of the GNU GPL, version 2 or lat= er. + * See the COPYING file in the top-level directory. + */ + +#include "threadinfo.h" + +static QLIST_HEAD(, MigrationThread) migration_threads; + +MigrationThread* MigrationThreadAdd(const char *name, int thread_id) +{ + MigrationThread *thread =3D NULL; + + thread =3D g_new0(MigrationThread, 1); + thread->name =3D (char*)name; + thread->thread_id =3D thread_id; + + QLIST_INSERT_HEAD(&migration_threads, thread, node); + + return thread; +} + +void MigrationThreadDel(MigrationThread* thread) +{ + if (thread) { + QLIST_REMOVE(thread, node); + g_free(thread); + } +} + +MigrationThreadInfoList* qmp_query_migrationthreads(Error **errp) +{ + MigrationThreadInfoList *head =3D NULL; + MigrationThreadInfoList **tail =3D &head; + MigrationThread *thread =3D NULL; + MigrationThreadInfo *info =3D NULL; + + QLIST_FOREACH(thread, &migration_threads, node) { + info =3D g_new0(MigrationThreadInfo, 1); + info->name =3D g_strdup(thread->name); + info->thread_id =3D thread->thread_id; + + QAPI_LIST_APPEND(tail, info); + } + + return head; +} diff --git a/migration/threadinfo.h b/migration/threadinfo.h new file mode 100644 index 0000000000..ebe86a2699 --- /dev/null +++ b/migration/threadinfo.h @@ -0,0 +1,28 @@ +/* + * Migration Threads info + * + * Copyright (c) 2022 HUAWEI TECHNOLOGIES CO., LTD. + * + * Authors: + * Jiang Jiacheng + * + * This work is licensed under the terms of the GNU GPL, version 2 or lat= er. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/queue.h" +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-migration.h" + +typedef struct MigrationThread MigrationThread; + +struct MigrationThread { + char *name; /* the name of migration thread */ + int thread_id; /* ID of the underlying host thread */ + QLIST_ENTRY(MigrationThread) node; +}; + +MigrationThread *MigrationThreadAdd(const char *name, int thread_id); + +void MigrationThreadDel(MigrationThread* info); diff --git a/qapi/migration.json b/qapi/migration.json index 88ecf86ac8..c84fa10e86 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1958,6 +1958,35 @@ { 'command': 'query-vcpu-dirty-limit', 'returns': [ 'DirtyLimitInfo' ] } =20 +## +# @MigrationThreadInfo: +# +# Information about migrationthreads +# +# @name: the name of migration thread +# +# @thread-id: ID of the underlying host thread +# +# Since: 7.2 +## +{ 'struct': 'MigrationThreadInfo', + 'data': {'name': 'str', + 'thread-id': 'int'} } + +## +# @query-migrationthreads: +# +# Returns information of migration threads +# +# data: migration thread name +# +# returns: information about migration threads +# +# Since: 7.2 +## +{ 'command': 'query-migrationthreads', + 'returns': ['MigrationThreadInfo'] } + ## # @snapshot-save: # --=20 2.33.0 From nobody Thu May 16 12:06:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1675410241; cv=none; d=zohomail.com; s=zohoarc; b=MVlvEsqyFpyBOfpLILfZNIbWHSddoyo01ZdCpZ33lFln2UknI/4WZGmk/Ca+9zdtSoaWMeMPKpK1HMpCgn6vDFbpgppelFYLFR3gVhc1KLRvwtu5ROoZc5EQseIfkmMeTc9qOlcCSDNIfazzuRVBKbmFWlCYIkd9RYkh6WL0Mi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675410241; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=4y76dny45Y0o/SEpnZkwAQaLDKNLIJJ9wZBF1Mak3o4=; b=IQO7r16QJznBlxETJO7IIxFdkooaZCSlGZKtYpylwv+oo/wEbVRZbDx7NJybrOjix7Wb8JT8APgxUEt464sOdtV+ih9WRDMEWv7fiLXN1NdC2HmHX54YAxOuldGlDYMRanBBJPH1GN7H+4DusoI941M1ZgoPKe0PuuZB+vaOtaA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1675410241395473.25110481904915; Thu, 2 Feb 2023 23:44:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNqjJ-0001FO-Fe; Fri, 03 Feb 2023 02:43:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNqjH-0001Db-DC for qemu-devel@nongnu.org; Fri, 03 Feb 2023 02:43:27 -0500 Received: from szxga08-in.huawei.com ([45.249.212.255]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNqjD-00030k-Ql for qemu-devel@nongnu.org; Fri, 03 Feb 2023 02:43:26 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4P7SJD0dJvz16NM6; Fri, 3 Feb 2023 15:41:00 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 3 Feb 2023 15:43:04 +0800 To: CC: , , , , , , , Subject: [PATCH V2 2/2] migration: save/delete migration thread info Date: Fri, 3 Feb 2023 15:35:19 +0800 Message-ID: <20230203073519.2969147-3-jiangjiacheng@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20230203073519.2969147-1-jiangjiacheng@huawei.com> References: <20230203073519.2969147-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.255; envelope-from=jiangjiacheng@huawei.com; helo=szxga08-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jiang Jiacheng From: Jiang Jiacheng via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1675410242429100001 Content-Type: text/plain; charset="utf-8" To support query migration thread infomation, save and delete thread(live_migration and multifdsend) information at thread creation and finish. Signed-off-by: Jiang Jiacheng Reviewed-by: Juan Quintela --- migration/migration.c | 5 +++++ migration/multifd.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index 52b5d39244..cf895b1a3d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -57,6 +57,7 @@ #include "net/announce.h" #include "qemu/queue.h" #include "multifd.h" +#include "threadinfo.h" #include "qemu/yank.h" #include "sysemu/cpus.h" #include "yank_functions.h" @@ -3951,10 +3952,13 @@ static void qemu_savevm_wait_unplug(MigrationState = *s, int old_state, static void *migration_thread(void *opaque) { MigrationState *s =3D opaque; + MigrationThread *thread =3D NULL; int64_t setup_start =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); MigThrError thr_error; bool urgent =3D false; =20 + thread =3D MigrationThreadAdd("live_migration", qemu_get_thread_id()); + rcu_register_thread(); =20 object_ref(OBJECT(s)); @@ -4031,6 +4035,7 @@ static void *migration_thread(void *opaque) migration_iteration_finish(s); object_unref(OBJECT(s)); rcu_unregister_thread(); + MigrationThreadDel(thread); return NULL; } =20 diff --git a/migration/multifd.c b/migration/multifd.c index 000ca4d4ec..c350547562 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -24,6 +24,7 @@ #include "qemu-file.h" #include "trace.h" #include "multifd.h" +#include "threadinfo.h" =20 #include "qemu/yank.h" #include "io/channel-socket.h" @@ -646,10 +647,13 @@ int multifd_send_sync_main(QEMUFile *f) static void *multifd_send_thread(void *opaque) { MultiFDSendParams *p =3D opaque; + MigrationThread *thread =3D NULL; Error *local_err =3D NULL; int ret =3D 0; bool use_zero_copy_send =3D migrate_use_zero_copy_send(); =20 + thread =3D MigrationThreadAdd(p->name, qemu_get_thread_id()); + trace_multifd_send_thread_start(p->id); rcu_register_thread(); =20 @@ -759,6 +763,7 @@ out: qemu_mutex_unlock(&p->mutex); =20 rcu_unregister_thread(); + MigrationThreadDel(thread); trace_multifd_send_thread_end(p->id, p->num_packets, p->total_normal_p= ages); =20 return NULL; --=20 2.33.0