From nobody Sat Nov 1 22:16:46 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527664786344256.2492045310189; Wed, 30 May 2018 00:19:46 -0700 (PDT) Received: from localhost ([::1]:36654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvOb-00071I-Da for importer@patchew.org; Wed, 30 May 2018 03:19:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvN0-00068U-PV for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNvMx-0005Qh-MI for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:06 -0400 Received: from [107.173.13.209] (port=51644 helo=ozlabs.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvMx-0005Qb-FR for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:03 -0400 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 03706AE801DC; Wed, 30 May 2018 03:16:57 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 17:17:56 +1000 Message-Id: <20180530071757.9112-2-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180530071757.9112-1-aik@ozlabs.ru> References: <20180530071757.9112-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 v3 1/2] object: Handle objects with no parents 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: Alexey Kardashevskiy , Paolo Bonzini , "Dr. David Alan Gilbert" , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" At the moment object_get_canonical_path() crashes if the object or one of its parents does not have a parent, for example, a KVM accelerator object. This adds a check for obj!=3DNULL in a loop to prevent the crash. In order not to return a wrong path, this checks for currently resolved partial path and does not add a leading slash to tell the reader that the path is partial as the owner object is detached. Signed-off-by: Alexey Kardashevskiy --- I have not tested the case with obj=3D=3DNULL and path!=3DNULL as this is for objects which have parents which are not attached to the root and we do not have such objects in current QEMU afaict but I kept it just in case. --- Changes: v3: * do not check for obj->parent * return NULL or incomplete path depending on the situation --- qom/object.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qom/object.c b/qom/object.c index 0fc9720..05138ba 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1669,7 +1669,7 @@ gchar *object_get_canonical_path(Object *obj) Object *root =3D object_get_root(); char *newpath, *path =3D NULL; =20 - while (obj !=3D root) { + while (obj && obj !=3D root) { char *component =3D object_get_canonical_path_component(obj); =20 if (path) { @@ -1684,7 +1684,13 @@ gchar *object_get_canonical_path(Object *obj) obj =3D obj->parent; } =20 - newpath =3D g_strdup_printf("/%s", path ? path : ""); + if (obj && path) { + newpath =3D g_strdup_printf("/%s", path); + } else if (path) { + newpath =3D g_strdup(path); + } else { + newpath =3D NULL; + } g_free(path); =20 return newpath; --=20 2.11.0 From nobody Sat Nov 1 22:16:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527664792701651.3428178265373; Wed, 30 May 2018 00:19:52 -0700 (PDT) Received: from localhost ([::1]:36653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvOb-00070e-EQ for importer@patchew.org; Wed, 30 May 2018 03:19:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvN0-00068T-PV for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNvMz-0005R8-BG for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:06 -0400 Received: from [107.173.13.209] (port=51659 helo=ozlabs.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNvMz-0005Qw-1m for qemu-devel@nongnu.org; Wed, 30 May 2018 03:18:05 -0400 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id ACA61AE801DE; Wed, 30 May 2018 03:16:59 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 17:17:57 +1000 Message-Id: <20180530071757.9112-3-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180530071757.9112-1-aik@ozlabs.ru> References: <20180530071757.9112-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 v3 2/2] memory/hmp: Print owners/parents in "info mtree" 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: Alexey Kardashevskiy , Paolo Bonzini , "Dr. David Alan Gilbert" , Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This adds owners/parents (which are the same, just occasionally owner=3D=3DNULL) printing for memory regions; a new '-o' flag enabled new output. Signed-off-by: Alexey Kardashevskiy --- Changes: v3: * removed QOM's "id" property as there are no objects left which would have this property and own an MR v2: * cleanups --- include/exec/memory.h | 2 +- memory.c | 68 +++++++++++++++++++++++++++++++++++++++++++----= ---- monitor.c | 4 ++- hmp-commands-info.hx | 7 +++--- 4 files changed, 66 insertions(+), 15 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 525619a..b98e918 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1541,7 +1541,7 @@ void memory_global_dirty_log_start(void); void memory_global_dirty_log_stop(void); =20 void mtree_info(fprintf_function mon_printf, void *f, bool flatview, - bool dispatch_tree); + bool dispatch_tree, bool owner); =20 /** * memory_region_request_mmio_ptr: request a pointer to an mmio diff --git a/memory.c b/memory.c index fc7f9b7..d742bb2 100644 --- a/memory.c +++ b/memory.c @@ -2830,10 +2830,45 @@ typedef QTAILQ_HEAD(mrqueue, MemoryRegionList) Memo= ryRegionListHead; int128_sub((size), int128_one())) : 0) #define MTREE_INDENT " " =20 +static void mtree_expand_owner(fprintf_function mon_printf, void *f, + const char *label, Object *obj) +{ + DeviceState *dev =3D (DeviceState *) object_dynamic_cast(obj, TYPE_DEV= ICE); + + mon_printf(f, " %s:{%s", label, dev ? "dev" : "obj"); + if (dev && dev->id) { + mon_printf(f, " id=3D%s", dev->id); + } else { + gchar *canonical_path =3D object_get_canonical_path(obj); + mon_printf(f, " path=3D%s", canonical_path); + g_free(canonical_path); + } + mon_printf(f, "}"); +} + +static void mtree_print_mr_owner(fprintf_function mon_printf, void *f, + const MemoryRegion *mr) +{ + Object *owner =3D mr->owner; + Object *parent =3D memory_region_owner((MemoryRegion *)mr); + + if (!owner && !parent) { + mon_printf(f, " orphan"); + return; + } + if (owner) { + mtree_expand_owner(mon_printf, f, "owner", owner); + } + if (parent && parent !=3D owner) { + mtree_expand_owner(mon_printf, f, "parent", parent); + } +} + static void mtree_print_mr(fprintf_function mon_printf, void *f, const MemoryRegion *mr, unsigned int level, hwaddr base, - MemoryRegionListHead *alias_print_queue) + MemoryRegionListHead *alias_print_queue, + bool owner) { MemoryRegionList *new_ml, *ml, *next_ml; MemoryRegionListHead submr_print_queue; @@ -2879,7 +2914,7 @@ static void mtree_print_mr(fprintf_function mon_print= f, void *f, } mon_printf(f, TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): alias %s @%s " TARGET_FMT_plx - "-" TARGET_FMT_plx "%s\n", + "-" TARGET_FMT_plx "%s", cur_start, cur_end, mr->priority, memory_region_type((MemoryRegion *)mr), @@ -2888,15 +2923,22 @@ static void mtree_print_mr(fprintf_function mon_pri= ntf, void *f, mr->alias_offset, mr->alias_offset + MR_SIZE(mr->size), mr->enabled ? "" : " [disabled]"); + if (owner) { + mtree_print_mr_owner(mon_printf, f, mr); + } } else { mon_printf(f, - TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): %s%s= \n", + TARGET_FMT_plx "-" TARGET_FMT_plx " (prio %d, %s): %s%s= ", cur_start, cur_end, mr->priority, memory_region_type((MemoryRegion *)mr), memory_region_name(mr), mr->enabled ? "" : " [disabled]"); + if (owner) { + mtree_print_mr_owner(mon_printf, f, mr); + } } + mon_printf(f, "\n"); =20 QTAILQ_INIT(&submr_print_queue); =20 @@ -2919,7 +2961,7 @@ static void mtree_print_mr(fprintf_function mon_print= f, void *f, =20 QTAILQ_FOREACH(ml, &submr_print_queue, mrqueue) { mtree_print_mr(mon_printf, f, ml->mr, level + 1, cur_start, - alias_print_queue); + alias_print_queue, owner); } =20 QTAILQ_FOREACH_SAFE(ml, &submr_print_queue, mrqueue, next_ml) { @@ -2932,6 +2974,7 @@ struct FlatViewInfo { void *f; int counter; bool dispatch_tree; + bool owner; }; =20 static void mtree_print_flatview(gpointer key, gpointer value, @@ -2972,7 +3015,7 @@ static void mtree_print_flatview(gpointer key, gpoint= er value, mr =3D range->mr; if (range->offset_in_region) { p(f, MTREE_INDENT TARGET_FMT_plx "-" - TARGET_FMT_plx " (prio %d, %s): %s @" TARGET_FMT_plx "\n", + TARGET_FMT_plx " (prio %d, %s): %s @" TARGET_FMT_plx, int128_get64(range->addr.start), int128_get64(range->addr.start) + MR_SIZE(range->addr.size), mr->priority, @@ -2981,13 +3024,17 @@ static void mtree_print_flatview(gpointer key, gpoi= nter value, range->offset_in_region); } else { p(f, MTREE_INDENT TARGET_FMT_plx "-" - TARGET_FMT_plx " (prio %d, %s): %s\n", + TARGET_FMT_plx " (prio %d, %s): %s", int128_get64(range->addr.start), int128_get64(range->addr.start) + MR_SIZE(range->addr.size), mr->priority, range->readonly ? "rom" : memory_region_type(mr), memory_region_name(mr)); } + if (fvi->owner) { + mtree_print_mr_owner(p, f, mr); + } + p(f, "\n"); range++; } =20 @@ -3013,7 +3060,7 @@ static gboolean mtree_info_flatview_free(gpointer key= , gpointer value, } =20 void mtree_info(fprintf_function mon_printf, void *f, bool flatview, - bool dispatch_tree) + bool dispatch_tree, bool owner) { MemoryRegionListHead ml_head; MemoryRegionList *ml, *ml2; @@ -3025,7 +3072,8 @@ void mtree_info(fprintf_function mon_printf, void *f,= bool flatview, .mon_printf =3D mon_printf, .f =3D f, .counter =3D 0, - .dispatch_tree =3D dispatch_tree + .dispatch_tree =3D dispatch_tree, + .owner =3D owner, }; GArray *fv_address_spaces; GHashTable *views =3D g_hash_table_new(g_direct_hash, g_direct_equ= al); @@ -3057,14 +3105,14 @@ void mtree_info(fprintf_function mon_printf, void *= f, bool flatview, =20 QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) { mon_printf(f, "address-space: %s\n", as->name); - mtree_print_mr(mon_printf, f, as->root, 1, 0, &ml_head); + mtree_print_mr(mon_printf, f, as->root, 1, 0, &ml_head, owner); mon_printf(f, "\n"); } =20 /* print aliased regions */ QTAILQ_FOREACH(ml, &ml_head, mrqueue) { mon_printf(f, "memory-region: %s\n", memory_region_name(ml->mr)); - mtree_print_mr(mon_printf, f, ml->mr, 1, 0, &ml_head); + mtree_print_mr(mon_printf, f, ml->mr, 1, 0, &ml_head, owner); mon_printf(f, "\n"); } =20 diff --git a/monitor.c b/monitor.c index 46814af..443460e 100644 --- a/monitor.c +++ b/monitor.c @@ -1966,8 +1966,10 @@ static void hmp_info_mtree(Monitor *mon, const QDict= *qdict) { bool flatview =3D qdict_get_try_bool(qdict, "flatview", false); bool dispatch_tree =3D qdict_get_try_bool(qdict, "dispatch_tree", fals= e); + bool owner =3D qdict_get_try_bool(qdict, "owner", false); =20 - mtree_info((fprintf_function)monitor_printf, mon, flatview, dispatch_t= ree); + mtree_info((fprintf_function)monitor_printf, mon, flatview, dispatch_t= ree, + owner); } =20 static void hmp_info_numa(Monitor *mon, const QDict *qdict) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index ddfcd5a..5956495 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -250,10 +250,11 @@ ETEXI =20 { .name =3D "mtree", - .args_type =3D "flatview:-f,dispatch_tree:-d", - .params =3D "[-f][-d]", + .args_type =3D "flatview:-f,dispatch_tree:-d,owner:-o", + .params =3D "[-f][-d][-o]", .help =3D "show memory tree (-f: dump flat view for address = spaces;" - "-d: dump dispatch tree, valid with -f only)", + "-d: dump dispatch tree, valid with -f only);" + "-o: dump region owners/parents", .cmd =3D hmp_info_mtree, }, =20 --=20 2.11.0