From nobody Wed May 8 07:02:15 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1560477262; cv=none; d=zoho.com; s=zohoarc; b=AHU6eZ+M+1ENxFGTo7arQOgDXvPbg6TbuLqeuVYVf70u7GpSo6upF94O4cGU8cQ7TnDVLTWmPj8eW96aC2TIIQidVMASceTob9URolkQcRN/Mvsi7nH1o+GWC8mq+FhLbn+C0TjdN6heMooBtVRxE7H7IoBCImHIdLmbIipO3W0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560477262; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=0ygw0CecjE/NKG4xpKuIXw5BZb85u5IgxKApmeDp+IM=; b=knD6AEGXEzoFEvi5y5Hb43GvDEvvdLNz6bE6tHq3O5MHCY6dnm/mzvnvLEbhluQOj6dIsZHJbYVSXJ+GQRsJEgJ7ltmpyg0l3h4Nu5b/E1YGByQexR5CawdBaxd7zyTwAWq4ikNB1bfYkDxPgKmTe0r58JcQPh57vZ++WhDd1l4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560477262286157.47170695172883; Thu, 13 Jun 2019 18:54:22 -0700 (PDT) Received: from localhost ([::1]:46650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbbQ5-0007ip-C9 for importer@patchew.org; Thu, 13 Jun 2019 21:54:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57688) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbbOY-0006s8-G3 for qemu-devel@nongnu.org; Thu, 13 Jun 2019 21:52:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbbOW-0004xs-SA for qemu-devel@nongnu.org; Thu, 13 Jun 2019 21:52:46 -0400 Received: from ozlabs.ru ([107.173.13.209]:44047) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hbbOW-0004wS-KM for qemu-devel@nongnu.org; Thu, 13 Jun 2019 21:52:44 -0400 Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id AD6A8AE807F0; Thu, 13 Jun 2019 21:52:40 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Fri, 14 Jun 2019 11:52:37 +1000 Message-Id: <20190614015237.82463-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 107.173.13.209 Subject: [Qemu-devel] [PATCH qemu v3] hmp: Print if memory section is registered with an accelerator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- Changes: v3: * added support for multiple ASes per accelerator (KVM can do 2 at least) as Paolo suggested v2: * added an accelerator callback instead of hardcoding it to kvm only --- include/sysemu/accel.h | 3 +++ accel/kvm/kvm-all.c | 38 ++++++++++++++++++++++++++++++++++++++ memory.c | 22 ++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 81293cdb08f9..89ce57e404ca 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -25,6 +25,7 @@ =20 #include "qom/object.h" #include "hw/qdev-properties.h" +#include "exec/hwaddr.h" =20 typedef struct AccelState { /*< private >*/ @@ -39,6 +40,8 @@ typedef struct AccelClass { const char *name; int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel); + bool (*has_memory)(MachineState *ms, AddressSpace *as, + 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 b0c4bed6e367..948b7e53df47 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -109,6 +109,13 @@ struct KVMState /* memory encryption */ void *memcrypt_handle; int (*memcrypt_encrypt_data)(void *handle, uint8_t *ptr, uint64_t len); + + /* For "info mtree -f" to tell if an MR is registered in KVM */ + int nr_as; + struct KVMAs { + KVMMemoryListener *ml; + AddressSpace *as; + } *as; }; =20 KVMState *kvm_state; @@ -940,6 +947,14 @@ void kvm_memory_listener_register(KVMState *s, KVMMemo= ryListener *kml, kml->listener.priority =3D 10; =20 memory_listener_register(&kml->listener, as); + + for (i =3D 0; i < s->nr_as; ++i) { + if (!s->as[i].as) { + s->as[i].as =3D as; + s->as[i].ml =3D kml; + break; + } + } } =20 static MemoryListener kvm_io_listener =3D { @@ -1590,6 +1605,12 @@ static int kvm_init(MachineState *ms) s->nr_slots =3D 32; } =20 + s->nr_as =3D kvm_check_extension(s, KVM_CAP_MULTI_ADDRESS_SPACE); + if (s->nr_as <=3D 1) { + s->nr_as =3D 1; + } + s->as =3D g_new0(struct KVMAs, s->nr_as); + kvm_type =3D qemu_opt_get(qemu_get_machine_opts(), "kvm-type"); if (mc->kvm_type) { type =3D mc->kvm_type(ms, kvm_type); @@ -2591,11 +2612,28 @@ int kvm_get_one_reg(CPUState *cs, uint64_t id, void= *target) return r; } =20 +static bool kvm_accel_has_memory(MachineState *ms, AddressSpace *as, + hwaddr start_addr, hwaddr size) +{ + KVMState *kvm =3D KVM_STATE(ms->accelerator); + int i; + + for (i =3D 0; i < kvm->nr_as; ++i) { + if (kvm->as[i].as =3D=3D as && kvm->as[i].ml) { + return NULL !=3D kvm_lookup_matching_slot(kvm->as[i].ml, + start_addr, size); + } + } + + return false; +} + static void kvm_accel_class_init(ObjectClass *oc, void *data) { AccelClass *ac =3D ACCEL_CLASS(oc); ac->name =3D "KVM"; ac->init_machine =3D kvm_init; + ac->has_memory =3D kvm_accel_has_memory; ac->allowed =3D &kvm_allowed; } =20 diff --git a/memory.c b/memory.c index 0a089a73ae1a..61524156a1ce 100644 --- a/memory.c +++ b/memory.c @@ -30,7 +30,9 @@ #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" +#include "sysemu/accel.h" #include "hw/qdev-properties.h" +#include "hw/boards.h" #include "migration/vmstate.h" =20 //#define DEBUG_UNASSIGNED @@ -2939,6 +2941,8 @@ struct FlatViewInfo { int counter; bool dispatch_tree; bool owner; + AccelClass *ac; + const char *ac_name; }; =20 static void mtree_print_flatview(gpointer key, gpointer value, @@ -3001,6 +3005,17 @@ static void mtree_print_flatview(gpointer key, gpoin= ter value, if (fvi->owner) { mtree_print_mr_owner(mr); } + + if (fvi->ac) { + for (i =3D 0; i < fv_address_spaces->len; ++i) { + as =3D g_array_index(fv_address_spaces, AddressSpace*, i); + if (fvi->ac->has_memory(current_machine, as, + int128_get64(range->addr.start), + MR_SIZE(range->addr.size) + 1)) { + qemu_printf(" %s", fvi->ac_name); + } + } + } qemu_printf("\n"); range++; } @@ -3041,6 +3056,13 @@ void mtree_info(bool flatview, bool dispatch_tree, b= ool owner) }; GArray *fv_address_spaces; GHashTable *views =3D g_hash_table_new(g_direct_hash, g_direct_equ= al); + AccelClass *ac =3D ACCEL_GET_CLASS(current_machine->accelerator); + + if (ac->has_memory) { + fvi.ac =3D ac; + fvi.ac_name =3D current_machine->accel ? current_machine->acce= l : + object_class_get_name(OBJECT_CLASS(ac)); + } =20 /* Gather all FVs in one table */ QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) { --=20 2.17.1