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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 E00F5C433FF for ; Mon, 29 Jul 2019 11:02:44 +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 9BBE82070D for ; Mon, 29 Jul 2019 11:02:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EGgrRf3f" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9BBE82070D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs3QR-00053m-P1 for qemu-devel@archiver.kernel.org; Mon, 29 Jul 2019 07:02:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45332) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs3P4-0004KP-5U for qemu-devel@nongnu.org; Mon, 29 Jul 2019 07:01:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs3P0-00009g-6S for qemu-devel@nongnu.org; Mon, 29 Jul 2019 07:01:18 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hs3Ow-0008Ve-4E for qemu-devel@nongnu.org; Mon, 29 Jul 2019 07:01:13 -0400 Received: by mail-wr1-x444.google.com with SMTP id x1so11426695wrr.9 for ; Mon, 29 Jul 2019 04:01:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=K6HXu1XglRumE4sck1fh4NdgOA0AuL8QMZOwxByiS+s=; b=EGgrRf3fpyFkKY4lnoCQmAJsB1k8uzRcwXS4cHTsnDC7sytTdDNPUQcWOdqXM9k8NL nVmJlwOvljNz6+9yEwDqGTOgVyXrEljBrLCIeF2owK2cdh4CdhgkU9oDt04J3RnpPU8A 0VKBlMO+c4cF3Fty15CeptMSC0Os5A6p99zXL9ClICROmU4yYMrLh7VwT8Gh77ljM+g7 qeVRrN8hwG9w8rz2tnG5cdZ4AoqgvuPj/FRykndJgW2eruZ7GfqDMv3hYcHMvM2G6wsB N8jh2Kde6QCY+OPteEK80ixhvunGXNHJWV3fFxtwznkbxbdOXhYKPJ7PburKSsIYIZh2 ysbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=K6HXu1XglRumE4sck1fh4NdgOA0AuL8QMZOwxByiS+s=; b=rHToRN+ekJ61ZxWhOl2ey3F0vzcUvpStvpdD+AcJpNC5aXcpKGwtBGpErXh1kNwGSu G04dytb/XJKLH8KYMo5Z5ocuQDXZv8NQvruLeZpNz67vN1GEUrkqW+noTVv06cjkI/YM b4mT4EeYyBdNWRQAa3onoHGW3E/XIsr5Z4E6Bri5jn8KXFeEvC2JXCWkcuKvQh9qEcHf ToEevBEItCXv4p8+RB+I6uqtJZb84JuPMSehTO489AfIJT3xR/IhuAmlsTAtjMHGg85M sGoF7gj8t2XxJ9KB+B0co2MG3I3BE3UZXMYt92LXAzZ4mkiJGzLHlWvDywqjNsl242cj ju4Q== X-Gm-Message-State: APjAAAX4DkaytEJ9dgaNgEvxsVKCYIGD8RD+iJtq5z0PwZuh6ZqYIbrJ U3CcfgIQu4jUebTma4+Fg+qoIg== X-Google-Smtp-Source: APXvYqwIEd7XW+jB2r0eRBc+lDU0LRdnPfdwJ8EjJVlVGyuzB6BlAecB8uc/Dg1/WBwVQGtGZ81eiQ== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr67698680wrt.278.1564398066932; Mon, 29 Jul 2019 04:01:06 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s12sm56199606wmh.34.2019.07.29.04.01.06 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 04:01:06 -0700 (PDT) Received: from zen (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A50CA1FF87; Mon, 29 Jul 2019 12:01:05 +0100 (BST) References: <20190720010235.32444-1-vandersonmr2@gmail.com> <20190720010235.32444-8-vandersonmr2@gmail.com> User-agent: mu4e 1.3.3; emacs 27.0.50 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: qemu-devel@nongnu.org In-reply-to: <20190720010235.32444-8-vandersonmr2@gmail.com> Date: Mon, 29 Jul 2019 12:01:05 +0100 Message-ID: <87mugxhzpq.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: Re: [Qemu-devel] [PATCH v4 7/7] monitor: adding info tbs, tb, and coverset 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: vandersonmr , Riku Voipio , Markus Armbruster , "Dr. David Alan Gilbert" , Paolo Bonzini , Richard Henderson , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" vandersonmr writes: > Adding info [tbs|tb|coverset] commands to HMP. > These commands allow the exploration of TBs > generated by the TCG. Understand which one > hotter, with more guest/host instructions... > and examine their guest, host and IR code. > > The goal of this command is to allow the dynamic exploration > of TCG behavior and code quality. Therefore, for now, a > corresponding QMP command is not worthwhile. > > Signed-off-by: vandersonmr > --- > accel/tcg/tb-stats.c | 275 +++++++++++++++++++++++++++++++++++ > hmp-commands-info.hx | 23 +++ > include/exec/tb-stats.h | 37 +++++ > include/qemu/log-for-trace.h | 2 + > include/qemu/log.h | 1 + > linux-user/exit.c | 4 + > monitor/misc.c | 71 +++++++++ > util/log.c | 26 +++- > 8 files changed, 431 insertions(+), 8 deletions(-) > > diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c > index 6c330e1b02..85a16cd563 100644 > --- a/accel/tcg/tb-stats.c > +++ b/accel/tcg/tb-stats.c > @@ -212,3 +212,278 @@ void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_= data icmd) > g_free(cmdinfo); > } > > +static void collect_tb_stats(void *p, uint32_t hash, void *userp) > +{ > + last_search =3D g_list_prepend(last_search, p); > +} > + > +static void dump_tb_header(TBStatistics *tbs) > +{ > + unsigned g =3D tbs->translations.total ? > + tbs->code.num_guest_inst / tbs->translations.total : 0; > + unsigned ops =3D tbs->translations.total ? > + tbs->code.num_tcg_ops / tbs->translations.total : 0; > + unsigned ops_opt =3D tbs->translations.total ? > + tbs->code.num_tcg_ops_opt / tbs->translations.total : 0; > + unsigned h =3D tbs->translations.total ? > + tbs->code.num_host_inst / tbs->translations.total : 0; > + unsigned spills =3D tbs->translations.total ? > + tbs->code.spills / tbs->translations.total : 0; > + > + float guest_host_prop =3D g ? ((float) h / g) : 0; > + > + qemu_log("TB%d: phys:0x"TB_PAGE_ADDR_FMT" virt:0x"TARGET_FMT_lx > + " flags:%#08x (trans:%lu uncached:%lu exec:%lu ints: g:%u o= p:%u op_opt:%u h:%u h/g:%.2f spills:%d)\n", > + tbs->display_id, > + tbs->phys_pc, tbs->pc, tbs->flags, > + tbs->translations.total, tbs->translations.uncached, > + tbs->executions.total, g, ops, ops_opt, h, guest_host_prop, > + spills); > +} > + > +static gint > +inverse_sort_tbs(gconstpointer p1, gconstpointer p2, gpointer psort_by) > +{ > + const TBStatistics *tbs1 =3D (TBStatistics *) p1; > + const TBStatistics *tbs2 =3D (TBStatistics *) p2; > + int sort_by =3D *((int *) psort_by); > + unsigned long c1 =3D 0; > + unsigned long c2 =3D 0; > + > + if (likely(sort_by =3D=3D SORT_BY_SPILLS)) { > + c1 =3D tbs1->code.spills; > + c2 =3D tbs2->code.spills; > + } else if (likely(sort_by =3D=3D SORT_BY_HOTNESS)) { > + c1 =3D tbs1->executions.total; > + c2 =3D tbs2->executions.total; > + } else if (likely(sort_by =3D=3D SORT_BY_HG)) { > + if (tbs1->code.num_guest_inst =3D=3D 0) { > + return -1; > + } > + if (tbs2->code.num_guest_inst =3D=3D 0) { > + return 1; > + } > + > + float a =3D (float) tbs1->code.num_host_inst / tbs1->code.num_gu= est_inst; > + float b =3D (float) tbs2->code.num_host_inst / tbs2->code.num_gu= est_inst; > + c1 =3D a <=3D b ? 0 : 1; > + c2 =3D a <=3D b ? 1 : 0; > + } > + > + return c1 < c2 ? 1 : c1 =3D=3D c2 ? 0 : -1; > +} > + > +static void do_dump_coverset_info(int percentage) > +{ > + uint64_t total_exec_count =3D 0; > + uint64_t covered_exec_count =3D 0; > + unsigned coverset_size =3D 0; > + int id =3D 1; > + GList *i; > + > + g_list_free(last_search); > + last_search =3D NULL; > + > + qht_iter(&tb_ctx.tb_stats, collect_tb_stats, NULL); > + > + int sort_by =3D SORT_BY_HOTNESS; > + last_search =3D g_list_sort_with_data(last_search, inverse_sort_tbs,= &sort_by); > + > + if (!last_search) { > + qemu_log("No data collected yet\n"); > + return; > + } > + > + /* Compute total execution count for all tbs */ > + for (i =3D last_search; i; i =3D i->next) { > + TBStatistics *tbs =3D (TBStatistics *) i->data; > + total_exec_count +=3D tbs->executions.total * tbs->code.num_gues= t_inst; > + } > + > + for (i =3D last_search; i; i =3D i->next) { > + TBStatistics *tbs =3D (TBStatistics *) i->data; > + covered_exec_count +=3D tbs->executions.total * tbs->code.num_gu= est_inst; > + tbs->display_id =3D id++; > + coverset_size++; > + dump_tb_header(tbs); > + > + /* Iterate and display tbs until reach the percentage count cove= r */ > + if (((double) covered_exec_count / total_exec_count) > > + ((double) percentage / 100)) { > + break; > + } > + } > + > + qemu_log("\n------------------------------\n"); > + qemu_log("# of TBs to reach %d%% of the total of guest insts exec: %= u\t", > + percentage, coverset_size); > + qemu_log("Total of guest insts exec: %lu\n", total_exec_count); > + qemu_log("\n------------------------------\n"); > + > + /* free the unused bits */ > + if (i) { > + if (i->next) { > + i->next->prev =3D NULL; > + } > + g_list_free(i->next); > + i->next =3D NULL; > + } > +} > + > +static void do_dump_tbs_info(int count, int sort_by) > +{ > + int id =3D 1; > + GList *i; > + > + g_list_free(last_search); > + last_search =3D NULL; > + > + qht_iter(&tb_ctx.tb_stats, collect_tb_stats, NULL); > + > + last_search =3D g_list_sort_with_data(last_search, inverse_sort_tbs, > + &sort_by); > + > + if (!last_search) { > + qemu_printf("No data collected yet!\n"); > + return; > + } > + > + for (i =3D last_search; i && count--; i =3D i->next) { > + TBStatistics *tbs =3D (TBStatistics *) i->data; > + tbs->display_id =3D id++; > + dump_tb_header(tbs); > + } > + > + /* free the unused bits */ > + if (i) { > + if (i->next) { > + i->next->prev =3D NULL; > + } > + g_list_free(i->next); > + i->next =3D NULL; > + } > +} > + > +static void > +do_dump_coverset_info_safe(CPUState *cpu, run_on_cpu_data percentage) > +{ > + qemu_log_to_monitor(true); > + do_dump_coverset_info(percentage.host_int); > + qemu_log_to_monitor(false); > +} > + > +struct tbs_dump_info { > + int count; > + int sort_by; > +}; > + > +static void do_dump_tbs_info_safe(CPUState *cpu, run_on_cpu_data tbdi) > +{ > + struct tbs_dump_info *info =3D tbdi.host_ptr; > + qemu_log_to_monitor(true); > + do_dump_tbs_info(info->count, info->sort_by); > + qemu_log_to_monitor(false); > + g_free(info); > +} > + > +/* > + * When we dump_tbs_info on a live system via the HMP we want to > + * ensure the system is quiessent before we start outputting stuff. > + * Otherwise we could pollute the output with other logging output. > + */ > +void dump_coverset_info(int percentage, bool use_monitor) > +{ > + if (use_monitor) { > + async_safe_run_on_cpu(first_cpu, do_dump_coverset_info_safe, > + RUN_ON_CPU_HOST_INT(percentage)); > + } else { > + do_dump_coverset_info(percentage); > + } > +} > + > +void dump_tbs_info(int count, int sort_by, bool use_monitor) > +{ > + if (use_monitor) { > + struct tbs_dump_info *tbdi =3D g_new(struct tbs_dump_info, 1); > + tbdi->count =3D count; > + tbdi->sort_by =3D sort_by; > + async_safe_run_on_cpu(first_cpu, do_dump_tbs_info_safe, > + RUN_ON_CPU_HOST_PTR(tbdi)); > + } else { > + do_dump_tbs_info(count, sort_by); > + } > +} > + > +static void do_tb_dump_with_statistics(TBStatistics *tbs, int log_flags) > +{ > + CPUState *cpu =3D current_cpu; > + uint32_t cflags =3D curr_cflags() | CF_NOCACHE; > + int old_log_flags =3D qemu_loglevel; > + TranslationBlock *tb =3D NULL; > + > + qemu_set_log(log_flags); > + > + qemu_log("\n------------------------------\n"); > + dump_tb_header(tbs); > + > + if (sigsetjmp(cpu->jmp_env, 0) =3D=3D 0) { > + mmap_lock(); > + tb =3D tb_gen_code(cpu, tbs->pc, tbs->cs_base, tbs->flags, cflag= s); > + tb_phys_invalidate(tb, -1); > + mmap_unlock(); > + } else { > + /* > + * The mmap_lock is dropped by tb_gen_code if it runs out of > + * memory. > + */ > + fprintf(stderr, "%s: dbg failed!\n", __func__); > + assert_no_pages_locked(); > + } So this fails if we can't generate a TB as tcg_tb_remove(NULL) will barf (this was the crash I was seeing). However with two additional patches from my plugin series: translate-all: use cpu_in_exclusive_work_context() in tb_flush translate-all: use cpu_in_exclusive_work_context() in tb_flush We can do a simple repeat operation: @@ -420,6 +421,7 @@ static void do_tb_dump_with_statistics(TBStatistics *tb= s, int log_flags) qemu_log("\n------------------------------\n"); dump_tb_header(tbs); + redo: if (sigsetjmp(cpu->jmp_env, 0) =3D=3D 0) { mmap_lock(); @@ -433,6 +435,7 @@ static void do_tb_dump_with_statistics(TBStatistics *tb= s, int log_flags) */ fprintf(stderr, "%s: dbg failed!\n", __func__); assert_no_pages_locked(); + goto redo; } Because the tb_flush triggered by the generation code will have occured straight away. I'd suggest cherry picking those two patches into your next series. > + > + qemu_set_log(old_log_flags); > + > + tcg_tb_remove(tb); > +} > + > +struct tb_dump_info { > + int id; > + int log_flags; > + bool use_monitor; > +}; > + > +static void do_dump_tb_info_safe(CPUState *cpu, run_on_cpu_data info) > +{ > + struct tb_dump_info *tbdi =3D (struct tb_dump_info *) info.host_ptr; > + GList *iter; > + > + if (!last_search) { > + qemu_printf("no search on record"); > + return; > + } > + qemu_log_to_monitor(tbdi->use_monitor); > + > + for (iter =3D last_search; iter; iter =3D g_list_next(iter)) { > + TBStatistics *tbs =3D iter->data; > + if (tbs->display_id =3D=3D tbdi->id) { > + do_tb_dump_with_statistics(tbs, tbdi->log_flags); > + break; > + } > + } > + qemu_log_to_monitor(false); > + g_free(tbdi); > +} > + > +void dump_tb_info(int id, int log_mask, bool use_monitor) > +{ > + struct tb_dump_info *tbdi =3D g_new(struct tb_dump_info, 1); > + > + tbdi->id =3D id; > + tbdi->log_flags =3D log_mask; > + tbdi->use_monitor =3D use_monitor; > + > + async_safe_run_on_cpu(first_cpu, do_dump_tb_info_safe, > + RUN_ON_CPU_HOST_PTR(tbdi)); > + > + /* tbdi free'd by do_dump_tb_info_safe */ > +} > + > diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx > index c59444c461..761c76619b 100644 > --- a/hmp-commands-info.hx > +++ b/hmp-commands-info.hx > @@ -289,6 +289,29 @@ ETEXI > .help =3D "show dynamic compiler info", > .cmd =3D hmp_info_jit, > }, > + { > + .name =3D "tbs", > + .args_type =3D "number:i?,sortedby:s?", > + .params =3D "[number sortedby]", > + .help =3D "show a [number] translated blocks sorted by [so= rtedby]" > + "sortedby opts: hotness hg", > + .cmd =3D hmp_info_tbs, > + }, > + { > + .name =3D "tb", > + .args_type =3D "id:i,flags:s?", > + .params =3D "id [log1[,...] flags]", > + .help =3D "show information about one translated block by = id", > + .cmd =3D hmp_info_tb, > + }, > + { > + .name =3D "coverset", > + .args_type =3D "number:i?", > + .params =3D "[number]", > + .help =3D "show hottest translated blocks neccesary to cov= er" > + "[number]% of the execution count", > + .cmd =3D hmp_info_coverset, > + }, > #endif > > STEXI > diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h > index d1debd3262..e2ab1068c3 100644 > --- a/include/exec/tb-stats.h > +++ b/include/exec/tb-stats.h > @@ -57,6 +57,9 @@ struct TBStatistics { > unsigned long uncached; > unsigned long spanning; > } translations; > + > + /* HMP information - used for referring to previous search */ > + int display_id; > }; > > bool tb_stats_cmp(const void *ap, const void *bp); > @@ -73,4 +76,38 @@ struct TbstatsCommand { > > void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd); > > +/** > + * dump_coverset_info: report the hottest blocks to cover n% of execution > + * > + * @percentage: cover set percentage > + * @use_monitor: redirect output to monitor > + * > + * Report the hottest blocks to either the log or monitor > + */ > +void dump_coverset_info(int percentage, bool use_monitor); > + > + > +/** > + * dump_tbs_info: report the hottest blocks > + * > + * @count: the limit of hotblocks > + * @sort_by: property in which the dump will be sorted > + * @use_monitor: redirect output to monitor > + * > + * Report the hottest blocks to either the log or monitor > + */ > +void dump_tbs_info(int count, int sort_by, bool use_monitor); > + > +/** > + * dump_tb_info: dump information about one TB > + * > + * @id: the display id of the block (from previous search) > + * @mask: the temporary logging mask > + * @Use_monitor: redirect output to monitor > + * > + * Re-run a translation of a block at addr for the purposes of debug out= put > + */ > +void dump_tb_info(int id, int log_mask, bool use_monitor); > + > + > #endif > diff --git a/include/qemu/log-for-trace.h b/include/qemu/log-for-trace.h > index 2f0a5b080e..d65eb83037 100644 > --- a/include/qemu/log-for-trace.h > +++ b/include/qemu/log-for-trace.h > @@ -21,6 +21,8 @@ > /* Private global variable, don't use */ > extern int qemu_loglevel; > > +extern int32_t max_num_hot_tbs_to_dump; > + > #define LOG_TRACE (1 << 15) > > /* Returns true if a bit is set in the current loglevel mask */ > diff --git a/include/qemu/log.h b/include/qemu/log.h > index 47071d72c7..27ba267faa 100644 > --- a/include/qemu/log.h > +++ b/include/qemu/log.h > @@ -114,6 +114,7 @@ typedef struct QEMULogItem { > extern const QEMULogItem qemu_log_items[]; > > void qemu_set_log(int log_flags); > +void qemu_log_to_monitor(bool enable); > void qemu_log_needs_buffers(void); > void qemu_set_log_filename(const char *filename, Error **errp); > void qemu_set_dfilter_ranges(const char *ranges, Error **errp); > diff --git a/linux-user/exit.c b/linux-user/exit.c > index bdda720553..7226104959 100644 > --- a/linux-user/exit.c > +++ b/linux-user/exit.c > @@ -28,6 +28,10 @@ extern void __gcov_dump(void); > > void preexit_cleanup(CPUArchState *env, int code) > { > + if (tb_stats_collection_enabled()) { > + dump_tbs_info(max_num_hot_tbs_to_dump, SORT_BY_HOTNESS, false); > + } > + > #ifdef TARGET_GPROF > _mcleanup(); > #endif > diff --git a/monitor/misc.c b/monitor/misc.c > index aea9b0db4f..78ada8aa0e 100644 > --- a/monitor/misc.c > +++ b/monitor/misc.c > @@ -499,6 +499,77 @@ static void hmp_tbstats(Monitor *mon, const QDict *q= dict) > > } > > +static void hmp_info_tbs(Monitor *mon, const QDict *qdict) > +{ > + int n; > + const char *s =3D NULL; > + if (!tcg_enabled()) { > + error_report("TB information is only available with accel=3Dtcg"= ); > + return; > + } > + if (!tb_ctx.tb_stats.map) { > + error_report("no TB information recorded"); > + return; > + } > + > + n =3D qdict_get_try_int(qdict, "number", 10); > + s =3D qdict_get_try_str(qdict, "sortedby"); > + > + int sortedby =3D 0; > + if (s =3D=3D NULL || strcmp(s, "hotness") =3D=3D 0) { > + sortedby =3D SORT_BY_HOTNESS; > + } else if (strcmp(s, "hg") =3D=3D 0) { > + sortedby =3D SORT_BY_HG; > + } else if (strcmp(s, "spills") =3D=3D 0) { > + sortedby =3D SORT_BY_SPILLS; > + } > + > + dump_tbs_info(n, sortedby, true); > +} > + > +static void hmp_info_tb(Monitor *mon, const QDict *qdict) > +{ > + const int id =3D qdict_get_int(qdict, "id"); > + const char *flags =3D qdict_get_try_str(qdict, "flags"); > + int mask; > + > + if (!tcg_enabled()) { > + error_report("TB information is only available with accel=3Dtcg"= ); > + return; > + } > + > + mask =3D flags ? qemu_str_to_log_mask(flags) : CPU_LOG_TB_IN_ASM; > + > + if (!mask) { > + help_cmd(mon, "log"); > + return; > + } > + > + dump_tb_info(id, mask, true); > +} > + > +static void hmp_info_coverset(Monitor *mon, const QDict *qdict) > +{ > + int n; > + if (!tcg_enabled()) { > + error_report("TB information is only available with accel=3Dtcg"= ); > + return; > + } > + if (!tb_stats_collection_enabled()) { > + error_report("TB information not being recorded"); > + return; > + } > + > + n =3D qdict_get_try_int(qdict, "number", 90); > + > + if (n < 0 || n > 100) { > + error_report("Coverset percentage should be between 0 and 100"); > + return; > + } > + > + dump_coverset_info(n, true); > +} > + > static void hmp_info_jit(Monitor *mon, const QDict *qdict) > { > if (!tcg_enabled()) { > diff --git a/util/log.c b/util/log.c > index 8109d19afb..7bfcbe3703 100644 > --- a/util/log.c > +++ b/util/log.c > @@ -19,6 +19,7 @@ > > #include "qemu/osdep.h" > #include "qemu/log.h" > +#include "qemu/qemu-print.h" > #include "qemu/range.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > @@ -31,25 +32,34 @@ int qemu_loglevel; > static int log_append =3D 0; > static GArray *debug_regions; > int32_t max_num_hot_tbs_to_dump; > +static bool to_monitor; > > /* Return the number of characters emitted. */ > int qemu_log(const char *fmt, ...) > { > int ret =3D 0; > - if (qemu_logfile) { > - va_list ap; > - va_start(ap, fmt); > + va_list ap; > + va_start(ap, fmt); > + > + if (to_monitor) { > + ret =3D qemu_vprintf(fmt, ap); > + } else if (qemu_logfile) { > ret =3D vfprintf(qemu_logfile, fmt, ap); > - va_end(ap); > + } > + va_end(ap); > > - /* Don't pass back error results. */ > - if (ret < 0) { > - ret =3D 0; > - } > + /* Don't pass back error results. */ > + if (ret < 0) { > + ret =3D 0; > } > return ret; > } > > +void qemu_log_to_monitor(bool enable) > +{ > + to_monitor =3D enable; > +} > + > static bool log_uses_own_buffers; > > /* enable or disable low levels log */ -- Alex Benn=C3=A9e