From nobody Mon Feb 9 02:27:57 2026 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.zoho.com; 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 1494223333595662.9711252458651; Sun, 7 May 2017 23:02:13 -0700 (PDT) Received: from localhost ([::1]:57851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7bkJ-0008Ni-Sx for importer@patchew.org; Mon, 08 May 2017 02:02:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7bii-0007Tb-3j for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7big-00053B-VF for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38250) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7big-000531-MY for qemu-devel@nongnu.org; Mon, 08 May 2017 02:00:30 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D4D88050A for ; Mon, 8 May 2017 06:00:29 +0000 (UTC) Received: from pxdev.xzpeter.org.com (vpn1-5-39.pek2.redhat.com [10.72.5.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5061F1BD869; Mon, 8 May 2017 06:00:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7D4D88050A Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7D4D88050A From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 8 May 2017 14:00:04 +0800 Message-Id: <1494223204-16388-3-git-send-email-peterx@redhat.com> In-Reply-To: <1494223204-16388-1-git-send-email-peterx@redhat.com> References: <1494223204-16388-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 08 May 2017 06:00:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 2/2] ramblock: add new hmp command "info ramblock" 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: Paolo Bonzini , Markus Armbruster , peterx@redhat.com, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To dump information about ramblocks. It looks like: (qemu) info ramblock Block Name PSize Offset Used = Total /objects/mem 2M 0x0000000000000000 0x0000000080000000 0x= 0000000080000000 vga.vram 4K 0x0000000080060000 0x0000000001000000 0x= 0000000001000000 /rom@etc/acpi/tables 4K 0x00000000810b0000 0x0000000000020000 0x= 0000000000200000 pc.bios 4K 0x0000000080000000 0x0000000000040000 0x= 0000000000040000 0000:00:03.0/e1000.rom 4K 0x0000000081070000 0x0000000000040000 0x= 0000000000040000 pc.rom 4K 0x0000000080040000 0x0000000000020000 0x= 0000000000020000 0000:00:02.0/vga.rom 4K 0x0000000081060000 0x0000000000010000 0x= 0000000000010000 /rom@etc/table-loader 4K 0x00000000812b0000 0x0000000000001000 0x= 0000000000001000 /rom@etc/acpi/rsdp 4K 0x00000000812b1000 0x0000000000001000 0x= 0000000000001000 Ramblock is something hidden internally in QEMU implementation, and this command should only be used by mostly QEMU developers on RAM stuff. It is not a command suitable for QMP interface. So only HMP interface is provided for it. Signed-off-by: Peter Xu --- exec.c | 20 ++++++++++++++++++++ hmp-commands-info.hx | 14 ++++++++++++++ hmp.c | 6 ++++++ hmp.h | 1 + include/exec/ramlist.h | 1 + include/qemu-common.h | 1 + util/cutils.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 89 insertions(+) diff --git a/exec.c b/exec.c index 50519ae..5e50bdf 100644 --- a/exec.c +++ b/exec.c @@ -71,6 +71,8 @@ #include "qemu/mmap-alloc.h" #endif =20 +#include "monitor/monitor.h" + //#define DEBUG_SUBPAGE =20 #if !defined(CONFIG_USER_ONLY) @@ -1333,6 +1335,24 @@ void qemu_mutex_unlock_ramlist(void) qemu_mutex_unlock(&ram_list.mutex); } =20 +void ram_block_dump(Monitor *mon) +{ + RAMBlock *block; + + rcu_read_lock(); + monitor_printf(mon, "%24s %8s %18s %18s %18s\n", + "Block Name", "PSize", "Offset", "Used", "Total"); + RAMBLOCK_FOREACH(block) { + monitor_printf(mon, "%24s %8s 0x%016" PRIx64 " 0x%016" PRIx64 + " 0x%016" PRIx64 "\n", block->idstr, + page_size_to_str(block->page_size), + (uint64_t)block->offset, + (uint64_t)block->used_length, + (uint64_t)block->max_length); + } + rcu_read_unlock(); +} + #ifdef __linux__ /* * FIXME TOCTTOU: this iterates over memory backends' mem-path, which diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index a53f105..ae16901 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -788,6 +788,20 @@ Display the latest dump status. ETEXI =20 { + .name =3D "ramblock", + .args_type =3D "", + .params =3D "", + .help =3D "Display system ramblock information", + .cmd =3D hmp_info_ramblock, + }, + +STEXI +@item info ramblock +@findex ramblock +Dump all the ramblocks of the system. +ETEXI + + { .name =3D "hotpluggable-cpus", .args_type =3D "", .params =3D "", diff --git a/hmp.c b/hmp.c index ab407d6..8369388 100644 --- a/hmp.c +++ b/hmp.c @@ -37,6 +37,7 @@ #include "qemu-io.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "exec/ramlist.h" #include "hw/intc/intc.h" =20 #ifdef CONFIG_SPICE @@ -2563,6 +2564,11 @@ void hmp_info_dump(Monitor *mon, const QDict *qdict) qapi_free_DumpQueryResult(result); } =20 +void hmp_info_ramblock(Monitor *mon, const QDict *qdict) +{ + ram_block_dump(mon); +} + void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) { Error *err =3D NULL; diff --git a/hmp.h b/hmp.h index 799fd37..7353b67 100644 --- a/hmp.h +++ b/hmp.h @@ -136,6 +136,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict); void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict); void hmp_info_dump(Monitor *mon, const QDict *qdict); +void hmp_info_ramblock(Monitor *mon, const QDict *qdict); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); =20 diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h index f1c6b45..2e2ac6c 100644 --- a/include/exec/ramlist.h +++ b/include/exec/ramlist.h @@ -73,5 +73,6 @@ void ram_block_notifier_remove(RAMBlockNotifier *n); void ram_block_notify_add(void *host, size_t size); void ram_block_notify_remove(void *host, size_t size); =20 +void ram_block_dump(Monitor *mon); =20 #endif /* RAMLIST_H */ diff --git a/include/qemu-common.h b/include/qemu-common.h index d218821..62aef10 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -146,6 +146,7 @@ int parse_debug_env(const char *name, int max, int init= ial); =20 const char *qemu_ether_ntoa(const MACAddr *mac); void page_size_init(void); +const char *page_size_to_str(size_t psize); =20 /* returns non-zero if dump is in progress, otherwise zero is * returned. */ diff --git a/util/cutils.c b/util/cutils.c index 50ad179..b0fe88a 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -619,3 +619,49 @@ const char *qemu_ether_ntoa(const MACAddr *mac) =20 return ret; } + +const char *page_size_to_str(size_t psize) +{ + switch (psize) { + case 0x1000: + return "4K"; + case 0x2000: + return "8K"; + case 0x4000: + return "16K"; + case 0x8000: + return "32K"; + case 0x10000: + return "64K"; + case 0x20000: + return "128K"; + case 0x40000: + return "256K"; + case 0x80000: + return "512K"; + case 0x100000: + return "1M"; + case 0x200000: + return "2M"; + case 0x400000: + return "4M"; + case 0x800000: + return "8M"; + case 0x1000000: + return "16M"; + case 0x2000000: + return "32M"; + case 0x4000000: + return "64M"; + case 0x8000000: + return "128M"; + case 0x10000000: + return "256M"; + case 0x20000000: + return "512M"; + case 0x40000000: + return "1G"; + default: + return "N/A"; + } +} --=20 2.7.4