From 6a1a074890aa228417dffb2afb49f56234e99c8d Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 16 Nov 2017 03:07:27 +0100

Subject: [PATCH 23/30] memory: Rework "info mtree" to print flat views and

 dispatch trees

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20171116030732.8560-18-dgibson@redhat.com>

Patchwork-id: 77709

O-Subject: [PATCH 17/22] memory: Rework "info mtree" to print flat views and dispatch trees

Bugzilla: 1481593

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

This adds a new "-d" switch to "info mtree" to print dispatch tree

internals.

This changes the way "-f" is handled - it prints now flat views and

associated address spaces.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Message-Id: <20170921085110.25598-15-aik@ozlabs.ru>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 5e8fd947e2670c3c18f139de6a83fafcb56abbcc)

Signed-off-by: David Gibson <dgibson@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 exec.c                         | 84 +++++++++++++++++++++++++++++++++++++++

 hmp-commands-info.hx           |  7 ++--

 include/exec/memory-internal.h |  4 ++

 include/exec/memory.h          |  3 +-

 memory.c                       | 90 +++++++++++++++++++++++++++++++++++++-----

 monitor.c                      |  3 +-

 6 files changed, 176 insertions(+), 15 deletions(-)

diff --git a/exec.c b/exec.c

index 1b30e1e..5a12e55 100644

--- a/exec.c

+++ b/exec.c

@@ -3628,3 +3628,87 @@ void page_size_init(void)

     }

     qemu_host_page_mask = -(intptr_t)qemu_host_page_size;

 }

+

+#if !defined(CONFIG_USER_ONLY)

+

+static void mtree_print_phys_entries(fprintf_function mon, void *f,

+                                     int start, int end, int skip, int ptr)

+{

+    if (start == end - 1) {

+        mon(f, "\t%3d      ", start);

+    } else {

+        mon(f, "\t%3d..%-3d ", start, end - 1);

+    }

+    mon(f, " skip=%d ", skip);

+    if (ptr == PHYS_MAP_NODE_NIL) {

+        mon(f, " ptr=NIL");

+    } else if (!skip) {

+        mon(f, " ptr=#%d", ptr);

+    } else {

+        mon(f, " ptr=[%d]", ptr);

+    }

+    mon(f, "\n");

+}

+

+#define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \

+                           int128_sub((size), int128_one())) : 0)

+

+void mtree_print_dispatch(fprintf_function mon, void *f,

+                          AddressSpaceDispatch *d, MemoryRegion *root)

+{

+    int i;

+

+    mon(f, "  Dispatch\n");

+    mon(f, "    Physical sections\n");

+

+    for (i = 0; i < d->map.sections_nb; ++i) {

+        MemoryRegionSection *s = d->map.sections + i;

+        const char *names[] = { " [unassigned]", " [not dirty]",

+                                " [ROM]", " [watch]" };

+

+        mon(f, "      #%d @" TARGET_FMT_plx ".." TARGET_FMT_plx " %s%s%s%s%s",

+            i,

+            s->offset_within_address_space,

+            s->offset_within_address_space + MR_SIZE(s->mr->size),

+            s->mr->name ? s->mr->name : "(noname)",

+            i < ARRAY_SIZE(names) ? names[i] : "",

+            s->mr == root ? " [ROOT]" : "",

+            s == d->mru_section ? " [MRU]" : "",

+            s->mr->is_iommu ? " [iommu]" : "");

+

+        if (s->mr->alias) {

+            mon(f, " alias=%s", s->mr->alias->name ?

+                    s->mr->alias->name : "noname");

+        }

+        mon(f, "\n");

+    }

+

+    mon(f, "    Nodes (%d bits per level, %d levels) ptr=[%d] skip=%d\n",

+               P_L2_BITS, P_L2_LEVELS, d->phys_map.ptr, d->phys_map.skip);

+    for (i = 0; i < d->map.nodes_nb; ++i) {

+        int j, jprev;

+        PhysPageEntry prev;

+        Node *n = d->map.nodes + i;

+

+        mon(f, "      [%d]\n", i);

+

+        for (j = 0, jprev = 0, prev = *n[0]; j < ARRAY_SIZE(*n); ++j) {

+            PhysPageEntry *pe = *n + j;

+

+            if (pe->ptr == prev.ptr && pe->skip == prev.skip) {

+                continue;

+            }

+

+            mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);

+

+            jprev = j;

+            prev = *pe;

+        }

+

+        if (jprev != ARRAY_SIZE(*n)) {

+            mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);

+        }

+    }

+}

+

+#endif

diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx

index 0967e41..30b335f 100644

--- a/hmp-commands-info.hx

+++ b/hmp-commands-info.hx

@@ -253,9 +253,10 @@ ETEXI

     {

         .name       = "mtree",

-        .args_type  = "flatview:-f",

-        .params     = "[-f]",

-        .help       = "show memory tree (-f: dump flat view for address spaces)",

+        .args_type  = "flatview:-f,dispatch_tree:-d",

+        .params     = "[-f][-d]",

+        .help       = "show memory tree (-f: dump flat view for address spaces;"

+                      "-d: dump dispatch tree, valid with -f only)",

         .cmd        = hmp_info_mtree,

     },

diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h

index d4a35c6..647e9bd 100644

--- a/include/exec/memory-internal.h

+++ b/include/exec/memory-internal.h

@@ -35,5 +35,9 @@ AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);

 AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);

 void address_space_dispatch_free(AddressSpaceDispatch *d);

+void mtree_print_dispatch(fprintf_function mon, void *f,

+                          struct AddressSpaceDispatch *d,

+                          MemoryRegion *root);

+

 #endif

 #endif

diff --git a/include/exec/memory.h b/include/exec/memory.h

index 6715551..157eae6 100644

--- a/include/exec/memory.h

+++ b/include/exec/memory.h

@@ -1525,7 +1525,8 @@ void memory_global_dirty_log_start(void);

  */

 void memory_global_dirty_log_stop(void);

-void mtree_info(fprintf_function mon_printf, void *f, bool flatview);

+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,

+                bool dispatch_tree);

 /**

  * memory_region_request_mmio_ptr: request a pointer to an mmio

diff --git a/memory.c b/memory.c

index 6914d87..25a8bf2 100644

--- a/memory.c

+++ b/memory.c

@@ -2906,18 +2906,44 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,

     }

 }

-static void mtree_print_flatview(fprintf_function p, void *f,

-                                 AddressSpace *as)

+struct FlatViewInfo {

+    fprintf_function mon_printf;

+    void *f;

+    int counter;

+    bool dispatch_tree;

+};

+

+static void mtree_print_flatview(gpointer key, gpointer value,

+                                 gpointer user_data)

 {

-    FlatView *view = address_space_get_flatview(as);

+    FlatView *view = key;

+    GArray *fv_address_spaces = value;

+    struct FlatViewInfo *fvi = user_data;

+    fprintf_function p = fvi->mon_printf;

+    void *f = fvi->f;

     FlatRange *range = &view->ranges[0];

     MemoryRegion *mr;

     int n = view->nr;

+    int i;

+    AddressSpace *as;

+

+    p(f, "FlatView #%d\n", fvi->counter);

+    ++fvi->counter;

+

+    for (i = 0; i < fv_address_spaces->len; ++i) {

+        as = g_array_index(fv_address_spaces, AddressSpace*, i);

+        p(f, " AS \"%s\", root: %s", as->name, memory_region_name(as->root));

+        if (as->root->alias) {

+            p(f, ", alias %s", memory_region_name(as->root->alias));

+        }

+        p(f, "\n");

+    }

+

+    p(f, " Root memory region: %s\n",

+      view->root ? memory_region_name(view->root) : "(none)");

     if (n <= 0) {

-        p(f, MTREE_INDENT "No rendered FlatView for "

-          "address space '%s'\n", as->name);

-        flatview_unref(view);

+        p(f, MTREE_INDENT "No rendered FlatView\n\n");

         return;

     }

@@ -2944,21 +2970,65 @@ static void mtree_print_flatview(fprintf_function p, void *f,

         range++;

     }

+#if !defined(CONFIG_USER_ONLY)

+    if (fvi->dispatch_tree && view->root) {

+        mtree_print_dispatch(p, f, view->dispatch, view->root);

+    }

+#endif

+

+    p(f, "\n");

+}

+

+static gboolean mtree_info_flatview_free(gpointer key, gpointer value,

+                                      gpointer user_data)

+{

+    FlatView *view = key;

+    GArray *fv_address_spaces = value;

+

+    g_array_unref(fv_address_spaces);

     flatview_unref(view);

+

+    return true;

 }

-void mtree_info(fprintf_function mon_printf, void *f, bool flatview)

+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,

+                bool dispatch_tree)

 {

     MemoryRegionListHead ml_head;

     MemoryRegionList *ml, *ml2;

     AddressSpace *as;

     if (flatview) {

+        FlatView *view;

+        struct FlatViewInfo fvi = {

+            .mon_printf = mon_printf,

+            .f = f,

+            .counter = 0,

+            .dispatch_tree = dispatch_tree

+        };

+        GArray *fv_address_spaces;

+        GHashTable *views = g_hash_table_new(g_direct_hash, g_direct_equal);

+

+        /* Gather all FVs in one table */

         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");

+            view = address_space_get_flatview(as);

+

+            fv_address_spaces = g_hash_table_lookup(views, view);

+            if (!fv_address_spaces) {

+                fv_address_spaces = g_array_new(false, false, sizeof(as));

+                g_hash_table_insert(views, view, fv_address_spaces);

+            }

+

+            g_array_append_val(fv_address_spaces, as);

         }

+

+        /* Print */

+        g_hash_table_foreach(views, mtree_print_flatview, &fvi);

+

+        /* Free */

+        g_hash_table_foreach_remove(views, mtree_info_flatview_free, 0);

+        g_hash_table_unref(views);

+

         return;

     }

diff --git a/monitor.c b/monitor.c

index c0a8dbc..6380e4a 100644

--- a/monitor.c

+++ b/monitor.c

@@ -1734,8 +1734,9 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict)

 static void hmp_info_mtree(Monitor *mon, const QDict *qdict)

 {

     bool flatview = qdict_get_try_bool(qdict, "flatview", false);

+    bool dispatch_tree = qdict_get_try_bool(qdict, "dispatch_tree", false);

-    mtree_info((fprintf_function)monitor_printf, mon, flatview);

+    mtree_info((fprintf_function)monitor_printf, mon, flatview, dispatch_tree);

 }

 static void hmp_info_numa(Monitor *mon, const QDict *qdict)

-- 

1.8.3.1