Patchwork [v3] memory: simple memory tree printer

login
register
mail settings
Submitter Blue Swirl
Date Sept. 26, 2011, 8:03 p.m.
Message ID <CAAu8pHu6Ntj80NFBQA24c-9r4sehFFueVSmkJ1VbjS0Lg=JGig@mail.gmail.com>
Download mbox | patch
Permalink /patch/116475/
State New
Headers show

Comments

Blue Swirl - Sept. 26, 2011, 8:03 p.m.
Add a monitor command 'info mtree' to show the memory hierarchy
much like /proc/iomem in Linux.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
The alias addresses are unbiased (PPC):
00000000-fffffffe : system
  800a0000-800affff : alias vga.chain4 @vga.vram 00000000-0000ffff
  80880000-808fffff : macio
    808e0000-808fffff : macio-nvram
    808a0000-808a0fff : pmac-ide
    80896000-80895fff : (null)
    80893000-8089303f : alias escc-bar @escc 00000000-0000003f
    80888000-80888fff : dbdma
    80880000-80880fff : heathrow-pic
  80800000-8080ffff : vga.rom
  80000000-807fffff : vga.vram
  800a0000-800bffff : vga-lowmem
  80013000-8001303f : escc
  fee00000-fee00fff : pci-data-idx
  fec00000-fec00fff : pci-conf-idx
  fe000000-fe1fffff : isa-mmio
vga.vram
80000000-807fffff : vga.vram
escc
80013000-8001303f : escc
---
 memory.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 memory.h  |    2 +
 monitor.c |   13 +++++++++
 3 files changed, 103 insertions(+), 0 deletions(-)
Avi Kivity - Sept. 27, 2011, 9:10 a.m.
On 09/26/2011 11:03 PM, Blue Swirl wrote:
> Add a monitor command 'info mtree' to show the memory hierarchy
> much like /proc/iomem in Linux.

Thanks, applied.

> +
> +#ifdef TARGET_I386
> +    QTAILQ_INIT(&ml_head);
> +    mon_printf(f, "I/O\n");
> +    mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0,&ml_head);
> +#endif
>

I dropped the #ifdef here, since some non-x86 still have fake I/O 
address spaces.
Jan Kiszka - Sept. 27, 2011, 12:35 p.m.
On 2011-09-26 22:03, Blue Swirl wrote:
> Add a monitor command 'info mtree' to show the memory hierarchy
> much like /proc/iomem in Linux.
> 
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
> ---
> The alias addresses are unbiased (PPC):
> 00000000-fffffffe : system
>   800a0000-800affff : alias vga.chain4 @vga.vram 00000000-0000ffff
>   80880000-808fffff : macio
>     808e0000-808fffff : macio-nvram
>     808a0000-808a0fff : pmac-ide
>     80896000-80895fff : (null)
>     80893000-8089303f : alias escc-bar @escc 00000000-0000003f
>     80888000-80888fff : dbdma
>     80880000-80880fff : heathrow-pic
>   80800000-8080ffff : vga.rom
>   80000000-807fffff : vga.vram
>   800a0000-800bffff : vga-lowmem
>   80013000-8001303f : escc
>   fee00000-fee00fff : pci-data-idx
>   fec00000-fec00fff : pci-conf-idx
>   fe000000-fe1fffff : isa-mmio
> vga.vram
> 80000000-807fffff : vga.vram
> escc
> 80013000-8001303f : escc
> ---
>  memory.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  memory.h  |    2 +
>  monitor.c |   13 +++++++++
>  3 files changed, 103 insertions(+), 0 deletions(-)
> 
> diff --git a/memory.c b/memory.c
> index 71e769e..53264be 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -1271,3 +1271,91 @@ void set_system_io_map(MemoryRegion *mr)
>      address_space_io.root = mr;
>      memory_region_update_topology();
>  }
> +
> +typedef struct MemoryRegionList MemoryRegionList;
> +
> +struct MemoryRegionList {
> +    const MemoryRegion *mr;
> +    bool printed;

What's the point of printed? It's never true unless I'm missing
something fundamental.

> +    QTAILQ_ENTRY(MemoryRegionList) queue;
> +};
> +
> +typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
> +
> +static void mtree_print_mr(fprintf_function mon_printf, void *f,
> +                           const MemoryRegion *mr, unsigned int level,
> +                           target_phys_addr_t base,
> +                           MemoryRegionListHead *print_queue)
> +{
> +    const MemoryRegion *submr;
> +    unsigned int i;
> +
> +    for (i = 0; i < level; i++) {
> +        mon_printf(f, "  ");
> +    }
> +
> +    if (mr->alias) {
> +        MemoryRegionList *ml;
> +        bool found = false;
> +
> +        /* check if the alias is already in the queue */
> +        QTAILQ_FOREACH(ml, print_queue, queue) {
> +            if (ml->mr == mr->alias && !ml->printed) {
> +                found = true;
> +            }
> +        }
> +
> +        if (!found) {
> +            ml = g_new(MemoryRegionList, 1);
> +            ml->mr = mr->alias;
> +            ml->printed = false;
> +            QTAILQ_INSERT_TAIL(print_queue, ml, queue);
> +        }
> +        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : alias %s @%s "
> +                   TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
> +                   base + mr->addr,
> +                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
> +                   mr->name,
> +                   mr->alias->name,
> +                   mr->alias_offset,
> +                   mr->alias_offset + (target_phys_addr_t)mr->size - 1);
> +    } else {
> +        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : %s\n",
> +                   base + mr->addr,
> +                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
> +                   mr->name);

Region priority is still not printed. Will send a patch.

Jan
Blue Swirl - Sept. 27, 2011, 5:13 p.m.
On Tue, Sep 27, 2011 at 12:35 PM, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> On 2011-09-26 22:03, Blue Swirl wrote:
>> Add a monitor command 'info mtree' to show the memory hierarchy
>> much like /proc/iomem in Linux.
>>
>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>> ---
>> The alias addresses are unbiased (PPC):
>> 00000000-fffffffe : system
>>   800a0000-800affff : alias vga.chain4 @vga.vram 00000000-0000ffff
>>   80880000-808fffff : macio
>>     808e0000-808fffff : macio-nvram
>>     808a0000-808a0fff : pmac-ide
>>     80896000-80895fff : (null)
>>     80893000-8089303f : alias escc-bar @escc 00000000-0000003f
>>     80888000-80888fff : dbdma
>>     80880000-80880fff : heathrow-pic
>>   80800000-8080ffff : vga.rom
>>   80000000-807fffff : vga.vram
>>   800a0000-800bffff : vga-lowmem
>>   80013000-8001303f : escc
>>   fee00000-fee00fff : pci-data-idx
>>   fec00000-fec00fff : pci-conf-idx
>>   fe000000-fe1fffff : isa-mmio
>> vga.vram
>> 80000000-807fffff : vga.vram
>> escc
>> 80013000-8001303f : escc
>> ---
>>  memory.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  memory.h  |    2 +
>>  monitor.c |   13 +++++++++
>>  3 files changed, 103 insertions(+), 0 deletions(-)
>>
>> diff --git a/memory.c b/memory.c
>> index 71e769e..53264be 100644
>> --- a/memory.c
>> +++ b/memory.c
>> @@ -1271,3 +1271,91 @@ void set_system_io_map(MemoryRegion *mr)
>>      address_space_io.root = mr;
>>      memory_region_update_topology();
>>  }
>> +
>> +typedef struct MemoryRegionList MemoryRegionList;
>> +
>> +struct MemoryRegionList {
>> +    const MemoryRegion *mr;
>> +    bool printed;
>
> What's the point of printed? It's never true unless I'm missing
> something fundamental.

Right, the patch is buggy, sorry.

>> +    QTAILQ_ENTRY(MemoryRegionList) queue;
>> +};
>> +
>> +typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
>> +
>> +static void mtree_print_mr(fprintf_function mon_printf, void *f,
>> +                           const MemoryRegion *mr, unsigned int level,
>> +                           target_phys_addr_t base,
>> +                           MemoryRegionListHead *print_queue)
>> +{
>> +    const MemoryRegion *submr;
>> +    unsigned int i;
>> +
>> +    for (i = 0; i < level; i++) {
>> +        mon_printf(f, "  ");
>> +    }
>> +
>> +    if (mr->alias) {
>> +        MemoryRegionList *ml;
>> +        bool found = false;
>> +
>> +        /* check if the alias is already in the queue */
>> +        QTAILQ_FOREACH(ml, print_queue, queue) {
>> +            if (ml->mr == mr->alias && !ml->printed) {
>> +                found = true;
>> +            }
>> +        }
>> +
>> +        if (!found) {
>> +            ml = g_new(MemoryRegionList, 1);
>> +            ml->mr = mr->alias;
>> +            ml->printed = false;
>> +            QTAILQ_INSERT_TAIL(print_queue, ml, queue);
>> +        }
>> +        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : alias %s @%s "
>> +                   TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
>> +                   base + mr->addr,
>> +                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
>> +                   mr->name,
>> +                   mr->alias->name,
>> +                   mr->alias_offset,
>> +                   mr->alias_offset + (target_phys_addr_t)mr->size - 1);
>> +    } else {
>> +        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : %s\n",
>> +                   base + mr->addr,
>> +                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
>> +                   mr->name);
>
> Region priority is still not printed. Will send a patch.
>
> Jan
>
> --
> Siemens AG, Corporate Technology, CT T DE IT 1
> Corporate Competence Center Embedded Linux
>

Patch

From dd0361fce6a49705ae1ee372f714d964619c96bb Mon Sep 17 00:00:00 2001
Message-Id: <dd0361fce6a49705ae1ee372f714d964619c96bb.1317067084.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 11 Sep 2011 20:22:05 +0000
Subject: [PATCH] memory: simple memory tree printer

Add a monitor command 'info mtree' to show the memory hierarchy
much like /proc/iomem in Linux.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 memory.c  |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 memory.h  |    2 +
 monitor.c |   13 +++++++++
 3 files changed, 103 insertions(+), 0 deletions(-)

diff --git a/memory.c b/memory.c
index 71e769e..53264be 100644
--- a/memory.c
+++ b/memory.c
@@ -1271,3 +1271,91 @@  void set_system_io_map(MemoryRegion *mr)
     address_space_io.root = mr;
     memory_region_update_topology();
 }
+
+typedef struct MemoryRegionList MemoryRegionList;
+
+struct MemoryRegionList {
+    const MemoryRegion *mr;
+    bool printed;
+    QTAILQ_ENTRY(MemoryRegionList) queue;
+};
+
+typedef QTAILQ_HEAD(queue, MemoryRegionList) MemoryRegionListHead;
+
+static void mtree_print_mr(fprintf_function mon_printf, void *f,
+                           const MemoryRegion *mr, unsigned int level,
+                           target_phys_addr_t base,
+                           MemoryRegionListHead *print_queue)
+{
+    const MemoryRegion *submr;
+    unsigned int i;
+
+    for (i = 0; i < level; i++) {
+        mon_printf(f, "  ");
+    }
+
+    if (mr->alias) {
+        MemoryRegionList *ml;
+        bool found = false;
+
+        /* check if the alias is already in the queue */
+        QTAILQ_FOREACH(ml, print_queue, queue) {
+            if (ml->mr == mr->alias && !ml->printed) {
+                found = true;
+            }
+        }
+
+        if (!found) {
+            ml = g_new(MemoryRegionList, 1);
+            ml->mr = mr->alias;
+            ml->printed = false;
+            QTAILQ_INSERT_TAIL(print_queue, ml, queue);
+        }
+        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : alias %s @%s "
+                   TARGET_FMT_plx "-" TARGET_FMT_plx "\n",
+                   base + mr->addr,
+                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
+                   mr->name,
+                   mr->alias->name,
+                   mr->alias_offset,
+                   mr->alias_offset + (target_phys_addr_t)mr->size - 1);
+    } else {
+        mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " : %s\n",
+                   base + mr->addr,
+                   base + mr->addr + (target_phys_addr_t)mr->size - 1,
+                   mr->name);
+    }
+    QTAILQ_FOREACH(submr, &mr->subregions, subregions_link) {
+        mtree_print_mr(mon_printf, f, submr, level + 1, base + mr->addr,
+                       print_queue);
+    }
+}
+
+void mtree_info(fprintf_function mon_printf, void *f)
+{
+    MemoryRegionListHead ml_head;
+    MemoryRegionList *ml, *ml2;
+
+    QTAILQ_INIT(&ml_head);
+
+    mon_printf(f, "memory\n");
+    mtree_print_mr(mon_printf, f, address_space_memory.root, 0, 0, &ml_head);
+
+    /* print aliased regions */
+    QTAILQ_FOREACH(ml, &ml_head, queue) {
+        if (!ml->printed) {
+            mon_printf(f, "%s\n", ml->mr->name);
+            mtree_print_mr(mon_printf, f, ml->mr, 0, 0, &ml_head);
+        }
+    }
+
+    QTAILQ_FOREACH_SAFE(ml, &ml_head, queue, ml2) {
+        g_free(ml2);
+    }
+
+#ifdef TARGET_I386
+    QTAILQ_INIT(&ml_head);
+    mon_printf(f, "I/O\n");
+    mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head);
+#endif
+}
diff --git a/memory.h b/memory.h
index e93e65a..d5b47da 100644
--- a/memory.h
+++ b/memory.h
@@ -501,6 +501,8 @@  void memory_region_transaction_begin(void);
  */
 void memory_region_transaction_commit(void);
 
+void mtree_info(fprintf_function mon_printf, void *f);
+
 #endif
 
 #endif
diff --git a/monitor.c b/monitor.c
index 8ec2c5e..d323ea5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -63,6 +63,7 @@ 
 #endif
 #include "trace/control.h"
 #include "ui/qemu-spice.h"
+#include "memory.h"
 
 //#define DEBUG
 //#define DEBUG_COMPLETION
@@ -2470,6 +2471,11 @@  static void tlb_info(Monitor *mon)
 }
 #endif
 
+static void do_info_mtree(Monitor *mon)
+{
+    mtree_info((fprintf_function)monitor_printf, mon);
+}
+
 static void do_info_kvm_print(Monitor *mon, const QObject *data)
 {
     QDict *qdict;
@@ -2978,6 +2984,13 @@  static const mon_cmd_t info_cmds[] = {
     },
 #endif
     {
+        .name       = "mtree",
+        .args_type  = "",
+        .params     = "",
+        .help       = "show memory tree",
+        .mhandler.info = do_info_mtree,
+    },
+    {
         .name       = "jit",
         .args_type  = "",
         .params     = "",
-- 
1.7.2.5