Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/814152/?format=api
{ "id": 814152, "url": "http://patchwork.ozlabs.org/api/patches/814152/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915084030.40988-14-aik@ozlabs.ru/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170915084030.40988-14-aik@ozlabs.ru>", "list_archive_url": null, "date": "2017-09-15T08:40:30", "name": "[qemu,v2,13/13] memory: Add flat views to HMP \"info mtree\"", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "a4769dcd0f1eff27d1bd2bce02bc541a0d9dd775", "submitter": { "id": 7621, "url": "http://patchwork.ozlabs.org/api/people/7621/?format=api", "name": "Alexey Kardashevskiy", "email": "aik@ozlabs.ru" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915084030.40988-14-aik@ozlabs.ru/mbox/", "series": [ { "id": 3250, "url": "http://patchwork.ozlabs.org/api/series/3250/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3250", "date": "2017-09-15T08:40:21", "name": "memory: Reduce memory use", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/3250/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/814152/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/814152/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xtppn53VGz9sPr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Sep 2017 18:44:01 +1000 (AEST)", "from localhost ([::1]:51963 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dsmEB-0001y7-Nk\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 04:43:59 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:38279)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aik@ozlabs.ru>) id 1dsmBA-00072E-BE\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:54 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <aik@ozlabs.ru>) id 1dsmB8-0002ZY-IJ\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:52 -0400", "from ozlabs.ru ([107.173.13.209]:44668)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aik@ozlabs.ru>) id 1dsmB8-0002Ql-8x\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:50 -0400", "from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id B24B23A60067;\n\tFri, 15 Sep 2017 04:42:03 -0400 (EDT)" ], "From": "Alexey Kardashevskiy <aik@ozlabs.ru>", "To": "qemu-devel@nongnu.org", "Date": "Fri, 15 Sep 2017 18:40:30 +1000", "Message-Id": "<20170915084030.40988-14-aik@ozlabs.ru>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": "<20170915084030.40988-1-aik@ozlabs.ru>", "References": "<20170915084030.40988-1-aik@ozlabs.ru>", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [fuzzy]", "X-Received-From": "107.173.13.209", "Subject": "[Qemu-devel] [PATCH qemu v2 13/13] memory: Add flat views to HMP\n\t\"info mtree\"", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Alexey Kardashevskiy <aik@ozlabs.ru>, Paolo Bonzini <pbonzini@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "This adds a new switch to \"info mtree\" to print dispatch tree internals.\n\nSigned-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>\n---\n\nExample:\n\naik@fstn1-p1:~$ echo \"info mtree -f -d\" | nc localhost 30000\nQEMU 2.9.94 monitor - type 'help' for more information\n(qemu) info mtree -f -d\nFlatView #0\n AS \"memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n AS \"cpu-memory\"\n Root memory region: system\n 0000000000000000-000000007fffffff (prio 0, ram): ppc_spapr.ram\n Dispatch\n Physical sections\n #0 @0000000000000000..ffffffffffffffff (noname) [unassigned]\n #1 @0000000000000000..ffffffffffffffff (noname) [not dirty]\n #2 @0000000000000000..ffffffffffffffff (noname) [ROM]\n #3 @0000000000000000..ffffffffffffffff (noname) [watch]\n #4 @0000000000000000..000000007fffffff ppc_spapr.ram [MRU]\n Nodes (9 bits per level, 6 levels) ptr=[3] skip=4\n [0]\n\t 0 skip=3 ptr=[3]\n\t 1..511 skip=1 ptr=NIL\n [1]\n\t 0 skip=2 ptr=[3]\n\t 1..511 skip=1 ptr=NIL\n [2]\n\t 0 skip=1 ptr=[3]\n\t 1..511 skip=1 ptr=NIL\n [3]\n\t 0..1 skip=0 ptr=#4\n\t 2..511 skip=1 ptr=NIL\n\nFlatView #1\n AS \"I/O\"\n Root memory region: io\n 0000000000000000-000000000000ffff (prio 0, i/o): io\n Dispatch\n Physical sections\n #0 @0000000000000000..ffffffffffffffff (noname) [unassigned]\n #1 @0000000000000000..ffffffffffffffff (noname) [not dirty]\n #2 @0000000000000000..ffffffffffffffff (noname) [ROM]\n #3 @0000000000000000..ffffffffffffffff (noname) [watch]\n #4 @0000000000000000..000000000000ffff io [ROOT]\n Nodes (9 bits per level, 6 levels) ptr=[5] skip=6\n [0]\n\t 0 skip=5 ptr=[5]\n\t 1..511 skip=1 ptr=NIL\n [1]\n\t 0 skip=4 ptr=[5]\n\t 1..511 skip=1 ptr=NIL\n [2]\n\t 0 skip=3 ptr=[5]\n\t 1..511 skip=1 ptr=NIL\n [3]\n\t 0 skip=2 ptr=[5]\n\t 1..511 skip=1 ptr=NIL\n [4]\n\t 0 skip=1 ptr=[5]\n\t 1..511 skip=1 ptr=NIL\n [5]\n\t 0..15 skip=0 ptr=#4\n\t 16..511 skip=0 ptr=#0\n\nFlatView #2\n AS \"pci@800000020000000\"\n Root memory region: pci@800000020000000.iommu-root\n 0000000000000000-000000003fffffff (prio 0, i/o): tce-iommu-80000000\n 0000040000000000-000004000000ffff (prio 0, i/o): msi\n Dispatch\n Physical sections\n #0 @0000000000000000..ffffffffffffffff (noname) [unassigned]\n #1 @0000000000000000..ffffffffffffffff (noname) [not dirty]\n #2 @0000000000000000..ffffffffffffffff (noname) [ROM]\n #3 @0000000000000000..ffffffffffffffff (noname) [watch]\n #4 @0000000000000000..000000003fffffff tce-iommu-80000000 [iommu]\n #5 @0000040000000000..000004000000ffff msi\n Nodes (9 bits per level, 6 levels) ptr=[2] skip=3\n [0]\n\t 0 skip=2 ptr=[2]\n\t 1..511 skip=1 ptr=NIL\n [1]\n\t 0 skip=1 ptr=[2]\n\t 1..511 skip=1 ptr=NIL\n [2]\n\t 0 skip=0 ptr=#4\n\t 1..7 skip=1 ptr=NIL\n\t 8 skip=3 ptr=[6]\n\t 9..511 skip=1 ptr=NIL\n [3]\n\t 0 skip=0 ptr=#4\n\t 1..511 skip=1 ptr=NIL\n [4]\n\t 0 skip=2 ptr=[6]\n\t 1..511 skip=1 ptr=NIL\n [5]\n\t 0 skip=1 ptr=[6]\n\t 1..511 skip=1 ptr=NIL\n [6]\n\t 0..15 skip=0 ptr=#5\n\t 16..511 skip=0 ptr=#0\n\nFlatView #3\n AS \"\"\n Root memory region: bus master container\n---\n include/exec/memory-internal.h | 4 ++\n include/exec/memory.h | 3 +-\n exec.c | 84 ++++++++++++++++++++++++++++++++++++++++++\n memory.c | 41 ++++++++++++++++-----\n monitor.c | 3 +-\n hmp-commands-info.hx | 7 ++--\n 6 files changed, 128 insertions(+), 14 deletions(-)", "diff": "diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h\nindex e87a30fcae..07295dba7e 100644\n--- a/include/exec/memory-internal.h\n+++ b/include/exec/memory-internal.h\n@@ -36,5 +36,9 @@ AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);\n AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);\n void address_space_dispatch_free(AddressSpaceDispatch *d);\n \n+void mtree_print_dispatch(fprintf_function mon, void *f,\n+ struct AddressSpaceDispatch *d,\n+ MemoryRegion *root);\n+\n #endif\n #endif\ndiff --git a/include/exec/memory.h b/include/exec/memory.h\nindex a550dc21e5..3dd876f01a 100644\n--- a/include/exec/memory.h\n+++ b/include/exec/memory.h\n@@ -1514,7 +1514,8 @@ void memory_global_dirty_log_start(void);\n */\n void memory_global_dirty_log_stop(void);\n \n-void mtree_info(fprintf_function mon_printf, void *f, bool flatview);\n+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,\n+ bool dispatch_tree);\n \n /**\n * memory_region_request_mmio_ptr: request a pointer to an mmio\ndiff --git a/exec.c b/exec.c\nindex 11e0e3c927..a79daf1853 100644\n--- a/exec.c\n+++ b/exec.c\n@@ -3622,3 +3622,87 @@ void page_size_init(void)\n }\n qemu_host_page_mask = -(intptr_t)qemu_host_page_size;\n }\n+\n+#if !defined(CONFIG_USER_ONLY)\n+\n+static void mtree_print_phys_entries(fprintf_function mon, void *f,\n+ int start, int end, int skip, int ptr)\n+{\n+ if (start == end - 1) {\n+ mon(f, \"\\t%3d \", start);\n+ } else {\n+ mon(f, \"\\t%3d..%-3d \", start, end - 1);\n+ }\n+ mon(f, \" skip=%d \", skip);\n+ if (ptr == PHYS_MAP_NODE_NIL) {\n+ mon(f, \" ptr=NIL\");\n+ } else if (!skip) {\n+ mon(f, \" ptr=#%d\", ptr);\n+ } else {\n+ mon(f, \" ptr=[%d]\", ptr);\n+ }\n+ mon(f, \"\\n\");\n+}\n+\n+#define MR_SIZE(size) (int128_nz(size) ? (hwaddr)int128_get64( \\\n+ int128_sub((size), int128_one())) : 0)\n+\n+void mtree_print_dispatch(fprintf_function mon, void *f,\n+ AddressSpaceDispatch *d, MemoryRegion *root)\n+{\n+ int i;\n+\n+ mon(f, \" Dispatch\\n\");\n+ mon(f, \" Physical sections\\n\");\n+\n+ for (i = 0; i < d->map.sections_nb; ++i) {\n+ MemoryRegionSection *s = d->map.sections + i;\n+ const char *names[] = { \" [unassigned]\", \" [not dirty]\",\n+ \" [ROM]\", \" [watch]\" };\n+\n+ mon(f, \" #%d @\" TARGET_FMT_plx \"..\" TARGET_FMT_plx \" %s%s%s%s%s\",\n+ i,\n+ s->offset_within_address_space,\n+ s->offset_within_address_space + MR_SIZE(s->mr->size),\n+ s->mr->name ? s->mr->name : \"(noname)\",\n+ i < ARRAY_SIZE(names) ? names[i] : \"\",\n+ s->mr == root ? \" [ROOT]\" : \"\",\n+ s == d->mru_section ? \" [MRU]\" : \"\",\n+ s->mr->is_iommu ? \" [iommu]\" : \"\");\n+\n+ if (s->mr->alias) {\n+ mon(f, \" alias=%s\", s->mr->alias->name ?\n+ s->mr->alias->name : \"noname\");\n+ }\n+ mon(f, \"\\n\");\n+ }\n+\n+ mon(f, \" Nodes (%d bits per level, %d levels) ptr=[%d] skip=%d\\n\",\n+ P_L2_BITS, P_L2_LEVELS, d->phys_map.ptr, d->phys_map.skip);\n+ for (i = 0; i < d->map.nodes_nb; ++i) {\n+ int j, jprev;\n+ PhysPageEntry prev;\n+ Node *n = d->map.nodes + i;\n+\n+ mon(f, \" [%d]\\n\", i);\n+\n+ for (j = 0, jprev = 0, prev = *n[0]; j < ARRAY_SIZE(*n); ++j) {\n+ PhysPageEntry *pe = *n + j;\n+\n+ if (pe->ptr == prev.ptr && pe->skip == prev.skip) {\n+ continue;\n+ }\n+\n+ mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);\n+\n+ jprev = j;\n+ prev = *pe;\n+ }\n+\n+ if (jprev != ARRAY_SIZE(*n)) {\n+ mtree_print_phys_entries(mon, f, jprev, j, prev.skip, prev.ptr);\n+ }\n+ }\n+}\n+\n+#endif\ndiff --git a/memory.c b/memory.c\nindex 06052e63a0..ad2830a1bb 100644\n--- a/memory.c\n+++ b/memory.c\n@@ -2933,17 +2933,26 @@ static void mtree_print_mr(fprintf_function mon_printf, void *f,\n }\n \n static void mtree_print_flatview(fprintf_function p, void *f,\n- AddressSpace *as)\n+ FlatView *view)\n {\n- FlatView *view = address_space_get_flatview(as);\n FlatRange *range = &view->ranges[0];\n MemoryRegion *mr;\n int n = view->nr;\n+ AddressSpace *as;\n+\n+ QTAILQ_FOREACH(as, &view->address_spaces, flat_view_link) {\n+ p(f, \" AS \\\"%s\\\"\\n\", as->name);\n+ }\n+\n+ p(f, \" Root memory region: %s\", memory_region_name(view->root));\n+ if (view->root->alias) {\n+ p(f, \" alias %s\", memory_region_name(view->root->alias));\n+ }\n+ p(f, \"\\n\");\n \n if (n <= 0) {\n p(f, MTREE_INDENT \"No rendered FlatView for \"\n \"address space '%s'\\n\", as->name);\n- flatview_unref(view);\n return;\n }\n \n@@ -2969,21 +2978,35 @@ static void mtree_print_flatview(fprintf_function p, void *f,\n }\n range++;\n }\n-\n- flatview_unref(view);\n }\n \n-void mtree_info(fprintf_function mon_printf, void *f, bool flatview)\n+void mtree_info(fprintf_function mon_printf, void *f, bool flatview,\n+ bool dispatch_tree)\n {\n MemoryRegionListHead ml_head;\n MemoryRegionList *ml, *ml2;\n AddressSpace *as;\n+ FlatView *view;\n+ int n;\n \n if (flatview) {\n- QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {\n- mon_printf(f, \"address-space (flat view): %s\\n\", as->name);\n- mtree_print_flatview(mon_printf, f, as);\n+ n = 0;\n+ QTAILQ_FOREACH(view, &flat_views, flat_views_link) {\n+ flatview_ref(view);\n+\n+ mon_printf(f, \"FlatView #%d\\n\", n);\n+ ++n;\n+\n+ mtree_print_flatview(mon_printf, f, view);\n+#if !defined(CONFIG_USER_ONLY)\n+ if (dispatch_tree) {\n+ mtree_print_dispatch(mon_printf, f, view->dispatch,\n+ view->root);\n+ }\n+#endif\n mon_printf(f, \"\\n\");\n+\n+ flatview_unref(view);\n }\n return;\n }\ndiff --git a/monitor.c b/monitor.c\nindex 058045b3cb..f4856b9268 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -1703,8 +1703,9 @@ static void hmp_boot_set(Monitor *mon, const QDict *qdict)\n static void hmp_info_mtree(Monitor *mon, const QDict *qdict)\n {\n bool flatview = qdict_get_try_bool(qdict, \"flatview\", false);\n+ bool dispatch_tree = qdict_get_try_bool(qdict, \"dispatch_tree\", false);\n \n- mtree_info((fprintf_function)monitor_printf, mon, flatview);\n+ mtree_info((fprintf_function)monitor_printf, mon, flatview, dispatch_tree);\n }\n \n static void hmp_info_numa(Monitor *mon, const QDict *qdict)\ndiff --git a/hmp-commands-info.hx b/hmp-commands-info.hx\nindex 1c6772597d..4f1ece93e5 100644\n--- a/hmp-commands-info.hx\n+++ b/hmp-commands-info.hx\n@@ -250,9 +250,10 @@ ETEXI\n \n {\n .name = \"mtree\",\n- .args_type = \"flatview:-f\",\n- .params = \"[-f]\",\n- .help = \"show memory tree (-f: dump flat view for address spaces)\",\n+ .args_type = \"flatview:-f,dispatch_tree:-d\",\n+ .params = \"[-f][-d]\",\n+ .help = \"show memory tree (-f: dump flat view for address spaces;\"\n+ \"-d: dump dispatch tree, valid with -f only)\",\n .cmd = hmp_info_mtree,\n },\n \n", "prefixes": [ "qemu", "v2", "13/13" ] }