From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71DFDC4332F for ; Thu, 16 Sep 2021 10:56:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0162C60EE4 for ; Thu, 16 Sep 2021 10:56:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0162C60EE4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:46856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQp4F-0001vl-8k for qemu-devel@archiver.kernel.org; Thu, 16 Sep 2021 06:56:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQp2b-0008Sl-0u; Thu, 16 Sep 2021 06:54:53 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40650 helo=mail.default.ilande.bv.iomart.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQp2Y-0001MQ-63; Thu, 16 Sep 2021 06:54:52 -0400 Received: from host109-153-76-56.range109-153.btcentralplus.com ([109.153.76.56] helo=[192.168.50.176]) by mail.default.ilande.bv.iomart.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mQp21-0000KB-N9; Thu, 16 Sep 2021 11:54:21 +0100 To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-49-berrange@redhat.com> From: Mark Cave-Ayland Message-ID: <547a6d41-85f2-7e50-909e-382aa733e367@ilande.co.uk> Date: Thu, 16 Sep 2021 11:54:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210914142042.1655100-49-berrange@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 109.153.76.56 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH v2 48/53] target/sparc: convert to use format_tlb callback X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.bv.iomart.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.bv.iomart.io X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-1.488, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Chris Wulff , David Hildenbrand , Bin Meng , Yuval Shaia , Laurent Vivier , Max Filippov , Taylor Simpson , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Eric Blake , Marek Vasut , Yoshinori Sato , Markus Armbruster , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , "Dr. David Alan Gilbert" , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Michael Rolnik , Peter Xu , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-ppc@nongnu.org, Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 14/09/2021 15:20, Daniel P. Berrangé wrote: > Change the "info tlb" implementation to use the format_tlb callback. > > Signed-off-by: Daniel P. Berrangé > --- > target/sparc/cpu.c | 1 + > target/sparc/cpu.h | 1 + > target/sparc/mmu_helper.c | 43 ++++++++++++++++++++++++--------------- > target/sparc/monitor.c | 10 ++++++--- > 4 files changed, 36 insertions(+), 19 deletions(-) > > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index 9346a79239..f78ddc72b5 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -898,6 +898,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) > cc->has_work = sparc_cpu_has_work; > cc->format_state = sparc_cpu_format_state; > #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) > + cc->format_tlb = sparc_cpu_format_tlb; > cc->memory_rw_debug = sparc_cpu_memory_rw_debug; > #endif > cc->set_pc = sparc_cpu_set_pc; > diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h > index 65a01a7884..233f0b3eb7 100644 > --- a/target/sparc/cpu.h > +++ b/target/sparc/cpu.h > @@ -572,6 +572,7 @@ extern const VMStateDescription vmstate_sparc_cpu; > > void sparc_cpu_do_interrupt(CPUState *cpu); > void sparc_cpu_format_state(CPUState *cpu, GString *buf, int flags); > +void sparc_cpu_format_tlb(CPUState *cpu, GString *buf); > hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); > int sparc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); > int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); > diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c > index a44473a1c7..06b16aca6a 100644 > --- a/target/sparc/mmu_helper.c > +++ b/target/sparc/mmu_helper.c > @@ -371,37 +371,39 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev) > return 0; > } > > -void dump_mmu(CPUSPARCState *env) > +void sparc_cpu_format_tlb(CPUState *cpu, GString *buf) > { > - CPUState *cs = env_cpu(env); > + CPUSPARCState *env = cpu->env_ptr; > target_ulong va, va1, va2; > unsigned int n, m, o; > hwaddr pa; > uint32_t pde; > > - qemu_printf("Root ptr: " TARGET_FMT_plx ", ctx: %d\n", > - (hwaddr)env->mmuregs[1] << 4, env->mmuregs[2]); > + g_string_append_printf(buf, "Root ptr: " TARGET_FMT_plx ", ctx: %d\n", > + (hwaddr)env->mmuregs[1] << 4, env->mmuregs[2]); > for (n = 0, va = 0; n < 256; n++, va += 16 * 1024 * 1024) { > pde = mmu_probe(env, va, 2); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va); > - qemu_printf("VA: " TARGET_FMT_lx ", PA: " TARGET_FMT_plx > - " PDE: " TARGET_FMT_lx "\n", va, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va); > + g_string_append_printf(buf, "VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PDE: " TARGET_FMT_lx "\n", va, pa, pde); > for (m = 0, va1 = va; m < 64; m++, va1 += 256 * 1024) { > pde = mmu_probe(env, va1, 1); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va1); > - qemu_printf(" VA: " TARGET_FMT_lx ", PA: " > - TARGET_FMT_plx " PDE: " TARGET_FMT_lx "\n", > - va1, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va1); > + g_string_append_printf(buf, " VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PDE: " TARGET_FMT_lx "\n", > + va1, pa, pde); > for (o = 0, va2 = va1; o < 64; o++, va2 += 4 * 1024) { > pde = mmu_probe(env, va2, 0); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va2); > - qemu_printf(" VA: " TARGET_FMT_lx ", PA: " > - TARGET_FMT_plx " PTE: " > - TARGET_FMT_lx "\n", > - va2, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va2); > + g_string_append_printf(buf, " VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PTE: " TARGET_FMT_lx "\n", > + va2, pa, pde); > } > } > } > @@ -410,6 +412,15 @@ void dump_mmu(CPUSPARCState *env) > } > } > > +void dump_mmu(CPUSPARCState *env) > +{ > + CPUState *cs = env_cpu(env); > + g_autoptr(GString) buf = g_string_new(""); > + > + sparc_cpu_format_tlb(cs, buf); > + qemu_printf("%s", buf->str); > +} > + > /* Gdb expects all registers windows to be flushed in ram. This function handles > * reads (and only reads) in stack frames as if windows were flushed. We assume > * that the sparc ABI is followed. > diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c > index 318413686a..cc7fe74e3e 100644 > --- a/target/sparc/monitor.c > +++ b/target/sparc/monitor.c > @@ -30,13 +30,17 @@ > > void hmp_info_tlb(Monitor *mon, const QDict *qdict) > { > - CPUArchState *env1 = mon_get_cpu_env(mon); > + g_autoptr(GString) buf = g_string_new(""); > + CPUState *cpu = mon_get_cpu(mon); > > - if (!env1) { > + if (!cpu) { > monitor_printf(mon, "No CPU available\n"); > return; > } > - dump_mmu(env1); > + > + cpu_format_tlb(cpu, buf); > + > + monitor_printf(mon, "%s", buf->str); > } > > #ifndef TARGET_SPARC64 Acked-by: Mark Cave-Ayland ATB, Mark. From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mQp2e-000057-5H for mharc-qemu-riscv@gnu.org; Thu, 16 Sep 2021 06:54:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQp2b-0008Sl-0u; Thu, 16 Sep 2021 06:54:53 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:40650 helo=mail.default.ilande.bv.iomart.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQp2Y-0001MQ-63; Thu, 16 Sep 2021 06:54:52 -0400 Received: from host109-153-76-56.range109-153.btcentralplus.com ([109.153.76.56] helo=[192.168.50.176]) by mail.default.ilande.bv.iomart.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1mQp21-0000KB-N9; Thu, 16 Sep 2021 11:54:21 +0100 To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org Cc: Greg Kurz , Bin Meng , Yoshinori Sato , Stafford Horne , Cornelia Huck , David Hildenbrand , "Edgar E. Iglesias" , Jiaxun Yang , Peter Xu , Christian Borntraeger , qemu-ppc@nongnu.org, Paolo Bonzini , qemu-arm@nongnu.org, Michael Rolnik , Peter Maydell , Palmer Dabbelt , Alistair Francis , Halil Pasic , Taylor Simpson , Gerd Hoffmann , qemu-riscv@nongnu.org, Max Filippov , Yuval Shaia , Bastian Koppelmann , Artyom Tarasenko , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Thomas Huth , Aleksandar Rikalo , David Gibson , Marcel Apfelbaum , Laurent Vivier , "Dr. David Alan Gilbert" , Eduardo Habkost , Marek Vasut , Markus Armbruster , Aurelien Jarno , qemu-s390x@nongnu.org, Laurent Vivier , Eric Blake , Richard Henderson , Chris Wulff References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-49-berrange@redhat.com> From: Mark Cave-Ayland Message-ID: <547a6d41-85f2-7e50-909e-382aa733e367@ilande.co.uk> Date: Thu, 16 Sep 2021 11:54:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20210914142042.1655100-49-berrange@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 109.153.76.56 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH v2 48/53] target/sparc: convert to use format_tlb callback X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.bv.iomart.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.bv.iomart.io X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-1.488, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2021 10:54:54 -0000 On 14/09/2021 15:20, Daniel P. Berrangé wrote: > Change the "info tlb" implementation to use the format_tlb callback. > > Signed-off-by: Daniel P. Berrangé > --- > target/sparc/cpu.c | 1 + > target/sparc/cpu.h | 1 + > target/sparc/mmu_helper.c | 43 ++++++++++++++++++++++++--------------- > target/sparc/monitor.c | 10 ++++++--- > 4 files changed, 36 insertions(+), 19 deletions(-) > > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index 9346a79239..f78ddc72b5 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -898,6 +898,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) > cc->has_work = sparc_cpu_has_work; > cc->format_state = sparc_cpu_format_state; > #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) > + cc->format_tlb = sparc_cpu_format_tlb; > cc->memory_rw_debug = sparc_cpu_memory_rw_debug; > #endif > cc->set_pc = sparc_cpu_set_pc; > diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h > index 65a01a7884..233f0b3eb7 100644 > --- a/target/sparc/cpu.h > +++ b/target/sparc/cpu.h > @@ -572,6 +572,7 @@ extern const VMStateDescription vmstate_sparc_cpu; > > void sparc_cpu_do_interrupt(CPUState *cpu); > void sparc_cpu_format_state(CPUState *cpu, GString *buf, int flags); > +void sparc_cpu_format_tlb(CPUState *cpu, GString *buf); > hwaddr sparc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); > int sparc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); > int sparc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); > diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c > index a44473a1c7..06b16aca6a 100644 > --- a/target/sparc/mmu_helper.c > +++ b/target/sparc/mmu_helper.c > @@ -371,37 +371,39 @@ target_ulong mmu_probe(CPUSPARCState *env, target_ulong address, int mmulev) > return 0; > } > > -void dump_mmu(CPUSPARCState *env) > +void sparc_cpu_format_tlb(CPUState *cpu, GString *buf) > { > - CPUState *cs = env_cpu(env); > + CPUSPARCState *env = cpu->env_ptr; > target_ulong va, va1, va2; > unsigned int n, m, o; > hwaddr pa; > uint32_t pde; > > - qemu_printf("Root ptr: " TARGET_FMT_plx ", ctx: %d\n", > - (hwaddr)env->mmuregs[1] << 4, env->mmuregs[2]); > + g_string_append_printf(buf, "Root ptr: " TARGET_FMT_plx ", ctx: %d\n", > + (hwaddr)env->mmuregs[1] << 4, env->mmuregs[2]); > for (n = 0, va = 0; n < 256; n++, va += 16 * 1024 * 1024) { > pde = mmu_probe(env, va, 2); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va); > - qemu_printf("VA: " TARGET_FMT_lx ", PA: " TARGET_FMT_plx > - " PDE: " TARGET_FMT_lx "\n", va, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va); > + g_string_append_printf(buf, "VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PDE: " TARGET_FMT_lx "\n", va, pa, pde); > for (m = 0, va1 = va; m < 64; m++, va1 += 256 * 1024) { > pde = mmu_probe(env, va1, 1); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va1); > - qemu_printf(" VA: " TARGET_FMT_lx ", PA: " > - TARGET_FMT_plx " PDE: " TARGET_FMT_lx "\n", > - va1, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va1); > + g_string_append_printf(buf, " VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PDE: " TARGET_FMT_lx "\n", > + va1, pa, pde); > for (o = 0, va2 = va1; o < 64; o++, va2 += 4 * 1024) { > pde = mmu_probe(env, va2, 0); > if (pde) { > - pa = cpu_get_phys_page_debug(cs, va2); > - qemu_printf(" VA: " TARGET_FMT_lx ", PA: " > - TARGET_FMT_plx " PTE: " > - TARGET_FMT_lx "\n", > - va2, pa, pde); > + pa = cpu_get_phys_page_debug(cpu, va2); > + g_string_append_printf(buf, " VA: " TARGET_FMT_lx > + ", PA: " TARGET_FMT_plx > + " PTE: " TARGET_FMT_lx "\n", > + va2, pa, pde); > } > } > } > @@ -410,6 +412,15 @@ void dump_mmu(CPUSPARCState *env) > } > } > > +void dump_mmu(CPUSPARCState *env) > +{ > + CPUState *cs = env_cpu(env); > + g_autoptr(GString) buf = g_string_new(""); > + > + sparc_cpu_format_tlb(cs, buf); > + qemu_printf("%s", buf->str); > +} > + > /* Gdb expects all registers windows to be flushed in ram. This function handles > * reads (and only reads) in stack frames as if windows were flushed. We assume > * that the sparc ABI is followed. > diff --git a/target/sparc/monitor.c b/target/sparc/monitor.c > index 318413686a..cc7fe74e3e 100644 > --- a/target/sparc/monitor.c > +++ b/target/sparc/monitor.c > @@ -30,13 +30,17 @@ > > void hmp_info_tlb(Monitor *mon, const QDict *qdict) > { > - CPUArchState *env1 = mon_get_cpu_env(mon); > + g_autoptr(GString) buf = g_string_new(""); > + CPUState *cpu = mon_get_cpu(mon); > > - if (!env1) { > + if (!cpu) { > monitor_printf(mon, "No CPU available\n"); > return; > } > - dump_mmu(env1); > + > + cpu_format_tlb(cpu, buf); > + > + monitor_printf(mon, "%s", buf->str); > } > > #ifndef TARGET_SPARC64 Acked-by: Mark Cave-Ayland ATB, Mark.