From patchwork Fri Dec 14 02:58:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 1013237 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ozlabs.ru Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43GFdr5RhVz9s3Z for ; Fri, 14 Dec 2018 13:59:59 +1100 (AEDT) Received: from localhost ([::1]:59014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXdhj-0008Qe-4c for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 21:59:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXdhK-0008QN-S9 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 21:59:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXdhH-0004Ks-JL for qemu-devel@nongnu.org; Thu, 13 Dec 2018 21:59:30 -0500 Received: from [107.173.13.209] (port=56726 helo=ozlabs.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXdhH-0004He-Al for qemu-devel@nongnu.org; Thu, 13 Dec 2018 21:59:27 -0500 Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 892ABAE801D8; Thu, 13 Dec 2018 21:58:54 -0500 (EST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 13:58:49 +1100 Message-Id: <20181214025849.84274-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 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] hmp: Print if memory section is registered with an accelerator 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 , Daniel Henrique Barboza , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This adds an accelerator name to the "into mtree -f" to tell the user if a particular memory section is registered with the accelerator; the primary user for this is KVM and such information is useful for debugging purposes. This adds a has_memory() callback to the accelerator class allowing any accelerator to have a label in that memory tree dump. Since memory sections are passed to memory listeners and get registered in accelerators (rather than memory regions), this only prints new labels for flatviews attached to the system address space. An example: Root memory region: system 0000000000000000-0000002fffffffff (prio 0, ram): /objects/mem0 kvm 0000003000000000-0000005fffffffff (prio 0, ram): /objects/mem1 kvm 0000200000000020-000020000000003f (prio 1, i/o): virtio-pci 0000200080000000-000020008000003f (prio 0, i/o): capabilities Signed-off-by: Alexey Kardashevskiy --- This supercedes "[PATCH qemu] hmp: Print if memory section is registered in KVM" --- Changes: v2: * added an accelerator callback instead of hardcoding it to kvm only --- include/sysemu/accel.h | 2 ++ accel/kvm/kvm-all.c | 10 ++++++++++ memory.c | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 637358f..30b456d 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -25,6 +25,7 @@ #include "qom/object.h" #include "hw/qdev-properties.h" +#include "exec/hwaddr.h" typedef struct AccelState { /*< private >*/ @@ -41,6 +42,7 @@ typedef struct AccelClass { int (*available)(void); int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel); + bool (*has_memory)(MachineState *ms, hwaddr start_addr, hwaddr size); bool *allowed; /* * Array of global properties that would be applied when specific diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 4880a05..634f386 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2589,11 +2589,21 @@ int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target) return r; } +static bool kvm_accel_has_memory(MachineState *ms, hwaddr start_addr, + hwaddr size) +{ + KVMState *kvm = KVM_STATE(ms->accelerator); + KVMMemoryListener *kml = &kvm->memory_listener; + + return NULL != kvm_lookup_matching_slot(kml, start_addr, size); +} + static void kvm_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac = ACCEL_CLASS(oc); ac->name = "KVM"; ac->init_machine = kvm_init; + ac->has_memory = kvm_accel_has_memory; ac->allowed = &kvm_allowed; } diff --git a/memory.c b/memory.c index d14c6de..61e758a 100644 --- a/memory.c +++ b/memory.c @@ -29,7 +29,9 @@ #include "exec/ram_addr.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h" +#include "sysemu/accel.h" #include "hw/qdev-properties.h" +#include "hw/boards.h" #include "migration/vmstate.h" //#define DEBUG_UNASSIGNED @@ -2924,6 +2926,8 @@ struct FlatViewInfo { int counter; bool dispatch_tree; bool owner; + AccelClass *ac; + const char *ac_name; }; static void mtree_print_flatview(gpointer key, gpointer value, @@ -2939,6 +2943,7 @@ static void mtree_print_flatview(gpointer key, gpointer value, int n = view->nr; int i; AddressSpace *as; + bool system_as = false; p(f, "FlatView #%d\n", fvi->counter); ++fvi->counter; @@ -2950,6 +2955,9 @@ static void mtree_print_flatview(gpointer key, gpointer value, p(f, ", alias %s", memory_region_name(as->root->alias)); } p(f, "\n"); + if (as == &address_space_memory) { + system_as = true; + } } p(f, " Root memory region: %s\n", @@ -2985,6 +2993,13 @@ static void mtree_print_flatview(gpointer key, gpointer value, if (fvi->owner) { mtree_print_mr_owner(p, f, mr); } + + if (system_as && fvi->ac && + fvi->ac->has_memory(current_machine, + int128_get64(range->addr.start), + MR_SIZE(range->addr.size) + 1)) { + p(f, " %s", fvi->ac_name); + } p(f, "\n"); range++; } @@ -3028,6 +3043,13 @@ void mtree_info(fprintf_function mon_printf, void *f, bool flatview, }; GArray *fv_address_spaces; GHashTable *views = g_hash_table_new(g_direct_hash, g_direct_equal); + AccelClass *ac = ACCEL_GET_CLASS(current_machine->accelerator); + + if (ac->has_memory) { + fvi.ac = ac; + fvi.ac_name = current_machine->accel ? current_machine->accel : + object_class_get_name(OBJECT_CLASS(ac)); + } /* Gather all FVs in one table */ QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {