From nobody Mon Feb 9 05:40:48 2026 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=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1633951629422862.0580187567688; Mon, 11 Oct 2021 04:27:09 -0700 (PDT) Received: from localhost ([::1]:55152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZtSW-0000H6-F3 for importer@patchew.org; Mon, 11 Oct 2021 07:27:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZtNL-0001Wh-DD for qemu-devel@nongnu.org; Mon, 11 Oct 2021 07:21:47 -0400 Received: from mga04.intel.com ([192.55.52.120]:28236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZtNJ-0007q1-JO for qemu-devel@nongnu.org; Mon, 11 Oct 2021 07:21:47 -0400 Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 04:21:35 -0700 Received: from icx-2s.bj.intel.com ([10.240.193.41]) by orsmga008.jf.intel.com with ESMTP; 11 Oct 2021 04:21:34 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10133"; a="225624865" X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="225624865" X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,364,1624345200"; d="scan'208";a="490432195" From: Yang Zhong To: qemu-devel@nongnu.org Subject: [PATCH 4/6] monitor: numa support for 'info sgx' command Date: Mon, 11 Oct 2021 19:15:52 +0800 Message-Id: <20211011111554.12403-5-yang.zhong@intel.com> X-Mailer: git-send-email 2.29.2.334.gfaefdd61ec In-Reply-To: <20211011111554.12403-1-yang.zhong@intel.com> References: <20211011111554.12403-1-yang.zhong@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=192.55.52.120; envelope-from=yang.zhong@intel.com; helo=mga04.intel.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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, pbonzini@redhat.com, eblake@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1633951631247100001 Content-Type: text/plain; charset="utf-8" This patch can enable numa support for 'info sgx' command in the monitor, which can show detailed SGX EPC sections info. (qemu) info sgx SGX support: enabled SGX1 support: enabled SGX2 support: enabled FLC support: enabled SECTION #0: size=3D67108864 SECTION #1: size=3D29360128 The QMP interface show: (QEMU) query-sgx {"return": {"sgx": true, "sgx2": true, "sgx1": true, "sections": \ [{"index": 0, "size": 67108864}, {"index": 1, "size": 29360128}], "flc": t= rue}} Signed-off-by: Yang Zhong --- hw/i386/sgx.c | 25 +++++++++++++++++++++++-- target/i386/monitor.c | 11 +++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 906facb645..8af45925c6 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -126,6 +126,28 @@ SGXInfo *sgx_get_capabilities(Error **errp) return info; } =20 +static SGXEPCSectionList *sgx_get_epc_sections_list(void) +{ + GSList *device_list =3D sgx_epc_get_device_list(); + SGXEPCSectionList *head =3D NULL, **tail =3D &head; + SGXEPCSection *section; + uint64_t i =3D 0; + + for (; device_list; device_list =3D device_list->next) { + DeviceState *dev =3D device_list->data; + Object *obj =3D OBJECT(dev); + + section =3D g_new0(SGXEPCSection, 1); + section->index =3D i++; + section->size =3D object_property_get_uint(obj, SGX_EPC_SIZE_PROP, + &error_abort); + QAPI_LIST_APPEND(tail, section); + } + g_slist_free(device_list); + + return head; +} + SGXInfo *sgx_get_info(Error **errp) { SGXInfo *info =3D NULL; @@ -144,14 +166,13 @@ SGXInfo *sgx_get_info(Error **errp) return NULL; } =20 - SGXEPCState *sgx_epc =3D &pcms->sgx_epc; info =3D g_new0(SGXInfo, 1); =20 info->sgx =3D true; info->sgx1 =3D true; info->sgx2 =3D true; info->flc =3D true; - info->section_size =3D sgx_epc->size; + info->sections =3D sgx_get_epc_sections_list(); =20 return info; } diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 196c1c9e77..08e7d4a425 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -773,6 +773,7 @@ SGXInfo *qmp_query_sgx(Error **errp) void hmp_info_sgx(Monitor *mon, const QDict *qdict) { Error *err =3D NULL; + SGXEPCSectionList *section_list, *section; g_autoptr(SGXInfo) info =3D qmp_query_sgx(&err); =20 if (err) { @@ -787,8 +788,14 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) info->sgx2 ? "enabled" : "disabled"); monitor_printf(mon, "FLC support: %s\n", info->flc ? "enabled" : "disabled"); - monitor_printf(mon, "size: %" PRIu64 "\n", - info->section_size); + + section_list =3D info->sections; + for (section =3D section_list; section; section =3D section->next) { + monitor_printf(mon, "SECTION #%" PRId64 ": ", + section->value->index); + monitor_printf(mon, "size=3D%" PRIu64 "\n", + section->value->size); + } } =20 SGXInfo *qmp_query_sgx_capabilities(Error **errp)