* [Qemu-devel] [PATCH v4 1/2] memory: tune mtree_print_mr() to dump mr type
2017-01-16 8:40 [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump Peter Xu
@ 2017-01-16 8:40 ` Peter Xu
2017-01-17 19:23 ` Dr. David Alan Gilbert
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 2/2] memory: hmp: add "-f" for "info mtree" Peter Xu
2017-01-18 9:05 ` [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump Paolo Bonzini
2 siblings, 1 reply; 6+ messages in thread
From: Peter Xu @ 2017-01-16 8:40 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, marcandre.lureau, Dr . David Alan Gilbert, peterx
We were dumping RW bits for each memory region, that might be confusing.
It'll make more sense to dump the memory region type directly rather
than the RW bits since that's how the bits are derived.
Meanwhile, with some slight cleanup in the function.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
memory.c | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/memory.c b/memory.c
index 2bfc37f..c42bde4 100644
--- a/memory.c
+++ b/memory.c
@@ -2450,6 +2450,21 @@ void address_space_destroy(AddressSpace *as)
call_rcu(as, do_address_space_destroy, rcu);
}
+static const char *memory_region_type(MemoryRegion *mr)
+{
+ if (memory_region_is_ram_device(mr)) {
+ return "ramd";
+ } else if (memory_region_is_romd(mr)) {
+ return "romd";
+ } else if (memory_region_is_rom(mr)) {
+ return "rom";
+ } else if (memory_region_is_ram(mr)) {
+ return "ram";
+ } else {
+ return "i/o";
+ }
+}
+
typedef struct MemoryRegionList MemoryRegionList;
struct MemoryRegionList {
@@ -2459,6 +2474,10 @@ struct MemoryRegionList {
typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
+#define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \
+ int128_sub((size), int128_one())) : 0)
+#define MTREE_INDENT " "
+
static void mtree_print_mr(fprintf_function mon_printf, void *f,
const MemoryRegion *mr, unsigned int level,
hwaddr base,
@@ -2474,7 +2493,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
}
for (i = 0; i < level; i++) {
- mon_printf(f, " ");
+ mon_printf(f, MTREE_INDENT);
}
if (mr->alias) {
@@ -2494,37 +2513,24 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
}
mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx
- " (prio %d, %c%c): alias %s @%s " TARGET_FMT_plx
+ " (prio %d, %s): alias %s @%s " TARGET_FMT_plx
"-" TARGET_FMT_plx "%s\n",
base + mr->addr,
- base + mr->addr
- + (int128_nz(mr->size) ?
- (hwaddr)int128_get64(int128_sub(mr->size,
- int128_one())) : 0),
+ base + mr->addr + MR_SIZE(mr->size),
mr->priority,
- mr->romd_mode ? 'R' : '-',
- !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
- : '-',
+ memory_region_type((MemoryRegion *)mr),
memory_region_name(mr),
memory_region_name(mr->alias),
mr->alias_offset,
- mr->alias_offset
- + (int128_nz(mr->size) ?
- (hwaddr)int128_get64(int128_sub(mr->size,
- int128_one())) : 0),
+ mr->alias_offset + MR_SIZE(mr->size),
mr->enabled ? "" : " [disabled]");
} else {
mon_printf(f,
- TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s%s\n",
+ TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): %s%s\n",
base + mr->addr,
- base + mr->addr
- + (int128_nz(mr->size) ?
- (hwaddr)int128_get64(int128_sub(mr->size,
- int128_one())) : 0),
+ base + mr->addr + MR_SIZE(mr->size),
mr->priority,
- mr->romd_mode ? 'R' : '-',
- !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
- : '-',
+ memory_region_type((MemoryRegion *)mr),
memory_region_name(mr),
mr->enabled ? "" : " [disabled]");
}
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4 1/2] memory: tune mtree_print_mr() to dump mr type
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 1/2] memory: tune mtree_print_mr() to dump mr type Peter Xu
@ 2017-01-17 19:23 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Dr. David Alan Gilbert @ 2017-01-17 19:23 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, pbonzini, marcandre.lureau
* Peter Xu (peterx@redhat.com) wrote:
> We were dumping RW bits for each memory region, that might be confusing.
> It'll make more sense to dump the memory region type directly rather
> than the RW bits since that's how the bits are derived.
>
> Meanwhile, with some slight cleanup in the function.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> memory.c | 48 +++++++++++++++++++++++++++---------------------
> 1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/memory.c b/memory.c
> index 2bfc37f..c42bde4 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -2450,6 +2450,21 @@ void address_space_destroy(AddressSpace *as)
> call_rcu(as, do_address_space_destroy, rcu);
> }
>
> +static const char *memory_region_type(MemoryRegion *mr)
> +{
> + if (memory_region_is_ram_device(mr)) {
> + return "ramd";
> + } else if (memory_region_is_romd(mr)) {
> + return "romd";
> + } else if (memory_region_is_rom(mr)) {
> + return "rom";
> + } else if (memory_region_is_ram(mr)) {
> + return "ram";
> + } else {
> + return "i/o";
> + }
> +}
> +
> typedef struct MemoryRegionList MemoryRegionList;
>
> struct MemoryRegionList {
> @@ -2459,6 +2474,10 @@ struct MemoryRegionList {
>
> typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
>
> +#define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \
> + int128_sub((size), int128_one())) : 0)
> +#define MTREE_INDENT " "
> +
> static void mtree_print_mr(fprintf_function mon_printf, void *f,
> const MemoryRegion *mr, unsigned int level,
> hwaddr base,
> @@ -2474,7 +2493,7 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> }
>
> for (i = 0; i < level; i++) {
> - mon_printf(f, " ");
> + mon_printf(f, MTREE_INDENT);
> }
>
> if (mr->alias) {
> @@ -2494,37 +2513,24 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> QTAILQ_INSERT_TAIL(alias_print_queue, ml, queue);
> }
> mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx
> - " (prio %d, %c%c): alias %s @%s " TARGET_FMT_plx
> + " (prio %d, %s): alias %s @%s " TARGET_FMT_plx
> "-" TARGET_FMT_plx "%s\n",
> base + mr->addr,
> - base + mr->addr
> - + (int128_nz(mr->size) ?
> - (hwaddr)int128_get64(int128_sub(mr->size,
> - int128_one())) : 0),
> + base + mr->addr + MR_SIZE(mr->size),
> mr->priority,
> - mr->romd_mode ? 'R' : '-',
> - !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
> - : '-',
> + memory_region_type((MemoryRegion *)mr),
> memory_region_name(mr),
> memory_region_name(mr->alias),
> mr->alias_offset,
> - mr->alias_offset
> - + (int128_nz(mr->size) ?
> - (hwaddr)int128_get64(int128_sub(mr->size,
> - int128_one())) : 0),
> + mr->alias_offset + MR_SIZE(mr->size),
> mr->enabled ? "" : " [disabled]");
> } else {
> mon_printf(f,
> - TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %c%c): %s%s\n",
> + TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): %s%s\n",
> base + mr->addr,
> - base + mr->addr
> - + (int128_nz(mr->size) ?
> - (hwaddr)int128_get64(int128_sub(mr->size,
> - int128_one())) : 0),
> + base + mr->addr + MR_SIZE(mr->size),
> mr->priority,
> - mr->romd_mode ? 'R' : '-',
> - !mr->readonly && !(mr->rom_device && mr->romd_mode) ? 'W'
> - : '-',
> + memory_region_type((MemoryRegion *)mr),
> memory_region_name(mr),
> mr->enabled ? "" : " [disabled]");
> }
> --
> 2.7.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH v4 2/2] memory: hmp: add "-f" for "info mtree"
2017-01-16 8:40 [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump Peter Xu
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 1/2] memory: tune mtree_print_mr() to dump mr type Peter Xu
@ 2017-01-16 8:40 ` Peter Xu
2017-01-17 17:37 ` Dr. David Alan Gilbert
2017-01-18 9:05 ` [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump Paolo Bonzini
2 siblings, 1 reply; 6+ messages in thread
From: Peter Xu @ 2017-01-16 8:40 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, marcandre.lureau, Dr . David Alan Gilbert, peterx
Adding one more option "-f" for "info mtree" to dump the flat views of
all the address spaces.
This will be useful to debug the memory rendering logic, also it'll be
much easier with it to know what memory region is handling what address
range.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
hmp-commands-info.hx | 6 +++---
include/exec/memory.h | 2 +-
memory.c | 41 ++++++++++++++++++++++++++++++++++++++++-
monitor.c | 4 +++-
4 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index 55d50c4..b0f35e6 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -249,9 +249,9 @@ ETEXI
{
.name = "mtree",
- .args_type = "",
- .params = "",
- .help = "show memory tree",
+ .args_type = "flatview:-f",
+ .params = "[-f]",
+ .help = "show memory tree (-f: dump flat view for address spaces)",
.cmd = hmp_info_mtree,
},
diff --git a/include/exec/memory.h b/include/exec/memory.h
index bec9756..71db380 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -1254,7 +1254,7 @@ void memory_global_dirty_log_start(void);
*/
void memory_global_dirty_log_stop(void);
-void mtree_info(fprintf_function mon_printf, void *f);
+void mtree_info(fprintf_function mon_printf, void *f, bool flatview);
/**
* memory_region_dispatch_read: perform a read directly to the specified
diff --git a/memory.c b/memory.c
index c42bde4..6498727 100644
--- a/memory.c
+++ b/memory.c
@@ -2564,12 +2564,51 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
}
}
-void mtree_info(fprintf_function mon_printf, void *f)
+static void mtree_print_flatview(fprintf_function p, void *f,
+ AddressSpace *as)
+{
+ FlatView *view = address_space_get_flatview(as);
+ FlatRange *range = &view->ranges[0];
+ MemoryRegion *mr;
+ int n = view->nr;
+
+ if (n <= 0) {
+ p(f, MTREE_INDENT "No rendered FlatView for "
+ "address space '%s'\n", as->name);
+ flatview_unref(view);
+ return;
+ }
+
+ while (n--) {
+ mr = range->mr;
+ p(f, MTREE_INDENT TARGET_FMT_plx "-"
+ TARGET_FMT_plx " (prio %d, %s): %s\n",
+ int128_get64(range->addr.start),
+ int128_get64(range->addr.start) + MR_SIZE(range->addr.size),
+ mr->priority,
+ memory_region_type(mr),
+ memory_region_name(mr));
+ range++;
+ }
+
+ flatview_unref(view);
+}
+
+void mtree_info(fprintf_function mon_printf, void *f, bool flatview)
{
MemoryRegionListHead ml_head;
MemoryRegionList *ml, *ml2;
AddressSpace *as;
+ if (flatview) {
+ QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
+ mon_printf(f, "address-space (flat view): %s\n", as->name);
+ mtree_print_flatview(mon_printf, f, as);
+ mon_printf(f, "\n");
+ }
+ return;
+ }
+
QTAILQ_INIT(&ml_head);
QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
diff --git a/monitor.c b/monitor.c
index 0841d43..679cd52 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1529,7 +1529,9 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict)
static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
{
- mtree_info((fprintf_function)monitor_printf, mon);
+ bool flatview = qdict_get_try_bool(qdict, "flatview", false);
+
+ mtree_info((fprintf_function)monitor_printf, mon, flatview);
}
static void hmp_info_numa(Monitor *mon, const QDict *qdict)
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH v4 2/2] memory: hmp: add "-f" for "info mtree"
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 2/2] memory: hmp: add "-f" for "info mtree" Peter Xu
@ 2017-01-17 17:37 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Dr. David Alan Gilbert @ 2017-01-17 17:37 UTC (permalink / raw)
To: Peter Xu; +Cc: qemu-devel, pbonzini, marcandre.lureau
* Peter Xu (peterx@redhat.com) wrote:
> Adding one more option "-f" for "info mtree" to dump the flat views of
> all the address spaces.
>
> This will be useful to debug the memory rendering logic, also it'll be
> much easier with it to know what memory region is handling what address
> range.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> hmp-commands-info.hx | 6 +++---
> include/exec/memory.h | 2 +-
> memory.c | 41 ++++++++++++++++++++++++++++++++++++++++-
> monitor.c | 4 +++-
> 4 files changed, 47 insertions(+), 6 deletions(-)
>
> diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
> index 55d50c4..b0f35e6 100644
> --- a/hmp-commands-info.hx
> +++ b/hmp-commands-info.hx
> @@ -249,9 +249,9 @@ ETEXI
>
> {
> .name = "mtree",
> - .args_type = "",
> - .params = "",
> - .help = "show memory tree",
> + .args_type = "flatview:-f",
> + .params = "[-f]",
> + .help = "show memory tree (-f: dump flat view for address spaces)",
> .cmd = hmp_info_mtree,
> },
>
> diff --git a/include/exec/memory.h b/include/exec/memory.h
> index bec9756..71db380 100644
> --- a/include/exec/memory.h
> +++ b/include/exec/memory.h
> @@ -1254,7 +1254,7 @@ void memory_global_dirty_log_start(void);
> */
> void memory_global_dirty_log_stop(void);
>
> -void mtree_info(fprintf_function mon_printf, void *f);
> +void mtree_info(fprintf_function mon_printf, void *f, bool flatview);
>
> /**
> * memory_region_dispatch_read: perform a read directly to the specified
> diff --git a/memory.c b/memory.c
> index c42bde4..6498727 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -2564,12 +2564,51 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,
> }
> }
>
> -void mtree_info(fprintf_function mon_printf, void *f)
> +static void mtree_print_flatview(fprintf_function p, void *f,
> + AddressSpace *as)
> +{
> + FlatView *view = address_space_get_flatview(as);
> + FlatRange *range = &view->ranges[0];
> + MemoryRegion *mr;
> + int n = view->nr;
> +
> + if (n <= 0) {
> + p(f, MTREE_INDENT "No rendered FlatView for "
> + "address space '%s'\n", as->name);
> + flatview_unref(view);
> + return;
> + }
> +
> + while (n--) {
> + mr = range->mr;
> + p(f, MTREE_INDENT TARGET_FMT_plx "-"
> + TARGET_FMT_plx " (prio %d, %s): %s\n",
> + int128_get64(range->addr.start),
> + int128_get64(range->addr.start) + MR_SIZE(range->addr.size),
> + mr->priority,
> + memory_region_type(mr),
> + memory_region_name(mr));
> + range++;
> + }
> +
> + flatview_unref(view);
> +}
> +
> +void mtree_info(fprintf_function mon_printf, void *f, bool flatview)
> {
> MemoryRegionListHead ml_head;
> MemoryRegionList *ml, *ml2;
> AddressSpace *as;
>
> + if (flatview) {
> + QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
> + mon_printf(f, "address-space (flat view): %s\n", as->name);
> + mtree_print_flatview(mon_printf, f, as);
> + mon_printf(f, "\n");
> + }
> + return;
> + }
> +
> QTAILQ_INIT(&ml_head);
>
> QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
> diff --git a/monitor.c b/monitor.c
> index 0841d43..679cd52 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1529,7 +1529,9 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict)
>
> static void hmp_info_mtree(Monitor *mon, const QDict *qdict)
> {
> - mtree_info((fprintf_function)monitor_printf, mon);
> + bool flatview = qdict_get_try_bool(qdict, "flatview", false);
> +
> + mtree_info((fprintf_function)monitor_printf, mon, flatview);
> }
>
> static void hmp_info_numa(Monitor *mon, const QDict *qdict)
> --
> 2.7.4
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump
2017-01-16 8:40 [Qemu-devel] [PATCH v4 0/2] memory: extend "info mtree" with flat view dump Peter Xu
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 1/2] memory: tune mtree_print_mr() to dump mr type Peter Xu
2017-01-16 8:40 ` [Qemu-devel] [PATCH v4 2/2] memory: hmp: add "-f" for "info mtree" Peter Xu
@ 2017-01-18 9:05 ` Paolo Bonzini
2 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2017-01-18 9:05 UTC (permalink / raw)
To: Peter Xu, qemu-devel; +Cc: marcandre.lureau, Dr . David Alan Gilbert
On 16/01/2017 09:40, Peter Xu wrote:
> v4:
> - do unref of flatview when no view is there [Dave]
>
> v3:
> - rather than dump flatview directly in "info mtree", provide a new
> parameter "-f" for it. [Paolo]
> - replace "RW" chars with the type of memory region [Paolo]
> - (cc dave as well since it touches HMP interface)
>
> v2:
> - fix a size error in patch 2
> - add r-b for Marc-André in patch 1
>
> Each address space has its own flatview. It's another way to observe
> memory info besides the default memory region hierachy, for example,
> if we want to know which memory region will handle the write to
> specific address, a flatview will suite more here than the default
> hierachical dump.
>
> Please review. Thanks,
>
> Peter Xu (2):
> memory: tune mtree_print_mr() to dump mr type
> memory: hmp: add "-f" for "info mtree"
>
> hmp-commands-info.hx | 6 ++--
> include/exec/memory.h | 2 +-
> memory.c | 89 ++++++++++++++++++++++++++++++++++++++-------------
> monitor.c | 4 ++-
> 4 files changed, 74 insertions(+), 27 deletions(-)
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread