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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 01789C433F5 for ; Mon, 16 May 2022 09:12:19 +0000 (UTC) Received: from localhost ([::1]:33684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWm3-0005D5-5B for qemu-devel@archiver.kernel.org; Mon, 16 May 2022 05:12:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcp-0001hz-43 for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcm-0007MY-Ir for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+j/CrbEnbe1mDRYnK/ApyTyZ4x3qCcODN5HJDqu7f8U=; b=P1V+UMaGeKrMLZL6P9P3JXVlFLSGx9zBS/87Msfjn8mu7cISg6bNWdgQSv5H4kbqcER8bd TkqOaZENtST9P9hmvKIi809yUr/P+ya5lnqX0q5dJX/g0YGjKh8xynYReZkf2DepZwjxw3 /oOLM3KNXPHvl5m3lwmLi/BXMaMZkIM= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-111-6RQ97vhaNbe6Dffskh5ulw-1; Mon, 16 May 2022 05:02:42 -0400 X-MC-Unique: 6RQ97vhaNbe6Dffskh5ulw-1 Received: by mail-ed1-f70.google.com with SMTP id n9-20020aa7d049000000b0042aab725949so2237354edo.23 for ; Mon, 16 May 2022 02:02:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+j/CrbEnbe1mDRYnK/ApyTyZ4x3qCcODN5HJDqu7f8U=; b=mYSixYXhSVuwrg0aGpQU3vfnXN66IVGlwaBIc2BJ/cuco/wXe5zkedvRRwvqowV+Th HYsZcXAr/pfmN/v7uLeIRUdKJJMGFERhaIP9TRuYPnulZ5OFximRubYUuKduhz3xnfd4 zo+ni/WLBrVsx4MJhwayLqI+EvMScEIpLSdOEcTq1uNt1144J1l/O42z2VosEDX6971L wnEwBx6+zLX1QWCe893hoO2SMqWaxrVCp7dAp+1zPV9I0q6Lw3AXmveDhfafBZc3vUv1 vozW6wDMH1D+Qg0rfleXd+P/G4xsrwHHMK+6wJyLQxENxJ/F8S4UDp6dpjnHcsbA5l/W Z5yA== X-Gm-Message-State: AOAM531nEXSeq9F7adFIuv8J4RPjWtFiSxrPVtLbZnFKHlbX5dB4L3FH 3sdZREpjzFllvwCl4u8pPhRE5hAaxjjWuFOdKz7GQrM/PpaK7SO7usS2dQoIaoHbJ+EO8L22Y/9 qt0EsX6Ya9BYZsrZBJRwbrpbh1aS9R/bpfMlvxDzoIcmRVdm6GI5QMwlikvRRwQ2hy9Y= X-Received: by 2002:a17:906:f88f:b0:6f3:eaed:c143 with SMTP id lg15-20020a170906f88f00b006f3eaedc143mr13878671ejb.311.1652691761281; Mon, 16 May 2022 02:02:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZStpYh+oXVAinxjC5/td0Y/qz85V7OzF5cgvWn0zZcvjNMVs5JvDg4pAVa3w3jkThmz6hFw== X-Received: by 2002:a17:906:f88f:b0:6f3:eaed:c143 with SMTP id lg15-20020a170906f88f00b006f3eaedc143mr13878648ejb.311.1652691760972; Mon, 16 May 2022 02:02:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d2-20020a170907272200b006f3ef214dcfsm3482755ejl.53.2022.05.16.02.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 4/8] hmp: add basic "info stats" implementation Date: Mon, 16 May 2022 11:02:30 +0200 Message-Id: <20220516090234.1195907-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Mark Kanda Add an HMP command to retrieve statistics collected at run-time. The command will retrieve and print either all VM-level statistics, or all vCPU-level statistics for the currently selected CPU. Signed-off-by: Paolo Bonzini --- hmp-commands-info.hx | 13 +++ include/monitor/hmp.h | 1 + monitor/hmp-cmds.c | 187 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index adfa085a9b..221feab8c0 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -894,3 +894,16 @@ SRST ``info via`` Show guest mos6522 VIA devices. ERST + + { + .name = "stats", + .args_type = "target:s", + .params = "target", + .help = "show statistics; target is either vm or vcpu", + .cmd = hmp_info_stats, + }, + +SRST + ``stats`` + Show runtime-collected statistics +ERST diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 96d014826a..2e89a97bd6 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -133,5 +133,6 @@ void hmp_info_dirty_rate(Monitor *mon, const QDict *qdict); void hmp_calc_dirty_rate(Monitor *mon, const QDict *qdict); void hmp_human_readable_text_helper(Monitor *mon, HumanReadableText *(*qmp_handler)(Error **)); +void hmp_info_stats(Monitor *mon, const QDict *qdict); #endif diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 93061a11af..5950133a11 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -40,6 +40,7 @@ #include "qapi/qapi-commands-pci.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-run-state.h" +#include "qapi/qapi-commands-stats.h" #include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-ui.h" #include "qapi/qapi-visit-net.h" @@ -52,6 +53,7 @@ #include "ui/console.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "hw/core/cpu.h" #include "hw/intc/intc.h" #include "migration/snapshot.h" #include "migration/misc.h" @@ -2233,3 +2235,188 @@ void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict) } hmp_handle_error(mon, err); } + +static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value) +{ + const char *prefix = ""; + monitor_printf(mon, " %s (%s", value->name, StatsType_str(value->type)); + + if (value->has_unit && value->unit == STATS_UNIT_SECONDS && + (value->exponent == 0 || value->base == 10) && + value->exponent >= -9 && value->exponent <= 0 && + value->exponent % 3 == 0) { + + static const char *si_prefix[] = { "", "milli", "micro", "nano" }; + prefix = si_prefix[value->exponent / -3]; + + } else if (value->has_unit && value->unit == STATS_UNIT_BYTES && + (value->exponent == 0 || value->base == 2) && + value->exponent >= 0 && value->exponent <= 40 && + value->exponent % 10 == 0) { + + static const char *si_prefix[] = { + "", "kilo", "mega", "giga", "tera" }; + prefix = si_prefix[value->exponent / 10]; + + } else if (value->exponent) { + /* Print the base and exponent as "x ^" */ + monitor_printf(mon, ", * %d^%d", value->base, + value->exponent); + } + + if (value->has_unit) { + monitor_printf(mon, " %s%s", prefix, StatsUnit_str(value->unit)); + } + + /* Print bucket size for linear histograms */ + if (value->type == STATS_TYPE_LINEAR_HISTOGRAM && value->has_bucket_size) { + monitor_printf(mon, ", bucket size=%d", value->bucket_size); + } + monitor_printf(mon, ")"); +} + +static StatsSchemaValueList *find_schema_value_list( + StatsSchemaList *list, StatsProvider provider, + StatsTarget target) +{ + StatsSchemaList *node; + + for (node = list; node; node = node->next) { + if (node->value->provider == provider && + node->value->target == target) { + return node->value->stats; + } + } + return NULL; +} + +static void print_stats_results(Monitor *mon, StatsTarget target, + StatsResult *result, + StatsSchemaList *schema) +{ + /* Find provider schema */ + StatsSchemaValueList *schema_value_list = + find_schema_value_list(schema, result->provider, target); + StatsList *stats_list; + + if (!schema_value_list) { + monitor_printf(mon, "failed to find schema list for %s\n", + StatsProvider_str(result->provider)); + return; + } + + monitor_printf(mon, "provider: %s\n", + StatsProvider_str(result->provider)); + + for (stats_list = result->stats; stats_list; + stats_list = stats_list->next, + schema_value_list = schema_value_list->next) { + + Stats *stats = stats_list->value; + StatsValue *stats_value = stats->value; + StatsSchemaValue *schema_value = schema_value_list->value; + + /* Find schema entry */ + while (!g_str_equal(stats->name, schema_value->name)) { + if (!schema_value_list->next) { + monitor_printf(mon, "failed to find schema entry for %s\n", + stats->name); + return; + } + schema_value_list = schema_value_list->next; + schema_value = schema_value_list->value; + } + + print_stats_schema_value(mon, schema_value); + + if (stats_value->type == QTYPE_QNUM) { + monitor_printf(mon, ": %" PRId64 "\n", stats_value->u.scalar); + } else if (stats_value->type == QTYPE_QLIST) { + uint64List *list; + int i; + + monitor_printf(mon, ": "); + for (list = stats_value->u.list, i = 1; + list; + list = list->next, i++) { + monitor_printf(mon, "[%d]=%" PRId64 " ", i, list->value); + } + monitor_printf(mon, "\n"); + } + } +} + +/* Create the StatsFilter that is needed for an "info stats" invocation. */ +static StatsFilter *stats_filter(StatsTarget target, int cpu_index) +{ + StatsFilter *filter = g_malloc0(sizeof(*filter)); + + filter->target = target; + switch (target) { + case STATS_TARGET_VM: + break; + case STATS_TARGET_VCPU: + { + strList *vcpu_list = NULL; + CPUState *cpu = qemu_get_cpu(cpu_index); + char *canonical_path = object_get_canonical_path(OBJECT(cpu)); + + QAPI_LIST_PREPEND(vcpu_list, canonical_path); + filter->u.vcpu.has_vcpus = true; + filter->u.vcpu.vcpus = vcpu_list; + break; + } + default: + break; + } + return filter; +} + +void hmp_info_stats(Monitor *mon, const QDict *qdict) +{ + const char *target_str = qdict_get_str(qdict, "target"); + StatsTarget target; + Error *err = NULL; + g_autoptr(StatsSchemaList) schema = NULL; + g_autoptr(StatsResultList) stats = NULL; + g_autoptr(StatsFilter) filter = NULL; + StatsResultList *entry; + + target = qapi_enum_parse(&StatsTarget_lookup, target_str, -1, &err); + if (err) { + monitor_printf(mon, "invalid stats target %s\n", target_str); + goto exit_no_print; + } + + schema = qmp_query_stats_schemas(&err); + if (err) { + goto exit; + } + + switch (target) { + case STATS_TARGET_VM: + filter = stats_filter(target, -1); + break; + case STATS_TARGET_VCPU: {} + int cpu_index = monitor_get_cpu_index(mon); + filter = stats_filter(target, cpu_index); + break; + default: + abort(); + } + + stats = qmp_query_stats(filter, &err); + if (err) { + goto exit; + } + for (entry = stats; entry; entry = entry->next) { + print_stats_results(mon, target, entry->value, schema); + } + +exit: + if (err) { + monitor_printf(mon, "%s\n", error_get_pretty(err)); + } +exit_no_print: + error_free(err); +} -- 2.36.0