From nobody Tue Nov 4 16:10:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504020904906689.4877475559144; Tue, 29 Aug 2017 08:35:04 -0700 (PDT) Received: from localhost ([::1]:45526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmiXd-0004pf-Ht for importer@patchew.org; Tue, 29 Aug 2017 11:35:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dmiTU-0001g2-TT for qemu-devel@nongnu.org; Tue, 29 Aug 2017 11:30:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dmiTT-0003mD-0a for qemu-devel@nongnu.org; Tue, 29 Aug 2017 11:30:44 -0400 Received: from mail-wr0-x22a.google.com ([2a00:1450:400c:c0c::22a]:37789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dmiTS-0003hs-Nk for qemu-devel@nongnu.org; Tue, 29 Aug 2017 11:30:42 -0400 Received: by mail-wr0-x22a.google.com with SMTP id n37so11244166wrf.4 for ; Tue, 29 Aug 2017 08:30:40 -0700 (PDT) Received: from debian-jessie.pb.local ([62.217.45.26]) by smtp.gmail.com with ESMTPSA id x7sm1702459wme.34.2017.08.29.08.30.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 08:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profitbricks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gDSaq6VthRxgyooHv+SkE26EeahPcIvdVsc7wE42GpI=; b=dhqqLT74KYDt7O01oQKnkFgdg/3qbIeQ24a3+Z6nbBBZ2xkaCd/VOFmR5oexLNgsqj MRVG1brLVznQ8jb0RHeaE0czXWQbeKhMvGrU0+BC/wTU4X9+3/e6osra5DcFFxjtvQWy nmdgg8zuyaeQhbpMURU8LQLuo1g/jCvwtO34ZjP3/NomOk3bwK8e1y/GsUGtBEX8LxKQ q/CsWyumKjwMFfWwEGq1kv1tsTOgyEJg81id7R89q5f1ZW2oxUI8D09sYIrhKbq7nuCn /xrQYv8Nf4O3ZKFKb1QBJVY68Fkcp4JacD5pO6cC8/r+tt/RORGgQlKHX2KYPFUkaZxJ 6w+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gDSaq6VthRxgyooHv+SkE26EeahPcIvdVsc7wE42GpI=; b=lq3bb6ZEhrMQsgVnC0ZxypvkuKEYJGMittTX8IUd7U+SqrmnP59sXBW3RdDbpsGuq7 9K2S5qyepmyNGqi3X8CzogEZ+Ke71ySF/mPyQsgIamWcfsS5ypcflUOsyavci6mVIwIM ngYJ0yaoo1pKz3U05o3A6jxgt/SXXlpT6PiOJS9NphM7DsRsbevDNr+WXS4ZyYtMPeED hcSRFw2FCGj59XX7S48J3SHvgGrSbfI1z4i3HeSxPa44bJCZAojB4x6v+hyc2bR7Amc3 nRQwcv/dB5aM9f7vjz7PMemZ/M0foZOdNY/0K/iEDuWZ3ntuv5GyvD4OwrmIrW8OKubH unag== X-Gm-Message-State: AHYfb5jiob9c3ityDcIuDljsf2ppp1ZyuLrQkf1O/Casjfqh7uQgshJ6 PZfc3Tl7rQqqS2MK X-Received: by 10.223.145.2 with SMTP id j2mr431837wrj.227.1504020640034; Tue, 29 Aug 2017 08:30:40 -0700 (PDT) From: Vadim Galitsyn To: Eduardo Habkost , David Hildenbrand , "Dr . David Alan Gilbert" , Markus Armbruster , Igor Mammedov , Eric Blake , qemu-devel@nongnu.org Date: Tue, 29 Aug 2017 17:30:20 +0200 Message-Id: <20170829153022.27004-2-vadim.galitsyn@profitbricks.com> X-Mailer: git-send-email 2.13.1.394.g41dd433 In-Reply-To: <20170829153022.27004-1-vadim.galitsyn@profitbricks.com> References: <20170829153022.27004-1-vadim.galitsyn@profitbricks.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22a Subject: [Qemu-devel] [PATCH v7 1/3] hmp: extend "info numa" with hotplugged memory information X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vadim Galitsyn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Report amount of hotplugged memory in addition to total amount per NUMA node. Signed-off-by: Vadim Galitsyn Cc: Eduardo Habkost Cc: David Hildenbrand Cc: qemu-devel@nongnu.org --- include/qemu/typedefs.h | 1 + include/sysemu/numa.h | 7 ++++++- monitor.c | 9 ++++++--- numa.c | 18 +++++++++++++----- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 39bc8351a3..163550214c 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -58,6 +58,7 @@ typedef struct MSIMessage MSIMessage; typedef struct NetClientState NetClientState; typedef struct NetFilterState NetFilterState; typedef struct NICInfo NICInfo; +typedef struct NumaNodeMem NumaNodeMem; typedef struct PcGuestInfo PcGuestInfo; typedef struct PCIBridge PCIBridge; typedef struct PCIBus PCIBus; diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h index 610eece211..5c6df2820b 100644 --- a/include/sysemu/numa.h +++ b/include/sysemu/numa.h @@ -24,9 +24,14 @@ struct node_info { uint8_t distance[MAX_NODES]; }; =20 +struct NumaNodeMem { + uint64_t node_mem; + uint64_t node_plugged_mem; +}; + extern NodeInfo numa_info[MAX_NODES]; void parse_numa_opts(MachineState *ms); -void query_numa_node_mem(uint64_t node_mem[]); +void query_numa_node_mem(NumaNodeMem node_mem[]); extern QemuOptsList qemu_numa_opts; void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node); void numa_unset_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node); diff --git a/monitor.c b/monitor.c index e0f880107f..6c9d183caf 100644 --- a/monitor.c +++ b/monitor.c @@ -1710,11 +1710,12 @@ static void hmp_info_mtree(Monitor *mon, const QDic= t *qdict) static void hmp_info_numa(Monitor *mon, const QDict *qdict) { int i; - uint64_t *node_mem; + NumaNodeMem *node_mem; CpuInfoList *cpu_list, *cpu; =20 cpu_list =3D qmp_query_cpus(&error_abort); - node_mem =3D g_new0(uint64_t, nb_numa_nodes); + node_mem =3D g_new0(NumaNodeMem, nb_numa_nodes); + query_numa_node_mem(node_mem); monitor_printf(mon, "%d nodes\n", nb_numa_nodes); for (i =3D 0; i < nb_numa_nodes; i++) { @@ -1727,7 +1728,9 @@ static void hmp_info_numa(Monitor *mon, const QDict *= qdict) } monitor_printf(mon, "\n"); monitor_printf(mon, "node %d size: %" PRId64 " MB\n", i, - node_mem[i] >> 20); + node_mem[i].node_mem >> 20); + monitor_printf(mon, "node %d plugged: %" PRId64 " MB\n", i, + node_mem[i].node_plugged_mem >> 20); } qapi_free_CpuInfoList(cpu_list); g_free(node_mem); diff --git a/numa.c b/numa.c index e32af04cd2..fe066ad2f8 100644 --- a/numa.c +++ b/numa.c @@ -591,11 +591,12 @@ void memory_region_allocate_system_memory(MemoryRegio= n *mr, Object *owner, } } =20 -static void numa_stat_memory_devices(uint64_t node_mem[]) +static void numa_stat_memory_devices(NumaNodeMem node_mem[]) { MemoryDeviceInfoList *info_list =3D NULL; MemoryDeviceInfoList **prev =3D &info_list; MemoryDeviceInfoList *info; + PCDIMMDeviceInfo *pcdimm_info; =20 qmp_pc_dimm_device_list(qdev_get_machine(), &prev); for (info =3D info_list; info; info =3D info->next) { @@ -603,9 +604,16 @@ static void numa_stat_memory_devices(uint64_t node_mem= []) =20 if (value) { switch (value->type) { - case MEMORY_DEVICE_INFO_KIND_DIMM: - node_mem[value->u.dimm.data->node] +=3D value->u.dimm.data= ->size; + case MEMORY_DEVICE_INFO_KIND_DIMM: { + pcdimm_info =3D value->u.dimm.data; + node_mem[pcdimm_info->node].node_mem +=3D pcdimm_info->siz= e; + if (pcdimm_info->hotpluggable && pcdimm_info->hotplugged) { + node_mem[pcdimm_info->node].node_plugged_mem +=3D + pcdimm_info->size; + } break; + } + default: break; } @@ -614,7 +622,7 @@ static void numa_stat_memory_devices(uint64_t node_mem[= ]) qapi_free_MemoryDeviceInfoList(info_list); } =20 -void query_numa_node_mem(uint64_t node_mem[]) +void query_numa_node_mem(NumaNodeMem node_mem[]) { int i; =20 @@ -624,7 +632,7 @@ void query_numa_node_mem(uint64_t node_mem[]) =20 numa_stat_memory_devices(node_mem); for (i =3D 0; i < nb_numa_nodes; i++) { - node_mem[i] +=3D numa_info[i].node_mem; + node_mem[i].node_mem +=3D numa_info[i].node_mem; } } =20 --=20 2.13.1.394.g41dd433