From patchwork Wed Apr 26 07:44:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 755299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wCXXC5LFjz9ryr for ; Wed, 26 Apr 2017 17:58:51 +1000 (AEST) Received: from localhost ([::1]:53409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3Hqb-0004Mv-Bk for incoming@patchwork.ozlabs.org; Wed, 26 Apr 2017 03:58:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3HdB-0001rG-VP for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3HdA-0001Q4-RL for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3HdA-0001Pt-IF for qemu-devel@nongnu.org; Wed, 26 Apr 2017 03:44:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BEB4C0567A2 for ; Wed, 26 Apr 2017 07:44:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7BEB4C0567A2 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7BEB4C0567A2 Received: from pxdev.xzpeter.org.com (ovpn-8-40.pek2.redhat.com [10.72.8.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2745B5C475; Wed, 26 Apr 2017 07:44:52 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Wed, 26 Apr 2017 15:44:35 +0800 Message-Id: <1493192675-16104-3-git-send-email-peterx@redhat.com> In-Reply-To: <1493192675-16104-1-git-send-email-peterx@redhat.com> References: <1493192675-16104-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 26 Apr 2017 07:44:55 +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 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 , "Dr. David Alan Gilbert" , peterx@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To dump information about ramblocks. It looks like: (qemu) info ramblock Block Name PSize Offset Used Total /objects/mem 2M 0x0000000000000000 0x0000000080000000 0x0000000080000000 vga.vram 4K 0x0000000080060000 0x0000000001000000 0x0000000001000000 /rom@etc/acpi/tables 4K 0x00000000810b0000 0x0000000000020000 0x0000000000200000 pc.bios 4K 0x0000000080000000 0x0000000000040000 0x0000000000040000 0000:00:03.0/e1000.rom 4K 0x0000000081070000 0x0000000000040000 0x0000000000040000 pc.rom 4K 0x0000000080040000 0x0000000000020000 0x0000000000020000 0000:00:02.0/vga.rom 4K 0x0000000081060000 0x0000000000010000 0x0000000000010000 /rom@etc/table-loader 4K 0x00000000812b0000 0x0000000000001000 0x0000000000001000 /rom@etc/acpi/rsdp 4K 0x00000000812b1000 0x0000000000001000 0x0000000000001000 Signed-off-by: Peter Xu --- exec.c | 34 ++++++++++++++++++++++++++++++++++ hmp-commands-info.hx | 14 ++++++++++++++ hmp.c | 6 ++++++ hmp.h | 1 + include/exec/ramlist.h | 1 + 5 files changed, 56 insertions(+) diff --git a/exec.c b/exec.c index 50519ae..85a2c2b 100644 --- a/exec.c +++ b/exec.c @@ -71,6 +71,8 @@ #include "qemu/mmap-alloc.h" #endif +#include "monitor/monitor.h" + //#define DEBUG_SUBPAGE #if !defined(CONFIG_USER_ONLY) @@ -1333,6 +1335,38 @@ void qemu_mutex_unlock_ramlist(void) qemu_mutex_unlock(&ram_list.mutex); } +static const char *page_size_to_str(size_t psize) +{ + switch (psize) { + case 0x1000: + return "4K"; + case 0x10000: + return "64K"; + case 0x200000: + return "2M"; + case 0x40000000: + return "1G"; + default: + return "N/A"; + } +} + +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%016lx 0x%016lx 0x%016lx\n", + block->idstr, page_size_to_str(block->page_size), + block->offset, block->used_length, + 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 { + .name = "ramblock", + .args_type = "", + .params = "", + .help = "Display system ramblock information", + .cmd = hmp_info_ramblock, + }, + +STEXI +@item info ramblock +@findex ramblock +Dump all the ramblocks of the system. +ETEXI + + { .name = "hotpluggable-cpus", .args_type = "", .params = "", 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" #ifdef CONFIG_SPICE @@ -2563,6 +2564,11 @@ void hmp_info_dump(Monitor *mon, const QDict *qdict) qapi_free_DumpQueryResult(result); } +void hmp_info_ramblock(Monitor *mon, const QDict *qdict) +{ + ram_block_dump(mon); +} + void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) { Error *err = 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); 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); +void ram_block_dump(Monitor *mon); #endif /* RAMLIST_H */