From nobody Thu May 9 05:56:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923485; cv=none; d=zohomail.com; s=zohoarc; b=fI8go9+TNhZEGdlbRwMEBHjzABNFXD0Y3FJ8Ga77F++Iuabidn+bJixjm+Yr9nqOQapr6O9+6dr9AMeMhn5Z1NytMofyrUc5bVwEll/e6MUK5t17/RKDwvQClmcdW8rBDBbUvVA4TTSUBLbj/a6rEiPnnJkI1J9KKiMDA70KvbU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OCtAL/htn98bt/wXCIv8tv22pFbnzTAgTmqMhtVCm3Y=; b=SWaO61XqOnSaiv6KaMaRAPBAnO1kM6l1bTu2xfmzQ1HxIfLVeaNo8Ecw/zrcmFzw8bngQuwa9p1mgtK5/fv1peCS4057ZWzGvaAmWzNUfgMb3n0kYMGRfR6uP5rrLjUTPzxke/QvYnbln89vT0LwW5Fy05DyoZGcNOddyfLg9VE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923485005855.1437573485966; Mon, 30 May 2022 08:11:25 -0700 (PDT) Received: from localhost ([::1]:46430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh3D-0006Gx-RD for importer2@patchew.org; Mon, 30 May 2022 11:11:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzP-0003Ps-Vi for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53106) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzL-000625-Gt for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:26 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-287-Iwtv1ZdVOzOdJFF1V8cC1w-1; Mon, 30 May 2022 11:07:21 -0400 Received: by mail-ej1-f69.google.com with SMTP id x2-20020a1709065ac200b006d9b316257fso4236796ejs.12 for ; Mon, 30 May 2022 08:07:21 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id 2-20020a508e42000000b0042ad421574esm6776465edx.33.2022.05.30.08.07.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923242; 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=OCtAL/htn98bt/wXCIv8tv22pFbnzTAgTmqMhtVCm3Y=; b=gbR2tKULvVOhYCWBpcs9A1f7oU/5NnNLvjsYOsC6j0ozygJfAChkyb7gFBbZ1aOd5+JscP COCJAUgRE+8Kt7/q6IBa3BhudMIL3e1x+lWH/nfNxIk2eAj75+UaNH9qncVLFsHFtuBsHb TYKyop2axFCtYMGYmoWd9GnonbaqEhA= X-MC-Unique: Iwtv1ZdVOzOdJFF1V8cC1w-1 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=OCtAL/htn98bt/wXCIv8tv22pFbnzTAgTmqMhtVCm3Y=; b=DVzuAhh3ReUchnqpZdXBih4AGIT4gBDdNx3K7dPkLCx1Dgb0Ac9Aegdc5fl5szwqjK Csl99SRcJdIg0eBGBecdn1Uukv8du78+4S8e9ia92vI3AmFBS8TofEjbBcy7u34LavNt 055Y8pnzw0jzW1B8duETVjSxwbZvwDlIbdKUZrirX0sc8R1YnNAyzD9l/5g5vYF4LgPG k2/HZGYqh30ZGCGt1hqekMBfNkGJ4Kvpfn7kJogcxNTXDHsYH10PF05YJqiIowYJ4Wlv ZRI+g+kbG3A5ubXNTziBp2Gu9A59lNRRVLoD9UoygHXLCHOgo9AALmvfX4jxqI/XYvWL ScJA== X-Gm-Message-State: AOAM530BBin9aL7P/pQ4OidDjUAluxqdbZOeE7n2kf3Pv8/hwzZq5Ijp 5Fi8GHyb/wfyvRQBFxALgXMWSXnKepx7CM3YmXRyRSSzJmE66AFovWYTNIcMny/eQR9wkFDkDUH E5MxcdBWDizmr1N/zsXw7oxXHLIqU3Iq3g13sTdw4lzXEcRhXdEyN3VOq6aIvsqbSFz0= X-Received: by 2002:a17:907:1b24:b0:6ff:235c:2ffd with SMTP id mp36-20020a1709071b2400b006ff235c2ffdmr19528754ejc.116.1653923239501; Mon, 30 May 2022 08:07:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAEMwbAwz+jTxJQ4TOX4uvGRm8NUQxN/YAf4HPcFxghjG1JPTB68ngDqUVGU8UCy+edSe2jQ== X-Received: by 2002:a17:907:1b24:b0:6ff:235c:2ffd with SMTP id mp36-20020a1709071b2400b006ff235c2ffdmr19528700ejc.116.1653923238806; Mon, 30 May 2022 08:07:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v5 01/10] qmp: Support for querying stats Date: Mon, 30 May 2022 17:07:05 +0200 Message-Id: <20220530150714.756954-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923485635100002 Content-Type: text/plain; charset="utf-8" From: Mark Kanda Gathering statistics is important for development, for monitoring and for performance measurement. There are tools such as kvm_stat that do this and they rely on the _user_ knowing the interesting data points rather than the tool (which can treat them as opaque). The commands introduced in this commit introduce QMP support for querying stats; the goal is to take the capabilities of these tools and making them available throughout the whole virtualization stack, so that one can observe, monitor and measure virtual machines without having shell access + root on the host that runs them. query-stats returns a list of all stats per target type (only VM and vCPU to start); future commits add extra options for specifying stat names, vCPU qom paths, and providers. All these are used by the HMP command "info stats". Because of the development usecases around statistics, a good HMP interface is important. query-stats-schemas returns a list of stats included in each target type, with an option for specifying the provider. The concepts in the schema are based on the KVM binary stats' own introspection data, just translated to QAPI. There are two reasons to have a separate schema that is not tied to the QAPI schema. The first is the contents of the schemas: the new introspection data provides different information than the QAPI data, namely unit of measurement, how the numbers are gathered and change (peak/instant/cumulative/histogram), and histogram bucket sizes. There's really no reason to have this kind of metadata in the QAPI introspection schema (except possibly for the unit of measure, but there's a very weak justification). Another reason is the dynamicity of the schema. The QAPI introspection data is very much static; and while QOM is somewhat more dynamic, generally we consider that to be a bug rather than a feature these days. On the other hand, the statistics that are exposed by QEMU might be passed through from another source, such as KVM, and the disadvantages of manually updating the QAPI schema for outweight the benefits from vetting the statistics and filtering out anything that seems "too unstable". Running old QEMU with new kernel is a supported usecase; if old QEMU cannot expose statistics from a new kernel, or if a kernel developer needs to change QEMU before gathering new info from the new kernel, then that is a poor user interface. The framework provides a method to register callbacks for these QMP commands. Most of the work in fact is done by the callbacks, and a large majority of this patch is new QAPI structs and commands. Examples (with KVM stats): - Query all VM stats: { "execute": "query-stats", "arguments" : { "target": "vm" } } { "return": [ { "provider": "kvm", "stats": [ { "name": "max_mmu_page_hash_collisions", "value": 0 }, { "name": "max_mmu_rmap_size", "value": 0 }, { "name": "nx_lpage_splits", "value": 148 }, ... ] }, { "provider": "xyz", "stats": [ ... ] } ] } - Query all vCPU stats: { "execute": "query-stats", "arguments" : { "target": "vcpu" } } { "return": [ { "provider": "kvm", "qom_path": "/machine/unattached/device[0]" "stats": [ { "name": "guest_mode", "value": 0 }, { "name": "directed_yield_successful", "value": 0 }, { "name": "directed_yield_attempted", "value": 106 }, ... ] }, { "provider": "kvm", "qom_path": "/machine/unattached/device[1]" "stats": [ { "name": "guest_mode", "value": 0 }, { "name": "directed_yield_successful", "value": 0 }, { "name": "directed_yield_attempted", "value": 106 }, ... ] }, ] } - Retrieve the schemas: { "execute": "query-stats-schemas" } { "return": [ { "provider": "kvm", "target": "vcpu", "stats": [ { "name": "guest_mode", "unit": "none", "base": 10, "exponent": 0, "type": "instant" }, { "name": "directed_yield_successful", "unit": "none", "base": 10, "exponent": 0, "type": "cumulative" }, ... ] }, { "provider": "kvm", "target": "vm", "stats": [ { "name": "max_mmu_page_hash_collisions", "unit": "none", "base": 10, "exponent": 0, "type": "peak" }, ... ] }, { "provider": "xyz", "target": "vm", "stats": [ ... ] } ] } Signed-off-by: Mark Kanda Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- I left the Reviewed-by even though the implementation changed a bit; mostly because the schema and the concepts are the same and this patch is relatively simple. include/monitor/stats.h | 34 +++++++ monitor/qmp-cmds.c | 95 ++++++++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + qapi/stats.json | 216 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 347 insertions(+) create mode 100644 include/monitor/stats.h create mode 100644 qapi/stats.json diff --git a/include/monitor/stats.h b/include/monitor/stats.h new file mode 100644 index 0000000000..912eeadb2f --- /dev/null +++ b/include/monitor/stats.h @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2022 Oracle and/or its affiliates. + * + * This work is licensed under the terms of the GNU GPL, version 2. + * See the COPYING file in the top-level directory. + */ + +#ifndef STATS_H +#define STATS_H + +#include "qapi/qapi-types-stats.h" + +typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target, + Error **errp); +typedef void SchemaRetrieveFunc(StatsSchemaList **result, Error **errp); + +/* + * Register callbacks for the QMP query-stats command. + * + * @stats_fn: routine to query stats: + * @schema_fn: routine to query stat schemas: + */ +void add_stats_callbacks(StatRetrieveFunc *stats_fn, + SchemaRetrieveFunc *schemas_fn); + +/* + * Helper routines for adding stats entries to the results lists. + */ +void add_stats_entry(StatsResultList **, StatsProvider, const char *id, + StatsList *stats_list); +void add_stats_schema(StatsSchemaList **, StatsProvider, StatsTarget, + StatsSchemaValueList *); + +#endif /* STATS_H */ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 1ebb89f46c..a6ac8d7473 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -35,6 +35,7 @@ #include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" +#include "qapi/qapi-commands-stats.h" #include "qapi/qapi-commands-ui.h" #include "qapi/type-helpers.h" #include "qapi/qmp/qerror.h" @@ -43,6 +44,7 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/intc/intc.h" #include "hw/rdma/rdma.h" +#include "monitor/stats.h" =20 NameInfo *qmp_query_name(Error **errp) { @@ -441,3 +443,96 @@ HumanReadableText *qmp_x_query_irq(Error **errp) =20 return human_readable_text_from_str(buf); } + +typedef struct StatsCallbacks { + StatRetrieveFunc *stats_cb; + SchemaRetrieveFunc *schemas_cb; + QTAILQ_ENTRY(StatsCallbacks) next; +} StatsCallbacks; + +static QTAILQ_HEAD(, StatsCallbacks) stats_callbacks =3D + QTAILQ_HEAD_INITIALIZER(stats_callbacks); + +void add_stats_callbacks(StatRetrieveFunc *stats_fn, + SchemaRetrieveFunc *schemas_fn) +{ + StatsCallbacks *entry =3D g_new(StatsCallbacks, 1); + entry->stats_cb =3D stats_fn; + entry->schemas_cb =3D schemas_fn; + + QTAILQ_INSERT_TAIL(&stats_callbacks, entry, next); +} + +static bool invoke_stats_cb(StatsCallbacks *entry, + StatsResultList **stats_results, + StatsFilter *filter, + Error **errp) +{ + ERRP_GUARD(); + + entry->stats_cb(stats_results, filter->target, errp); + if (*errp) { + qapi_free_StatsResultList(*stats_results); + *stats_results =3D NULL; + return false; + } + return true; +} + +StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp) +{ + StatsResultList *stats_results =3D NULL; + StatsCallbacks *entry; + + QTAILQ_FOREACH(entry, &stats_callbacks, next) { + if (!invoke_stats_cb(entry, &stats_results, filter, errp)) { + break; + } + } + + return stats_results; +} + +StatsSchemaList *qmp_query_stats_schemas(Error **errp) +{ + StatsSchemaList *stats_results =3D NULL; + StatsCallbacks *entry; + ERRP_GUARD(); + + QTAILQ_FOREACH(entry, &stats_callbacks, next) { + entry->schemas_cb(&stats_results, errp); + if (*errp) { + qapi_free_StatsSchemaList(stats_results); + return NULL; + } + } + + return stats_results; +} + +void add_stats_entry(StatsResultList **stats_results, StatsProvider provid= er, + const char *qom_path, StatsList *stats_list) +{ + StatsResult *entry =3D g_new0(StatsResult, 1); + + entry->provider =3D provider; + if (qom_path) { + entry->has_qom_path =3D true; + entry->qom_path =3D g_strdup(qom_path); + } + entry->stats =3D stats_list; + + QAPI_LIST_PREPEND(*stats_results, entry); +} + +void add_stats_schema(StatsSchemaList **schema_results, + StatsProvider provider, StatsTarget target, + StatsSchemaValueList *stats_list) +{ + StatsSchema *entry =3D g_new0(StatsSchema, 1); + + entry->provider =3D provider; + entry->target =3D target; + entry->stats =3D stats_list; + QAPI_LIST_PREPEND(*schema_results, entry); +} diff --git a/qapi/meson.build b/qapi/meson.build index 656ef0e039..fd5c93d643 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -46,6 +46,7 @@ qapi_all_modules =3D [ 'replay', 'run-state', 'sockets', + 'stats', 'trace', 'transaction', 'yank', diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 4912b9744e..92d7ecc52c 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -93,3 +93,4 @@ { 'include': 'audio.json' } { 'include': 'acpi.json' } { 'include': 'pci.json' } +{ 'include': 'stats.json' } diff --git a/qapi/stats.json b/qapi/stats.json new file mode 100644 index 0000000000..ada0fbf26f --- /dev/null +++ b/qapi/stats.json @@ -0,0 +1,216 @@ +# -*- Mode: Python -*- +# vim: filetype=3Dpython +# +# Copyright (c) 2022 Oracle and/or its affiliates. +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. +# See the COPYING file in the top-level directory. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +## +# =3D Statistics +## + +## +# @StatsType: +# +# Enumeration of statistics types +# +# @cumulative: stat is cumulative; value can only increase. +# @instant: stat is instantaneous; value can increase or decrease. +# @peak: stat is the peak value; value can only increase. +# @linear-histogram: stat is a linear histogram. +# @log2-histogram: stat is a logarithmic histogram, with one bucket +# for each power of two. +# +# Since: 7.1 +## +{ 'enum' : 'StatsType', + 'data' : [ 'cumulative', 'instant', 'peak', 'linear-histogram', + 'log2-histogram' ] } + +## +# @StatsUnit: +# +# Enumeration of unit of measurement for statistics +# +# @bytes: stat reported in bytes. +# @seconds: stat reported in seconds. +# @cycles: stat reported in clock cycles. +# +# Since: 7.1 +## +{ 'enum' : 'StatsUnit', + 'data' : [ 'bytes', 'seconds', 'cycles' ] } + +## +# @StatsProvider: +# +# Enumeration of statistics providers. +# +# Since: 7.1 +## +{ 'enum': 'StatsProvider', + 'data': [ ] } + +## +# @StatsTarget: +# +# The kinds of objects on which one can request statistics. +# +# @vm: statistics that apply to the entire virtual machine or +# the entire QEMU process. +# +# @vcpu: statistics that apply to a single virtual CPU. +# +# Since: 7.1 +## +{ 'enum': 'StatsTarget', + 'data': [ 'vm', 'vcpu' ] } + +## +# @StatsFilter: +# +# The arguments to the query-stats command; specifies a target for which to +# request statistics. +# +# Since: 7.1 +## +{ 'struct': 'StatsFilter', + 'data': { 'target': 'StatsTarget' } } + +## +# @StatsValue: +# +# @scalar: single unsigned 64-bit integers. +# @list: list of unsigned 64-bit integers (used for histograms). +# +# Since: 7.1 +## +{ 'alternate': 'StatsValue', + 'data': { 'scalar': 'uint64', + 'list': [ 'uint64' ] } } + +## +# @Stats: +# +# @name: name of stat. +# @value: stat value. +# +# Since: 7.1 +## +{ 'struct': 'Stats', + 'data': { 'name': 'str', + 'value' : 'StatsValue' } } + +## +# @StatsResult: +# +# @provider: provider for this set of statistics. +# +# @qom-path: Path to the object for which the statistics are returned, +# if the object is exposed in the QOM tree +# +# @stats: list of statistics. +# +# Since: 7.1 +## +{ 'struct': 'StatsResult', + 'data': { 'provider': 'StatsProvider', + '*qom-path': 'str', + 'stats': [ 'Stats' ] } } + +## +# @query-stats: +# +# Return runtime-collected statistics for objects such as the +# VM or its vCPUs. +# +# The arguments are a StatsFilter and specify the provider and objects +# to return statistics about. +# +# Returns: a list of StatsResult, one for each provider and object +# (e.g., for each vCPU). +# +# Since: 7.1 +## +{ 'command': 'query-stats', + 'data': 'StatsFilter', + 'boxed': true, + 'returns': [ 'StatsResult' ] } + +## +# @StatsSchemaValue: +# +# Schema for a single statistic. +# +# @name: name of the statistic; each element of the schema is uniquely +# identified by a target, a provider (both available in @StatsSchem= a) +# and the name. +# +# @type: kind of statistic. +# +# @unit: basic unit of measure for the statistic; if missing, the statistic +# is a simple number or counter. +# +# @base: base for the multiple of @unit in which the statistic is measured. +# Only present if @exponent is non-zero; @base and @exponent togeth= er +# form a SI prefix (e.g., _nano-_ for ``base=3D10`` and ``exponent= =3D-9``) +# or IEC binary prefix (e.g. _kibi-_ for ``base=3D2`` and ``exponen= t=3D10``) +# +# @exponent: exponent for the multiple of @unit in which the statistic is +# expressed, or 0 for the basic unit +# +# @bucket-size: Present when @type is "linear-histogram", contains the wid= th +# of each bucket of the histogram. +# +# Since: 7.1 +## +{ 'struct': 'StatsSchemaValue', + 'data': { 'name': 'str', + 'type': 'StatsType', + '*unit': 'StatsUnit', + '*base': 'int8', + 'exponent': 'int16', + '*bucket-size': 'uint32' } } + +## +# @StatsSchema: +# +# Schema for all available statistics for a provider and target. +# +# @provider: provider for this set of statistics. +# +# @target: the kind of object that can be queried through the provider. +# +# @stats: list of statistics. +# +# Since: 7.1 +## +{ 'struct': 'StatsSchema', + 'data': { 'provider': 'StatsProvider', + 'target': 'StatsTarget', + 'stats': [ 'StatsSchemaValue' ] } } + +## +# @query-stats-schemas: +# +# Return the schema for all avaif them might be renamed. A statistic migh= t go away if +# an algorithm is changed or some code is removed; changing a default +# might cause previously useful statistics to always report 0. Such +# changes, however, are expected to be rare. +# +# Since: 7.1 +## +{ 'command': 'query-stats-schemas', + 'data': { }, + 'returns': [ 'StatsSchema' ] } --=20 2.36.1 From nobody Thu May 9 05:56:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923485; cv=none; d=zohomail.com; s=zohoarc; b=VBc0m6GSoF6uH0HWZ458hv4INgu2V6vFge68U2ODGzImBV9NmLxSl3PGiAIerhqIBpObuSL6b31/n1lRHXCyyYvkMIfGAS+kUOMKxsSAab9IUHW616BLXaBfR4UGOUYgkzIDRnqibCSY8mOktm58CIjdUk7AICfbBcqGoExzNHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923485; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TNn5MT/IgR8OgkFEWvVWDi/o7UIxNJZ5k2Eh+zsRfYI=; b=ADWSD9sPDovByfioMws1eSpeoiCXOmLQ8CgISYVUiT8wqa29yNvzRI57BMCFZ+lfmCBMN1qH6WTJQiV7zkmF1w8WVf2W06ZQuXlQxh6AOa8TcpwaPYwsstpHc2uPl2Tbty2idOZ1JVqnnhJJZr1a/gTUJRaNkii1YLj8kG5pW30= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923485047450.8584176020088; Mon, 30 May 2022 08:11:25 -0700 (PDT) Received: from localhost ([::1]:46446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh3D-0006HP-Ob for importer2@patchew.org; Mon, 30 May 2022 11:11:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzf-0003ej-Ki for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzO-00062G-Hf for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:42 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-CW69jxwYPLiNYUrHnmLeeA-1; Mon, 30 May 2022 11:07:24 -0400 Received: by mail-ed1-f72.google.com with SMTP id v1-20020a056402348100b0042b4442b954so8313720edc.22 for ; Mon, 30 May 2022 08:07:24 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id t19-20020a056402525300b0042617ba638esm6886505edd.24.2022.05.30.08.07.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923246; 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=TNn5MT/IgR8OgkFEWvVWDi/o7UIxNJZ5k2Eh+zsRfYI=; b=WpApTX6sNBPIWYxt37buQWt4sKwdn5Bpof2WhLMmN62OHeqa4ak7Nx6Z8xWNvmfrV0wabc cnRHljWeo8Mt9Do0Kna0pi0QmGvaoAeEI+tXS5EQ7i0CQCrQ8eLcQN88AqphUk7lPEUaeq hG1mIEaMIswObiBvP0KWKN0fZsvsmSk= X-MC-Unique: CW69jxwYPLiNYUrHnmLeeA-1 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=TNn5MT/IgR8OgkFEWvVWDi/o7UIxNJZ5k2Eh+zsRfYI=; b=gfVDqWvcqb3eSYq2Nx1kjyRohaLqk7RREENX0UK0xRIfdTcXxmUlA+0N9VW/2cYtOp 4PZL0VB9aaLYU8cmki+2cCsyvc0PQNVYPiR3w5uOwBisuisIxQCxNqfebBL0um2Y8ynW 572zOXi8CMCBoU8tgXtXRhXl2iIHs474NkflVQ7ylj2q4x+VBn5QnkcYySeqloiWtaVL N/0gwL+ylE17yZBPUS3N6N/ske+cnaK1UoICzir2gmd8kf5dJTjWfz7wrfaKVsAz7hxm brUsWTWTPg/cqAhX2dUiYTt0GjP7F3s35VeeiILTysAuqWd9pYUOx+lB0QQkWByl5kkk b5eg== X-Gm-Message-State: AOAM531ipiX7bywSMLeklMepe970KM5nhDRraCdwVS46z31skL/TSCUM fPZsOSrySL1/njdPwM8qXVzMkutRs1xeAvQW7fRx9MQko5eP7Fh7PsBk9RvmHPfF/2bB4//Lh7I f0cPzd0ahrw+t5eRNj4KsnEtr1F4WMApE/8Syl/fUGjDzlJp19oMQr94yl6szZx1iQUY= X-Received: by 2002:a17:907:96ab:b0:6ff:127:65a9 with SMTP id hd43-20020a17090796ab00b006ff012765a9mr28768598ejc.603.1653923241693; Mon, 30 May 2022 08:07:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBbWRUpPfBO4rG1qi6JPrZcimyJcp9NxTv2FPQSQf15cG8agkJtHgtRxke1yG5k7ZSD7JQ5g== X-Received: by 2002:a17:907:96ab:b0:6ff:127:65a9 with SMTP id hd43-20020a17090796ab00b006ff012765a9mr28768575ejc.603.1653923241357; Mon, 30 May 2022 08:07:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v5 02/10] kvm: Support for querying fd-based stats Date: Mon, 30 May 2022 17:07:06 +0200 Message-Id: <20220530150714.756954-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923487249100005 Content-Type: text/plain; charset="utf-8" From: Mark Kanda Add support for querying fd-based KVM stats - as introduced by Linux kernel commit: cb082bfab59a ("KVM: stats: Add fd-based API to read binary stats data") This allows the user to analyze the behavior of the VM without access to debugfs. Signed-off-by: Mark Kanda Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- accel/kvm/kvm-all.c | 397 ++++++++++++++++++++++++++++++++++++++++++++ qapi/stats.json | 2 +- 2 files changed, 398 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 32e177bd26..c027536419 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -47,6 +47,7 @@ #include "kvm-cpus.h" =20 #include "hw/boards.h" +#include "monitor/stats.h" =20 /* This check must be after config-host.h is included */ #ifdef CONFIG_EVENTFD @@ -2310,6 +2311,9 @@ bool kvm_dirty_ring_enabled(void) return kvm_state->kvm_dirty_ring_size ? true : false; } =20 +static void query_stats_cb(StatsResultList **result, StatsTarget target, E= rror **errp); +static void query_stats_schemas_cb(StatsSchemaList **result, Error **errp); + static int kvm_init(MachineState *ms) { MachineClass *mc =3D MACHINE_GET_CLASS(ms); @@ -2638,6 +2642,10 @@ static int kvm_init(MachineState *ms) } } =20 + if (kvm_check_extension(kvm_state, KVM_CAP_BINARY_STATS_FD)) { + add_stats_callbacks(query_stats_cb, query_stats_schemas_cb); + } + return 0; =20 err: @@ -3697,3 +3705,392 @@ static void kvm_type_init(void) } =20 type_init(kvm_type_init); + +typedef struct StatsArgs { + union StatsResultsType { + StatsResultList **stats; + StatsSchemaList **schema; + } result; + Error **errp; +} StatsArgs; + +static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc, + uint64_t *stats_data, + StatsList *stats_list, + Error **errp) +{ + + Stats *stats; + uint64List *val_list =3D NULL; + + /* Only add stats that we understand. */ + switch (pdesc->flags & KVM_STATS_TYPE_MASK) { + case KVM_STATS_TYPE_CUMULATIVE: + case KVM_STATS_TYPE_INSTANT: + case KVM_STATS_TYPE_PEAK: + case KVM_STATS_TYPE_LINEAR_HIST: + case KVM_STATS_TYPE_LOG_HIST: + break; + default: + return stats_list; + } + + switch (pdesc->flags & KVM_STATS_UNIT_MASK) { + case KVM_STATS_UNIT_NONE: + case KVM_STATS_UNIT_BYTES: + case KVM_STATS_UNIT_CYCLES: + case KVM_STATS_UNIT_SECONDS: + break; + default: + return stats_list; + } + + switch (pdesc->flags & KVM_STATS_BASE_MASK) { + case KVM_STATS_BASE_POW10: + case KVM_STATS_BASE_POW2: + break; + default: + return stats_list; + } + + /* Alloc and populate data list */ + stats =3D g_new0(Stats, 1); + stats->name =3D g_strdup(pdesc->name); + stats->value =3D g_new0(StatsValue, 1);; + + if (pdesc->size =3D=3D 1) { + stats->value->u.scalar =3D *stats_data; + stats->value->type =3D QTYPE_QNUM; + } else { + int i; + for (i =3D 0; i < pdesc->size; i++) { + QAPI_LIST_PREPEND(val_list, stats_data[i]); + } + stats->value->u.list =3D val_list; + stats->value->type =3D QTYPE_QLIST; + } + + QAPI_LIST_PREPEND(stats_list, stats); + return stats_list; +} + +static StatsSchemaValueList *add_kvmschema_entry(struct kvm_stats_desc *pd= esc, + StatsSchemaValueList *lis= t, + Error **errp) +{ + StatsSchemaValueList *schema_entry =3D g_new0(StatsSchemaValueList, 1); + schema_entry->value =3D g_new0(StatsSchemaValue, 1); + + switch (pdesc->flags & KVM_STATS_TYPE_MASK) { + case KVM_STATS_TYPE_CUMULATIVE: + schema_entry->value->type =3D STATS_TYPE_CUMULATIVE; + break; + case KVM_STATS_TYPE_INSTANT: + schema_entry->value->type =3D STATS_TYPE_INSTANT; + break; + case KVM_STATS_TYPE_PEAK: + schema_entry->value->type =3D STATS_TYPE_PEAK; + break; + case KVM_STATS_TYPE_LINEAR_HIST: + schema_entry->value->type =3D STATS_TYPE_LINEAR_HISTOGRAM; + schema_entry->value->bucket_size =3D pdesc->bucket_size; + schema_entry->value->has_bucket_size =3D true; + break; + case KVM_STATS_TYPE_LOG_HIST: + schema_entry->value->type =3D STATS_TYPE_LOG2_HISTOGRAM; + break; + default: + goto exit; + } + + switch (pdesc->flags & KVM_STATS_UNIT_MASK) { + case KVM_STATS_UNIT_NONE: + break; + case KVM_STATS_UNIT_BYTES: + schema_entry->value->has_unit =3D true; + schema_entry->value->unit =3D STATS_UNIT_BYTES; + break; + case KVM_STATS_UNIT_CYCLES: + schema_entry->value->has_unit =3D true; + schema_entry->value->unit =3D STATS_UNIT_CYCLES; + break; + case KVM_STATS_UNIT_SECONDS: + schema_entry->value->has_unit =3D true; + schema_entry->value->unit =3D STATS_UNIT_SECONDS; + break; + default: + goto exit; + } + + schema_entry->value->exponent =3D pdesc->exponent; + if (pdesc->exponent) { + switch (pdesc->flags & KVM_STATS_BASE_MASK) { + case KVM_STATS_BASE_POW10: + schema_entry->value->has_base =3D true; + schema_entry->value->base =3D 10; + break; + case KVM_STATS_BASE_POW2: + schema_entry->value->has_base =3D true; + schema_entry->value->base =3D 2; + break; + default: + goto exit; + } + } + + schema_entry->value->name =3D g_strdup(pdesc->name); + schema_entry->next =3D list; + return schema_entry; +exit: + g_free(schema_entry->value); + g_free(schema_entry); + return list; +} + +/* Cached stats descriptors */ +typedef struct StatsDescriptors { + char *ident; /* 'vm' or vCPU qom path */ + struct kvm_stats_desc *kvm_stats_desc; + struct kvm_stats_header *kvm_stats_header; + QTAILQ_ENTRY(StatsDescriptors) next; +} StatsDescriptors; + +static QTAILQ_HEAD(, StatsDescriptors) stats_descriptors =3D + QTAILQ_HEAD_INITIALIZER(stats_descriptors); + +static StatsDescriptors *find_stats_descriptors(StatsTarget target, int st= ats_fd, + Error **errp) +{ + StatsDescriptors *descriptors; + const char *ident; + struct kvm_stats_desc *kvm_stats_desc; + struct kvm_stats_header *kvm_stats_header; + size_t size_desc; + ssize_t ret; + + switch (target) { + case STATS_TARGET_VM: + ident =3D StatsTarget_str(STATS_TARGET_VM); + break; + case STATS_TARGET_VCPU: + ident =3D current_cpu->parent_obj.canonical_path; + break; + default: + abort(); + } + + QTAILQ_FOREACH(descriptors, &stats_descriptors, next) { + if (g_str_equal(descriptors->ident, ident)) { + return descriptors; + } + } + + descriptors =3D g_new0(StatsDescriptors, 1); + + /* Read stats header */ + kvm_stats_header =3D g_malloc(sizeof(*kvm_stats_header)); + ret =3D read(stats_fd, kvm_stats_header, sizeof(*kvm_stats_header)); + if (ret !=3D sizeof(*kvm_stats_header)) { + error_setg(errp, "KVM stats: failed to read stats header: " + "expected %zu actual %zu", + sizeof(*kvm_stats_header), ret); + return NULL; + } + size_desc =3D sizeof(*kvm_stats_desc) + kvm_stats_header->name_size; + + /* Read stats descriptors */ + kvm_stats_desc =3D g_malloc0_n(kvm_stats_header->num_desc, size_desc); + ret =3D pread(stats_fd, kvm_stats_desc, + size_desc * kvm_stats_header->num_desc, + kvm_stats_header->desc_offset); + + if (ret !=3D size_desc * kvm_stats_header->num_desc) { + error_setg(errp, "KVM stats: failed to read stats descriptors: " + "expected %zu actual %zu", + size_desc * kvm_stats_header->num_desc, ret); + g_free(descriptors); + return NULL; + } + descriptors->kvm_stats_header =3D kvm_stats_header; + descriptors->kvm_stats_desc =3D kvm_stats_desc; + descriptors->ident =3D g_strdup(ident); + QTAILQ_INSERT_TAIL(&stats_descriptors, descriptors, next); + return descriptors; +} + +static void query_stats(StatsResultList **result, StatsTarget target, + int stats_fd, Error **errp) +{ + struct kvm_stats_desc *kvm_stats_desc; + struct kvm_stats_header *kvm_stats_header; + StatsDescriptors *descriptors; + g_autofree uint64_t *stats_data =3D NULL; + struct kvm_stats_desc *pdesc; + StatsList *stats_list =3D NULL; + size_t size_desc, size_data =3D 0; + ssize_t ret; + int i; + + descriptors =3D find_stats_descriptors(target, stats_fd, errp); + if (!descriptors) { + return; + } + + kvm_stats_header =3D descriptors->kvm_stats_header; + kvm_stats_desc =3D descriptors->kvm_stats_desc; + size_desc =3D sizeof(*kvm_stats_desc) + kvm_stats_header->name_size; + + /* Tally the total data size; read schema data */ + for (i =3D 0; i < kvm_stats_header->num_desc; ++i) { + pdesc =3D (void *)kvm_stats_desc + i * size_desc; + size_data +=3D pdesc->size * sizeof(*stats_data); + } + + stats_data =3D g_malloc0(size_data); + ret =3D pread(stats_fd, stats_data, size_data, kvm_stats_header->data_= offset); + + if (ret !=3D size_data) { + error_setg(errp, "KVM stats: failed to read data: " + "expected %zu actual %zu", size_data, ret); + return; + } + + for (i =3D 0; i < kvm_stats_header->num_desc; ++i) { + uint64_t *stats; + pdesc =3D (void *)kvm_stats_desc + i * size_desc; + + /* Add entry to the list */ + stats =3D (void *)stats_data + pdesc->offset; + stats_list =3D add_kvmstat_entry(pdesc, stats, stats_list, errp); + } + + if (!stats_list) { + return; + } + + switch (target) { + case STATS_TARGET_VM: + add_stats_entry(result, STATS_PROVIDER_KVM, NULL, stats_list); + break; + case STATS_TARGET_VCPU: + add_stats_entry(result, STATS_PROVIDER_KVM, + current_cpu->parent_obj.canonical_path, + stats_list); + break; + default: + break; + } +} + +static void query_stats_schema(StatsSchemaList **result, StatsTarget targe= t, + int stats_fd, Error **errp) +{ + struct kvm_stats_desc *kvm_stats_desc; + struct kvm_stats_header *kvm_stats_header; + StatsDescriptors *descriptors; + struct kvm_stats_desc *pdesc; + StatsSchemaValueList *stats_list =3D NULL; + size_t size_desc; + int i; + + descriptors =3D find_stats_descriptors(target, stats_fd, errp); + if (!descriptors) { + return; + } + + kvm_stats_header =3D descriptors->kvm_stats_header; + kvm_stats_desc =3D descriptors->kvm_stats_desc; + size_desc =3D sizeof(*kvm_stats_desc) + kvm_stats_header->name_size; + + /* Tally the total data size; read schema data */ + for (i =3D 0; i < kvm_stats_header->num_desc; ++i) { + pdesc =3D (void *)kvm_stats_desc + i * size_desc; + stats_list =3D add_kvmschema_entry(pdesc, stats_list, errp); + } + + add_stats_schema(result, STATS_PROVIDER_KVM, target, stats_list); +} + +static void query_stats_vcpu(CPUState *cpu, run_on_cpu_data data) +{ + StatsArgs *kvm_stats_args =3D (StatsArgs *) data.host_ptr; + int stats_fd =3D kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL); + Error *local_err =3D NULL; + + if (stats_fd =3D=3D -1) { + error_setg_errno(&local_err, errno, "KVM stats: ioctl failed"); + error_propagate(kvm_stats_args->errp, local_err); + return; + } + query_stats(kvm_stats_args->result.stats, STATS_TARGET_VCPU, stats_fd, + kvm_stats_args->errp); + close(stats_fd); +} + +static void query_stats_schema_vcpu(CPUState *cpu, run_on_cpu_data data) +{ + StatsArgs *kvm_stats_args =3D (StatsArgs *) data.host_ptr; + int stats_fd =3D kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL); + Error *local_err =3D NULL; + + if (stats_fd =3D=3D -1) { + error_setg_errno(&local_err, errno, "KVM stats: ioctl failed"); + error_propagate(kvm_stats_args->errp, local_err); + return; + } + query_stats_schema(kvm_stats_args->result.schema, STATS_TARGET_VCPU, s= tats_fd, + kvm_stats_args->errp); + close(stats_fd); +} + +static void query_stats_cb(StatsResultList **result, StatsTarget target, E= rror **errp) +{ + KVMState *s =3D kvm_state; + CPUState *cpu; + int stats_fd; + + switch (target) { + case STATS_TARGET_VM: + { + stats_fd =3D kvm_vm_ioctl(s, KVM_GET_STATS_FD, NULL); + if (stats_fd =3D=3D -1) { + error_setg_errno(errp, errno, "KVM errno, stats: ioctl failed"= ); + return; + } + query_stats(result, target, stats_fd, errp); + close(stats_fd); + break; + } + case STATS_TARGET_VCPU: + { + StatsArgs stats_args; + stats_args.result.stats =3D result; + stats_args.errp =3D errp; + CPU_FOREACH(cpu) { + run_on_cpu(cpu, query_stats_vcpu, RUN_ON_CPU_HOST_PTR(&stats_a= rgs)); + } + break; + } + default: + break; + } +} + +void query_stats_schemas_cb(StatsSchemaList **result, Error **errp) +{ + StatsArgs stats_args; + KVMState *s =3D kvm_state; + int stats_fd; + + stats_fd =3D kvm_vm_ioctl(s, KVM_GET_STATS_FD, NULL); + if (stats_fd =3D=3D -1) { + error_setg(errp, "KVM stats: ioctl failed"); + return; + } + query_stats_schema(result, STATS_TARGET_VM, stats_fd, errp); + close(stats_fd); + + stats_args.result.schema =3D result; + stats_args.errp =3D errp; + run_on_cpu(first_cpu, query_stats_schema_vcpu, RUN_ON_CPU_HOST_PTR(&st= ats_args)); +} diff --git a/qapi/stats.json b/qapi/stats.json index ada0fbf26f..df7c4d886c 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -52,7 +52,7 @@ # Since: 7.1 ## { 'enum': 'StatsProvider', - 'data': [ ] } + 'data': [ 'kvm' ] } =20 ## # @StatsTarget: --=20 2.36.1 From nobody Thu May 9 05:56:55 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923521; cv=none; d=zohomail.com; s=zohoarc; b=X9fxFvssJrFBcqKGpyH5jHGemKwaymOrFEyzlBXAJ4IXPIjWhbNMBXhXVRQ5vZneNEH6NmvNWnAQ+DfAhYP+mz8L4U8B/Zr35vK1nShYqwdaKnVs+dvcyWLDhnxr87FUsNg1Fd8JTM0kP85XgT1cD2acmd6w13ClsRoOmxuEK7A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923521; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hBfkLTsOFcjpKyvtt2m+92TbfqNjDtmmZ3ChO4WnYVE=; b=CWXFAmhLhIRmtXSagAv0S9eLr2VqqphmmLp63uycB+pfFhWUW0flr08IIRf2ZjY+7I/yWRIkVxCX4AYrnoNtacjzoADjVi9mqUCy70tKHG+fOdN6H1hBaOHNGMKzKIf44Gtodx6MPcWgB0R8ivwAJmnRKIaLHApaqrtdn/o1wws= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923521620433.8565213857304; Mon, 30 May 2022 08:12:01 -0700 (PDT) Received: from localhost ([::1]:48644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh3o-0007vc-Kn for importer2@patchew.org; Mon, 30 May 2022 11:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzS-0003SD-9w for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzQ-00062Q-EO for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:29 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-8q08FzzHP_modCDDl8q0Ew-1; Mon, 30 May 2022 11:07:26 -0400 Received: by mail-wr1-f70.google.com with SMTP id g22-20020adfa496000000b002101fcd7c86so1019278wrb.11 for ; Mon, 30 May 2022 08:07:26 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id t22-20020a05600c41d600b003942a244ebesm10436183wmh.3.2022.05.30.08.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923247; 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=hBfkLTsOFcjpKyvtt2m+92TbfqNjDtmmZ3ChO4WnYVE=; b=XAeemTNUt9XApZhDMuLgFm80toh8o/3/jT2hue67W+InXvgqBR/ag7Omg62D5UKu6zWdtj 41qpYI6W7PazDiXRi6n2flSwrpDSGu+UT9GDshx9DjvLV6TSpAvmVOP0YC43Cuw+Te8AcN Qxbanf3lFMfsShQ8Q3yKIf7oYrPDzpQ= X-MC-Unique: 8q08FzzHP_modCDDl8q0Ew-1 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=hBfkLTsOFcjpKyvtt2m+92TbfqNjDtmmZ3ChO4WnYVE=; b=nW7AulHmnHYQRBPgpC6o6UgcJ7eMUGc7e5cXR7OSC/2xZ9Y83twkqz2OdMwFdvROJL gUGVmTlRqqhqTmvkYjT/xLFKo2+0pd/v6BZ7Nht4UxNpys4jGsac5oUt272JjdlS6a37 64wx/5p9sFvuMHZCulLD5f1CGxxpPWrYvtP92M/xknvuJk1XCOIpLqTpt9CHQjKRZzdg vW9RcexItZfa+Ot5Dao9lmkFaS/fS6PYc6EZfJx6HjhUYKvINKD1LFC3+/4EmKmRaWSA DHHp3tk9uyFciHmHwdXYyh25Z5Cg62calFC8ZhfGTmcvpZ1m2nFyJA1Oz2zjLrH42BF+ n7bQ== X-Gm-Message-State: AOAM530WulxnUxWTTs4d4sDTpFek5Bktlx72fIWc6paApM8PTCfdGpKW un0GImVhuPbOu/uzjOi7AWk+gjDl/7LHFixUsYEeyqQ8RbV6L+a2/BVRs3MHEvLcb0G7WcqFrxX 6e8FjDwnXUWM4OTKyl3HfadioufQUpPUm09NiALJ2UR2b/PCStvGFkp7pY1XN216bQY8= X-Received: by 2002:adf:fb0d:0:b0:20d:97e:17ce with SMTP id c13-20020adffb0d000000b0020d097e17cemr47761133wrr.585.1653923244666; Mon, 30 May 2022 08:07:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPl+5/lJGAqclbO/EOAbmcmFdpqAiHweDsE217sw7xjd15dVZkHMwYygQ5z96B9lwDk4tSsg== X-Received: by 2002:adf:fb0d:0:b0:20d:97e:17ce with SMTP id c13-20020adffb0d000000b0020d097e17cemr47761098wrr.585.1653923244250; Mon, 30 May 2022 08:07:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 03/10] qmp: add filtering of statistics by target vCPU Date: Mon, 30 May 2022 17:07:07 +0200 Message-Id: <20220530150714.756954-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923523393100001 Content-Type: text/plain; charset="utf-8" Introduce a simple filtering of statistics, that allows to retrieve statistics for a subset of the guest vCPUs. This will be used for example by the HMP monitor, in order to retrieve the statistics for the currently selected CPU. Example: { "execute": "query-stats", "arguments": { "target": "vcpu", "vcpus": [ "/machine/unattached/device[2]", "/machine/unattached/device[4]" ] } } Extracted from a patch by Mark Kanda. Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- I left the Reviewed-by here as well. accel/kvm/kvm-all.c | 9 +++++++-- include/monitor/stats.h | 11 ++++++++++- monitor/qmp-cmds.c | 34 +++++++++++++++++++++++++++++++++- qapi/stats.json | 24 +++++++++++++++++++----- 4 files changed, 69 insertions(+), 9 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index c027536419..d75fb3d95c 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2311,7 +2311,8 @@ bool kvm_dirty_ring_enabled(void) return kvm_state->kvm_dirty_ring_size ? true : false; } =20 -static void query_stats_cb(StatsResultList **result, StatsTarget target, E= rror **errp); +static void query_stats_cb(StatsResultList **result, StatsTarget target, + strList *targets, Error **errp); static void query_stats_schemas_cb(StatsSchemaList **result, Error **errp); =20 static int kvm_init(MachineState *ms) @@ -4043,7 +4044,8 @@ static void query_stats_schema_vcpu(CPUState *cpu, ru= n_on_cpu_data data) close(stats_fd); } =20 -static void query_stats_cb(StatsResultList **result, StatsTarget target, E= rror **errp) +static void query_stats_cb(StatsResultList **result, StatsTarget target, + strList *targets, Error **errp) { KVMState *s =3D kvm_state; CPUState *cpu; @@ -4067,6 +4069,9 @@ static void query_stats_cb(StatsResultList **result, = StatsTarget target, Error * stats_args.result.stats =3D result; stats_args.errp =3D errp; CPU_FOREACH(cpu) { + if (!apply_str_list_filter(cpu->parent_obj.canonical_path, tar= gets)) { + continue; + } run_on_cpu(cpu, query_stats_vcpu, RUN_ON_CPU_HOST_PTR(&stats_a= rgs)); } break; diff --git a/include/monitor/stats.h b/include/monitor/stats.h index 912eeadb2f..8c50feeaa9 100644 --- a/include/monitor/stats.h +++ b/include/monitor/stats.h @@ -11,7 +11,7 @@ #include "qapi/qapi-types-stats.h" =20 typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target, - Error **errp); + strList *targets, Error **errp); typedef void SchemaRetrieveFunc(StatsSchemaList **result, Error **errp); =20 /* @@ -31,4 +31,13 @@ void add_stats_entry(StatsResultList **, StatsProvider, = const char *id, void add_stats_schema(StatsSchemaList **, StatsProvider, StatsTarget, StatsSchemaValueList *); =20 +/* + * True if a string matches the filter passed to the stats_fn callabck, + * false otherwise. + * + * Note that an empty list means no filtering, i.e. all strings will + * return true. + */ +bool apply_str_list_filter(const char *string, strList *list); + #endif /* STATS_H */ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index a6ac8d7473..5f8f1e620b 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -468,9 +468,26 @@ static bool invoke_stats_cb(StatsCallbacks *entry, StatsFilter *filter, Error **errp) { + strList *targets =3D NULL; ERRP_GUARD(); =20 - entry->stats_cb(stats_results, filter->target, errp); + switch (filter->target) { + case STATS_TARGET_VM: + break; + case STATS_TARGET_VCPU: + if (filter->u.vcpu.has_vcpus) { + if (!filter->u.vcpu.vcpus) { + /* No targets allowed? Return no statistics. */ + return true; + } + targets =3D filter->u.vcpu.vcpus; + } + break; + default: + abort(); + } + + entry->stats_cb(stats_results, filter->target, targets, errp); if (*errp) { qapi_free_StatsResultList(*stats_results); *stats_results =3D NULL; @@ -536,3 +553,18 @@ void add_stats_schema(StatsSchemaList **schema_results, entry->stats =3D stats_list; QAPI_LIST_PREPEND(*schema_results, entry); } + +bool apply_str_list_filter(const char *string, strList *list) +{ + strList *str_list =3D NULL; + + if (!list) { + return true; + } + for (str_list =3D list; str_list; str_list =3D str_list->next) { + if (g_str_equal(string, str_list->value)) { + return true; + } + } + return false; +} diff --git a/qapi/stats.json b/qapi/stats.json index df7c4d886c..8c9abb57f1 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -70,15 +70,29 @@ 'data': [ 'vm', 'vcpu' ] } =20 ## -# @StatsFilter: +# @StatsVCPUFilter: # -# The arguments to the query-stats command; specifies a target for which to -# request statistics. +# @vcpus: list of QOM paths for the desired vCPU objects. # # Since: 7.1 ## -{ 'struct': 'StatsFilter', - 'data': { 'target': 'StatsTarget' } } +{ 'struct': 'StatsVCPUFilter', + 'data': { '*vcpus': [ 'str' ] } } + +## +# @StatsFilter: +# +# The arguments to the query-stats command; specifies a target for which to +# request statistics and optionally the required subset of information for +# that target: +# - which vCPUs to request statistics for +# +# Since: 7.1 +## +{ 'union': 'StatsFilter', + 'base': { 'target': 'StatsTarget' }, + 'discriminator': 'target', + 'data': { 'vcpu': 'StatsVCPUFilter' } } =20 ## # @StatsValue: --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923783; cv=none; d=zohomail.com; s=zohoarc; b=HFpYplTWo30BWonfUXOushWPgVkQ+jD7+2bHUWQHThH6kMpA+S4YQBIPIdWKjHvWLWmhIqEMmrwHSYcUbJtFoyogSUWX5gfWLzRP+x0rnh48ZUeEoOdnPGmJjCG7XnlO8QgxYuDc2Ni+umStDgZvhwMo84qVyh3+tyg21ZC12Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923783; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nGpuekABlEoAYzo64DJQwTob3NuYJjKbcyJimxkE0jQ=; b=iLw0vBPNw1nK2yMOa78gh5r41td3QXdBnKkFcovok31sniUsm0jIl0FnIipJAu3jsGLwDOZlZ9xNDyQTwbY+1b7OqzXEWi5/8ytzolZgTSLLlOin8mAt69iXe7yKXk4QhbXajEKw5UJGS4guEhhJiYkpsKC3koe8A0NWBZCHtLY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923783765834.2299647188405; Mon, 30 May 2022 08:16:23 -0700 (PDT) Received: from localhost ([::1]:55054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh82-0003oz-NR for importer2@patchew.org; Mon, 30 May 2022 11:16:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzU-0003Ui-Bk for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzS-00062c-0r for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:31 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-114-Tpzj-GmmORqWmRmvc8wd5Q-1; Mon, 30 May 2022 11:07:28 -0400 Received: by mail-ed1-f71.google.com with SMTP id t14-20020a056402020e00b0042bd6f4467cso8242906edv.9 for ; Mon, 30 May 2022 08:07:27 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id r22-20020a170906365600b006f3ef214dbesm4083659ejb.36.2022.05.30.08.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923249; 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=nGpuekABlEoAYzo64DJQwTob3NuYJjKbcyJimxkE0jQ=; b=CMHtFi7LPAMmexoRCUFnMt1juZKAaItbIsCjeRdNa38xdv9E9PeoebtB4LBUisHS6ZU4fX g3Mssy/QG0nYWa2w6rpX25DNHLMG6VL/sHjjT7SIVQtaF1N6Oh3mwEwNfOvtDaKKwXiX6N 3Y5aH9wS8Mc2d/XFApR9z704LoOoFAA= X-MC-Unique: Tpzj-GmmORqWmRmvc8wd5Q-1 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=nGpuekABlEoAYzo64DJQwTob3NuYJjKbcyJimxkE0jQ=; b=u6UZt8/4TR09OiYlaxFSl2Z83xGu0uLJkF44F2Ya5mthuLFlD1MrVljvCRHZ5Dp7WY 5VCtlfA/GluOxkAPZtmo2N8jW4GRJwtQS/Q/8MKfOUvmmSzdCYdjuhQrn9gnvgRFxpsD pwSCeAwiqF/MEl9E/Cz3dZwKiqgSbd+P+hesoYByJEP3Y1gtMqfTn8qN/zmv71a3N9aM K4iScNHPREXjDywG867F8dkaPlaHYqv7K2HR7q4HN/yZd+278ARhvnjSCY1X+ZXnsKlp aTcWJHLaG4Hfs9B8ZWQ90enKnWER6TJNPMIqSxT2GCyGSI+tgMRlQ6LFqKO1pbJOi7ms L/6Q== X-Gm-Message-State: AOAM531SY46QyoSfMuS1/4IBBoBcxgU0PQNYuiwTmD+RuFBygp1+wj6J CQ34D3pYxGb7wuK//IAz1zh9mbJ/QcKQv5cpCxe8EvJsHTUDmj188BCzLu0RcF3WjrT40rZ5gFg 1Y9RPxEXm8vV6I88DsxbIJCnmFftuc1+WH03Ei/0IW2CsOSiK7YSkb+aur7/KOnCChwU= X-Received: by 2002:a05:6402:b3b:b0:42b:fbec:7807 with SMTP id bo27-20020a0564020b3b00b0042bfbec7807mr18717066edb.420.1653923246674; Mon, 30 May 2022 08:07:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzONto5JWucFCPG/cKTD1gARKwxofSa7TkFs3l8zASKA5DV7H3xqlHzuoZdzen6TrhmwIbRqg== X-Received: by 2002:a05:6402:b3b:b0:42b:fbec:7807 with SMTP id bo27-20020a0564020b3b00b0042bfbec7807mr18717042edb.420.1653923246381; Mon, 30 May 2022 08:07:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 04/10] cutils: fix case for "kilo" and "kibi" Date: Mon, 30 May 2022 17:07:08 +0200 Message-Id: <20220530150714.756954-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923784860100001 Content-Type: text/plain; charset="utf-8" The correct abbreviations use a lowercase k, so adjust freq_to_str and size_to_str accordingly and add tests. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/unit/test-cutils.c | 20 ++++++++++++++++++++ util/cutils.c | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 98671f1ac3..783127ff0e 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -2450,6 +2450,22 @@ static void test_qemu_strtosz_metric(void) g_assert(endptr =3D=3D str + 7); } =20 +static void test_freq_to_str(void) +{ + g_assert_cmpstr(freq_to_str(999), =3D=3D, "999 Hz"); + g_assert_cmpstr(freq_to_str(1000), =3D=3D, "1 kHz"); + g_assert_cmpstr(freq_to_str(1010), =3D=3D, "1.01 kHz"); +} + +static void test_size_to_str(void) +{ + g_assert_cmpstr(size_to_str(0), =3D=3D, "0 B"); + g_assert_cmpstr(size_to_str(1), =3D=3D, "1 B"); + g_assert_cmpstr(size_to_str(1016), =3D=3D, "0.992 kiB"); + g_assert_cmpstr(size_to_str(1024), =3D=3D, "1 kiB"); + g_assert_cmpstr(size_to_str(512ull << 20), =3D=3D, "512 MiB"); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); @@ -2729,5 +2745,9 @@ int main(int argc, char **argv) g_test_add_func("/cutils/strtosz/metric", test_qemu_strtosz_metric); =20 + g_test_add_func("/cutils/size_to_str", + test_size_to_str); + g_test_add_func("/cutils/freq_to_str", + test_freq_to_str); return g_test_run(); } diff --git a/util/cutils.c b/util/cutils.c index a58bcfd80e..19fb4d04f8 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -875,12 +875,12 @@ int parse_debug_env(const char *name, int max, int in= itial) /* * Return human readable string for size @val. * @val can be anything that uint64_t allows (no more than "16 EiB"). - * Use IEC binary units like KiB, MiB, and so forth. + * Use IEC binary units like kiB, MiB, and so forth. * Caller is responsible for passing it to g_free(). */ char *size_to_str(uint64_t val) { - static const char *suffixes[] =3D { "", "Ki", "Mi", "Gi", "Ti", "Pi", = "Ei" }; + static const char *suffixes[] =3D { "", "ki", "Mi", "Gi", "Ti", "Pi", = "Ei" }; uint64_t div; int i; =20 @@ -899,7 +899,7 @@ char *size_to_str(uint64_t val) =20 char *freq_to_str(uint64_t freq_hz) { - static const char *const suffixes[] =3D { "", "K", "M", "G", "T", "P",= "E" }; + static const char *const suffixes[] =3D { "", "k", "M", "G", "T", "P",= "E" }; double freq =3D freq_hz; size_t idx =3D 0; =20 --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923942; cv=none; d=zohomail.com; s=zohoarc; b=JhXLc7EH4gCXfdPo9dNKXDMZdWpwdseu+T9/CFpMcPyUGQ4qinL5FFQYUIvNUe94FLCnX3vEh2iiLMgZXyo8y3W5huWvI3lBjTgCPnsRzUreAB8UCwKk0sjrmEKQCL4m2ZEncoBlBSvO5ojK5fX15cGtNxIocs8hwYYymIRNhXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aoQ+nsqCtzbS0+oLdSKIRurF/kVBlUkg6b7i2gTEzh0=; b=fUjTfKIntXFvOiMmThfBUdciXad/sUFF9KNBY7VAYKtXF6EzLnG0ZSFaC5gkgj0SoJoLjl0ktdfYRn1wwga5I/GUEvumIwg8MThdn+k/o74D/toX37PKmBcBdAnswPS1KR3XRXCsQh6libnxMU3ZaQ7EZC+VbQK+LV3wPZq5Wjo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923942973171.56416539482484; Mon, 30 May 2022 08:19:02 -0700 (PDT) Received: from localhost ([::1]:35062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvhAb-00018s-W4 for importer2@patchew.org; Mon, 30 May 2022 11:19:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzW-0003Xy-FL for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:34 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzU-00062r-O1 for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:34 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-492-zjQcTL2CMxmCVgGTXGzrzw-1; Mon, 30 May 2022 11:07:31 -0400 Received: by mail-wr1-f70.google.com with SMTP id g22-20020adfa496000000b002101fcd7c86so1019341wrb.11 for ; Mon, 30 May 2022 08:07:30 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id y3-20020adffa43000000b0020d07d90b71sm6701239wrr.66.2022.05.30.08.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923252; 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=aoQ+nsqCtzbS0+oLdSKIRurF/kVBlUkg6b7i2gTEzh0=; b=HRsHIL0WAtI+1Wi2UlJPYbKEIURfwRssWyyTJfIkWJSaF+oP8h3WRyXdomI01CyiJfDCB7 +dmdBhAmDh7eN14AcLkrCTN9jXLk+1gXGY/RdQHA4oO7pEUA1Zd08+mmJTNYX2taiyEwh5 o3Juk4Y/zyYmbIOBGonJjOjkWsESGqw= X-MC-Unique: zjQcTL2CMxmCVgGTXGzrzw-1 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=aoQ+nsqCtzbS0+oLdSKIRurF/kVBlUkg6b7i2gTEzh0=; b=JSnIHj+kDMHN4mAmrLTbBiE0uk34Jg8oI0w7fDIhjSldvbxmkOBe7tXUPSkIFxWjM7 pJSv4LZ6+bpSVxsOgFxE0mCAcZgGwe1z3w1S9AcmIXpi0+LE4T/5Q6INyB+J5KOSd5kb /TGoT0AGpIqz8Y1to1/9ZVW/2H+xnrL8EIcxom/WXb17nZGpaQAAg9l2Nh7tyKZ1RcOz 3W3nHFkBTMD1OBr5yrfQXn8DipOFRhg1eTIWsc5uXaqUUu4swAy/kRJFqi0aTco84U6e BthF80ORrtNJsS/xzwnNTkMV2NGcYeCviMM6JnhHTvucebadXW6MBsXEGf/pvXk0W8Jb K9dw== X-Gm-Message-State: AOAM530U+VpVzM56sNSpzWSsARqv0H6NuKNOZX/vOXReSzds7rCjD80+ vVo4R0xvrYh9WKI41ovLmL/LEpUSxD2uxOIjEaVaIqejdxwtplTcOLYGk4OEn1YhubMLD8IXLGC 8wsgk0HJf2mXuOVG3cG6SwUVasdi5ftV+zV0G1HmHDXZDEuv3LH4bvNwqz2AEKkpdriA= X-Received: by 2002:a1c:f213:0:b0:39b:ad32:5e51 with SMTP id s19-20020a1cf213000000b0039bad325e51mr6613180wmc.72.1653923249179; Mon, 30 May 2022 08:07:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzskEMqIrC1DFFUb2Za5+RHiUSPb9c9ryRJ+T3ZQhXZB7iyNdJZt9r2ytK6MdOIF/VoT8/arA== X-Received: by 2002:a1c:f213:0:b0:39b:ad32:5e51 with SMTP id s19-20020a1cf213000000b0039bad325e51mr6613144wmc.72.1653923248679; Mon, 30 May 2022 08:07:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 05/10] cutils: add functions for IEC and SI prefixes Date: Mon, 30 May 2022 17:07:09 +0200 Message-Id: <20220530150714.756954-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923944751100003 Content-Type: text/plain; charset="utf-8" Extract the knowledge of IEC and SI prefixes out of size_to_str and freq_to_str, so that it can be reused when printing statistics. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/cutils.h | 18 ++++++++++++++++++ tests/unit/test-cutils.c | 32 ++++++++++++++++++++++++++++++++ util/cutils.c | 34 +++++++++++++++++++++++++--------- 3 files changed, 75 insertions(+), 9 deletions(-) diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 40e10e19a7..d3e532b64c 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -1,6 +1,24 @@ #ifndef QEMU_CUTILS_H #define QEMU_CUTILS_H =20 +/* + * si_prefix: + * @exp10: exponent of 10, a multiple of 3 between -18 and 18 inclusive. + * + * Return a SI prefix (n, u, m, K, M, etc.) corresponding + * to the given exponent of 10. + */ +const char *si_prefix(unsigned int exp10); + +/* + * iec_binary_prefix: + * @exp2: exponent of 2, a multiple of 10 between 0 and 60 inclusive. + * + * Return an IEC binary prefix (Ki, Mi, etc.) corresponding + * to the given exponent of 2. + */ +const char *iec_binary_prefix(unsigned int exp2); + /** * pstrcpy: * @buf: buffer to copy string into diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c index 783127ff0e..5696ce94de 100644 --- a/tests/unit/test-cutils.c +++ b/tests/unit/test-cutils.c @@ -2466,6 +2466,34 @@ static void test_size_to_str(void) g_assert_cmpstr(size_to_str(512ull << 20), =3D=3D, "512 MiB"); } =20 +static void test_iec_binary_prefix(void) +{ + g_assert_cmpstr(iec_binary_prefix(0), =3D=3D, ""); + g_assert_cmpstr(iec_binary_prefix(10), =3D=3D, "ki"); + g_assert_cmpstr(iec_binary_prefix(20), =3D=3D, "Mi"); + g_assert_cmpstr(iec_binary_prefix(30), =3D=3D, "Gi"); + g_assert_cmpstr(iec_binary_prefix(40), =3D=3D, "Ti"); + g_assert_cmpstr(iec_binary_prefix(50), =3D=3D, "Pi"); + g_assert_cmpstr(iec_binary_prefix(60), =3D=3D, "Ei"); +} + +static void test_si_prefix(void) +{ + g_assert_cmpstr(si_prefix(-18), =3D=3D, "a"); + g_assert_cmpstr(si_prefix(-15), =3D=3D, "f"); + g_assert_cmpstr(si_prefix(-12), =3D=3D, "p"); + g_assert_cmpstr(si_prefix(-9), =3D=3D, "n"); + g_assert_cmpstr(si_prefix(-6), =3D=3D, "u"); + g_assert_cmpstr(si_prefix(-3), =3D=3D, "m"); + g_assert_cmpstr(si_prefix(0), =3D=3D, ""); + g_assert_cmpstr(si_prefix(3), =3D=3D, "k"); + g_assert_cmpstr(si_prefix(6), =3D=3D, "M"); + g_assert_cmpstr(si_prefix(9), =3D=3D, "G"); + g_assert_cmpstr(si_prefix(12), =3D=3D, "T"); + g_assert_cmpstr(si_prefix(15), =3D=3D, "P"); + g_assert_cmpstr(si_prefix(18), =3D=3D, "E"); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); @@ -2749,5 +2777,9 @@ int main(int argc, char **argv) test_size_to_str); g_test_add_func("/cutils/freq_to_str", test_freq_to_str); + g_test_add_func("/cutils/iec_binary_prefix", + test_iec_binary_prefix); + g_test_add_func("/cutils/si_prefix", + test_si_prefix); return g_test_run(); } diff --git a/util/cutils.c b/util/cutils.c index 19fb4d04f8..485e9b0cea 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -872,6 +872,25 @@ int parse_debug_env(const char *name, int max, int ini= tial) return debug; } =20 +const char *si_prefix(unsigned int exp10) +{ + static const char *prefixes[] =3D { + "a", "f", "p", "n", "u", "m", "", "k", "M", "G", "T", "P", "E" + }; + + exp10 +=3D 18; + assert(exp10 % 3 =3D=3D 0 && exp10 / 3 < ARRAY_SIZE(prefixes)); + return prefixes[exp10 / 3]; +} + +const char *iec_binary_prefix(unsigned int exp2) +{ + static const char *prefixes[] =3D { "", "ki", "Mi", "Gi", "Ti", "Pi", = "Ei" }; + + assert(exp2 % 10 =3D=3D 0 && exp2 / 10 < ARRAY_SIZE(prefixes)); + return prefixes[exp2 / 10]; +} + /* * Return human readable string for size @val. * @val can be anything that uint64_t allows (no more than "16 EiB"). @@ -880,7 +899,6 @@ int parse_debug_env(const char *name, int max, int init= ial) */ char *size_to_str(uint64_t val) { - static const char *suffixes[] =3D { "", "ki", "Mi", "Gi", "Ti", "Pi", = "Ei" }; uint64_t div; int i; =20 @@ -891,25 +909,23 @@ char *size_to_str(uint64_t val) * (see e41b509d68afb1f for more info) */ frexp(val / (1000.0 / 1024.0), &i); - i =3D (i - 1) / 10; - div =3D 1ULL << (i * 10); + i =3D (i - 1) / 10 * 10; + div =3D 1ULL << i; =20 - return g_strdup_printf("%0.3g %sB", (double)val / div, suffixes[i]); + return g_strdup_printf("%0.3g %sB", (double)val / div, iec_binary_pref= ix(i)); } =20 char *freq_to_str(uint64_t freq_hz) { - static const char *const suffixes[] =3D { "", "k", "M", "G", "T", "P",= "E" }; double freq =3D freq_hz; - size_t idx =3D 0; + size_t exp10 =3D 0; =20 while (freq >=3D 1000.0) { freq /=3D 1000.0; - idx++; + exp10 +=3D 3; } - assert(idx < ARRAY_SIZE(suffixes)); =20 - return g_strdup_printf("%0.3g %sHz", freq, suffixes[idx]); + return g_strdup_printf("%0.3g %sHz", freq, si_prefix(exp10)); } =20 int qemu_pstrcmp0(const char **str1, const char **str2) --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923773; cv=none; d=zohomail.com; s=zohoarc; b=BwwPMggtWY+qe+4Z/6DncI1Ox5vtRURPCNZ6IxKUtLCS3KsyexU/TM+90ak1LvUJPuoRKnlTWAJSA8tDOZr89YufmMzB4AOjmvpgXsZzz+5Fn8hbO7DxpdmzynPtCgTvefgCSj57LYCOsXKv82RiNrB5WTRAMZAc77OGf0aO7sU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923773; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SogE1l02KogvUO/2yTSaAwaw8oXDpfL2EYKwUvlNF/w=; b=nDmbT7wNhetEpdDb8d8beZq7WAcGvcJY/RoukiW50QvHy9sA2mOvkaRyjsDV4f8tpKWjVmaiY7J783PfiQkG0wzcqYCUgTb/QYj+vOriHvJKxIlx7PWf3/LMUulKW1zazrtYlI1QHKBoBxvx2k2/7JbJ/hb4a+BlOgQfmt7sCcY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923773138936.6993301736047; Mon, 30 May 2022 08:16:13 -0700 (PDT) Received: from localhost ([::1]:54734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh7q-0003bd-4D for importer2@patchew.org; Mon, 30 May 2022 11:16:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzb-0003cD-EC for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzY-000639-Rg for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:38 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-MCSAHVBnPK6_iBCSc-A72Q-1; Mon, 30 May 2022 11:07:32 -0400 Received: by mail-ed1-f72.google.com with SMTP id k7-20020aa7d8c7000000b0042dd4a5a393so1661920eds.11 for ; Mon, 30 May 2022 08:07:32 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id j23-20020a170906411700b006feb6438264sm4146481ejk.93.2022.05.30.08.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923256; 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=SogE1l02KogvUO/2yTSaAwaw8oXDpfL2EYKwUvlNF/w=; b=TnXRtdHtIVmyOYeg9B1bnyJzBsnbQGwA8Eknnihxqv4WptdsAkdyVBtHxbPn51Q0TkIDZP 9DvTG5uAZEThiHMo+96rxTXuwyqHzjV5RhYiNCRM1BdgBOtw83PQMZzPF7Rd7FlVQsOqrC GP2N4dtuqgs/AtCbf3Q06ln0ZOkFUwM= X-MC-Unique: MCSAHVBnPK6_iBCSc-A72Q-1 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=SogE1l02KogvUO/2yTSaAwaw8oXDpfL2EYKwUvlNF/w=; b=cxtFuU4sacuT2TX3m6ppwr+oA27ivIyQDAz4kjYtKd/iRaF18n5sgbPV5hDIJ9R7x1 Q2YTANjIQH/5k5u+OWM6+SsrlpogXYTTofGP+DgyaOz06C8jMgUUv8fE/5SMY7+4ysh0 HqOJi+gPkX2HOVzrA0yz19rY2C90fh4ntwKTvSFMADMM1ZAjEfPQkxYdr+/Age/v0Nhl MdTzfHMDJ+QCkuScu9PvCq/G8S+tQDtV0tOoIjdP7yegCRW9BS+PPjM0Vb7aVUXZA3Qx z95ncvaQQjZXBaBL2jwjJ0A+sIf7r/GyuulwEai5FNNM5xOFgqMTBUUYJritAfU69fpL pYTQ== X-Gm-Message-State: AOAM530KW3S3AlPg4Nr3ubX1144bGOraDaH1e5mvlFzIf/ZaqpmGCrH/ VKARPyJXH6fc8ErHsPtjzupxmsrXO4+hul3awG904dik4fh7hQrhv3fjuXqHQO/12e90fW3Ne6O jgLEZ6yWSpanOeEJmUyCmmErDy6MlXYVNRf49aIvz6gTZDYjn+p1jKme9hWhbygXm9N4= X-Received: by 2002:a17:907:94ca:b0:6fe:c28b:7cb2 with SMTP id dn10-20020a17090794ca00b006fec28b7cb2mr38402947ejc.625.1653923251105; Mon, 30 May 2022 08:07:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrn09srnXVHT6EDaAiafVPSPmbUFHMR/TVMiJZndtfG11ziA+ohFtFUXTZzdhujc9VItc3Dw== X-Received: by 2002:a17:907:94ca:b0:6fe:c28b:7cb2 with SMTP id dn10-20020a17090794ca00b006fec28b7cb2mr38402917ejc.625.1653923250723; Mon, 30 May 2022 08:07:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v5 06/10] hmp: add basic "info stats" implementation Date: Mon, 30 May 2022 17:07:10 +0200 Message-Id: <20220530150714.756954-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923774812100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Dr. David Alan Gilbert --- hmp-commands-info.hx | 13 +++ include/monitor/hmp.h | 1 + monitor/hmp-cmds.c | 190 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 204 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 834bed089e..28757768f7 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 =3D "stats", + .args_type =3D "target:s", + .params =3D "target", + .help =3D "show statistics; target is either vm or vcpu", + .cmd =3D 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 *qdi= ct); void hmp_calc_dirty_rate(Monitor *mon, const QDict *qdict); void hmp_human_readable_text_helper(Monitor *mon, HumanReadableText *(*qmp_handler)(Erro= r **)); +void hmp_info_stats(Monitor *mon, const QDict *qdict); =20 #endif diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 622c783c32..55b83c0a3a 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" @@ -2239,3 +2241,191 @@ void hmp_info_memory_size_summary(Monitor *mon, con= st QDict *qdict) } hmp_handle_error(mon, err); } + +static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value) +{ + const char *unit =3D NULL; + monitor_printf(mon, " %s (%s%s", value->name, StatsType_str(value->= type), + value->has_unit || value->exponent ? ", " : ""); + + if (value->has_unit) { + if (value->unit =3D=3D STATS_UNIT_SECONDS) { + unit =3D "s"; + } else if (value->unit =3D=3D STATS_UNIT_BYTES) { + unit =3D "B"; + } + } + + if (unit && value->base =3D=3D 10 && + value->exponent >=3D -9 && value->exponent <=3D 0 && + value->exponent % 3 =3D=3D 0) { + monitor_printf(mon, "%s", si_prefix(value->exponent)); + } else if (unit && value->base =3D=3D 2 && + value->exponent >=3D 0 && value->exponent <=3D 40 && + value->exponent % 10 =3D=3D 0) { + + monitor_printf(mon, "%s", iec_binary_prefix(value->exponent)); + } else if (value->exponent) { + /* Use exponential notation and write the unit's English name */ + monitor_printf(mon, "* %d^%d%s", + value->base, value->exponent, + value->has_unit ? " " : ""); + unit =3D NULL; + } + + if (value->has_unit) { + monitor_printf(mon, "%s", unit ? unit : StatsUnit_str(value->unit)= ); + } + + /* Print bucket size for linear histograms */ + if (value->type =3D=3D STATS_TYPE_LINEAR_HISTOGRAM && value->has_bucke= t_size) { + monitor_printf(mon, ", bucket size=3D%d", value->bucket_size); + } + monitor_printf(mon, ")"); +} + +static StatsSchemaValueList *find_schema_value_list( + StatsSchemaList *list, StatsProvider provider, + StatsTarget target) +{ + StatsSchemaList *node; + + for (node =3D list; node; node =3D node->next) { + if (node->value->provider =3D=3D provider && + node->value->target =3D=3D 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 =3D + 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 =3D result->stats; stats_list; + stats_list =3D stats_list->next, + schema_value_list =3D schema_value_list->next) { + + Stats *stats =3D stats_list->value; + StatsValue *stats_value =3D stats->value; + StatsSchemaValue *schema_value =3D 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 =3D schema_value_list->next; + schema_value =3D schema_value_list->value; + } + + print_stats_schema_value(mon, schema_value); + + if (stats_value->type =3D=3D QTYPE_QNUM) { + monitor_printf(mon, ": %" PRId64 "\n", stats_value->u.scalar); + } else if (stats_value->type =3D=3D QTYPE_QLIST) { + uint64List *list; + int i; + + monitor_printf(mon, ": "); + for (list =3D stats_value->u.list, i =3D 1; + list; + list =3D list->next, i++) { + monitor_printf(mon, "[%d]=3D%" 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 =3D g_malloc0(sizeof(*filter)); + + filter->target =3D target; + switch (target) { + case STATS_TARGET_VM: + break; + case STATS_TARGET_VCPU: + { + strList *vcpu_list =3D NULL; + CPUState *cpu =3D qemu_get_cpu(cpu_index); + char *canonical_path =3D object_get_canonical_path(OBJECT(cpu)); + + QAPI_LIST_PREPEND(vcpu_list, canonical_path); + filter->u.vcpu.has_vcpus =3D true; + filter->u.vcpu.vcpus =3D vcpu_list; + break; + } + default: + break; + } + return filter; +} + +void hmp_info_stats(Monitor *mon, const QDict *qdict) +{ + const char *target_str =3D qdict_get_str(qdict, "target"); + StatsTarget target; + Error *err =3D NULL; + g_autoptr(StatsSchemaList) schema =3D NULL; + g_autoptr(StatsResultList) stats =3D NULL; + g_autoptr(StatsFilter) filter =3D NULL; + StatsResultList *entry; + + target =3D 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 =3D qmp_query_stats_schemas(&err); + if (err) { + goto exit; + } + + switch (target) { + case STATS_TARGET_VM: + filter =3D stats_filter(target, -1); + break; + case STATS_TARGET_VCPU: {} + int cpu_index =3D monitor_get_cpu_index(mon); + filter =3D stats_filter(target, cpu_index); + break; + default: + abort(); + } + + stats =3D qmp_query_stats(filter, &err); + if (err) { + goto exit; + } + for (entry =3D stats; entry; entry =3D 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); +} --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653924150; cv=none; d=zohomail.com; s=zohoarc; b=eRAt0lmDE+6zpBanI/pi4MHtukygH+DDKVw7sj6m00WuVgd8FyaOKETqbk0LXsXbqrhJ0aDwnTgaDxwL+FdZoGU64EdMqNN00N5lmaikiuTlnQsxan92/Npoa6bfOAAeF93t8SOkJMTCdEkNiPINh93MEs4UzqDLnROP8HbBEpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653924150; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TFPZ2k/bmm+Ic6xtT8Sh78Acp/ic9AXaTz3rbiRPIkU=; b=HWPDlqOoAScT+iUhvJV5dTOlxrYQZQOlEBDM7FZwF+4wGMISvIEJ+SymJtgDWwpdHED5uP4dOwhr6lzcXUY0hZGOWybW1RpcPdTO1a8Ro30ToLpibxlTbDQHrG+p9+9ujnxbXs82lJWACpZA7q9Zx8EaOr1ExZmXG9KClN1+OjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653924150850218.01120027914556; Mon, 30 May 2022 08:22:30 -0700 (PDT) Received: from localhost ([::1]:43610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvhDx-00072w-Bc for importer2@patchew.org; Mon, 30 May 2022 11:22:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzZ-0003ay-HJ for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzX-000635-Iu for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:37 -0400 Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-554-alIh_N9oOTu1eRsUGKjZsA-1; Mon, 30 May 2022 11:07:34 -0400 Received: by mail-ed1-f71.google.com with SMTP id a4-20020a056402168400b0042dc5b94da6so3798939edv.10 for ; Mon, 30 May 2022 08:07:33 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id i10-20020a1709064eca00b006fe0abb00f0sm4131941ejv.209.2022.05.30.08.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923255; 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=TFPZ2k/bmm+Ic6xtT8Sh78Acp/ic9AXaTz3rbiRPIkU=; b=df6Ihjamib4pcSHI7sYcXtpynIGVv8SXrkd73kRB60JvbGy9aSXcfAMMRC56npbMvNshwr SmZYroKf2DUJ+F6NfKUVpOjExuGMbWBdosyUs/h3xeYfJ5q+m45aB1KCi90CIGj6CUSOuN Y2//ASa/Fm6+SfPs3LC0HF/4JyOZskw= X-MC-Unique: alIh_N9oOTu1eRsUGKjZsA-1 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=TFPZ2k/bmm+Ic6xtT8Sh78Acp/ic9AXaTz3rbiRPIkU=; b=4EPMvbOewlH4D+PLqS/X5lgqhp9akTby5dDM1ozlLC/jAeRtDQ5DQX5vs6irS/49kc 9rhN7ckexePcXJLN0UxuBHsW0Tbd6UiZbxOWmHmYK/tHPfhazJjueJaUmtv2wx1rtthF Hcr0zzfREb0fKe+9Iwu/vESWFSV4LKlABq2dBok3pxOonl088yd8XQHCnmEEOzDvuVY8 dwX1FN8feM9n7xuwafx4k6Ehv5fqcdH5nWUoJaV2frbgI38HG4FdtG46LynYiBLrSj7W mNyWvAz2qo2vuWZ/SjnaATtbEBDIJ8ToxcSg1ywiohLNJLs5/oTrlBEWk6NzOICZz32r 92Fg== X-Gm-Message-State: AOAM532byeC55por/GSlzlJ2x7Y+qDgGPB8HtKo9ZHjMW8i5x9VQdZnA r6oTo4P0UNvh2fp/NQ9dCD/1cfIzQA/+oZkx926dBUiREI5ZGLqs2S21TZyprxRZd9aZDqiPJFP 73FKNFQgHpPBHbitvfXezJPo/E6+DnMsNu4jzc85+zS/MGCohCmDCFUferoZEc4XlHH0= X-Received: by 2002:a05:6402:1d4c:b0:42b:394e:38ab with SMTP id dz12-20020a0564021d4c00b0042b394e38abmr47368344edb.228.1653923252588; Mon, 30 May 2022 08:07:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwL885juax//cmL3lsMkt1v0QI4E73Gej35Ma37isZsJG7HOEA18KNC1YRKia9Yk95Un7fPWA== X-Received: by 2002:a05:6402:1d4c:b0:42b:394e:38ab with SMTP id dz12-20020a0564021d4c00b0042b394e38abmr47368317edb.228.1653923252278; Mon, 30 May 2022 08:07:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 07/10] qmp: add filtering of statistics by provider Date: Mon, 30 May 2022 17:07:11 +0200 Message-Id: <20220530150714.756954-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653924152981100001 Content-Type: text/plain; charset="utf-8" Allow retrieving the statistics from a specific provider only. This can be used in the future by HMP commands such as "info sync-profile" or "info profile". The next patch also adds filter-by-provider capabilities to the HMP equivalent of query-stats, "info stats". Example: { "execute": "query-stats", "arguments": { "target": "vm", "providers": [ { "provider": "kvm" } ] } } The QAPI is a bit more verbose than just a list of StatsProvider, so that it can be subsequently extended with filtering of statistics by name. If a provider is specified more than once in the filter, each request will be included separately in the output. Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- Here I removed the Reviewed-by because the effect of the new implementation is especially marekd when you have multiple filters. Before, all filters were evaluated first, and the callback was then run if there was a match. Now, each filter is evaluated separately. accel/kvm/kvm-all.c | 3 ++- include/monitor/stats.h | 4 +++- monitor/hmp-cmds.c | 2 +- monitor/qmp-cmds.c | 41 ++++++++++++++++++++++++++++++++--------- qapi/stats.json | 19 +++++++++++++++++-- 5 files changed, 55 insertions(+), 14 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index d75fb3d95c..66c4ac1ac6 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2644,7 +2644,8 @@ static int kvm_init(MachineState *ms) } =20 if (kvm_check_extension(kvm_state, KVM_CAP_BINARY_STATS_FD)) { - add_stats_callbacks(query_stats_cb, query_stats_schemas_cb); + add_stats_callbacks(STATS_PROVIDER_KVM, query_stats_cb, + query_stats_schemas_cb); } =20 return 0; diff --git a/include/monitor/stats.h b/include/monitor/stats.h index 8c50feeaa9..80a523dd29 100644 --- a/include/monitor/stats.h +++ b/include/monitor/stats.h @@ -17,10 +17,12 @@ typedef void SchemaRetrieveFunc(StatsSchemaList **resul= t, Error **errp); /* * Register callbacks for the QMP query-stats command. * + * @provider: stats provider checked against QMP command arguments * @stats_fn: routine to query stats: * @schema_fn: routine to query stat schemas: */ -void add_stats_callbacks(StatRetrieveFunc *stats_fn, +void add_stats_callbacks(StatsProvider provider, + StatRetrieveFunc *stats_fn, SchemaRetrieveFunc *schemas_fn); =20 /* diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 55b83c0a3a..c501d1fa2b 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2397,7 +2397,7 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) goto exit_no_print; } =20 - schema =3D qmp_query_stats_schemas(&err); + schema =3D qmp_query_stats_schemas(false, STATS_PROVIDER__MAX, &err); if (err) { goto exit; } diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 5f8f1e620b..e49ab345d7 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -445,6 +445,7 @@ HumanReadableText *qmp_x_query_irq(Error **errp) } =20 typedef struct StatsCallbacks { + StatsProvider provider; StatRetrieveFunc *stats_cb; SchemaRetrieveFunc *schemas_cb; QTAILQ_ENTRY(StatsCallbacks) next; @@ -453,10 +454,12 @@ typedef struct StatsCallbacks { static QTAILQ_HEAD(, StatsCallbacks) stats_callbacks =3D QTAILQ_HEAD_INITIALIZER(stats_callbacks); =20 -void add_stats_callbacks(StatRetrieveFunc *stats_fn, +void add_stats_callbacks(StatsProvider provider, + StatRetrieveFunc *stats_fn, SchemaRetrieveFunc *schemas_fn) { StatsCallbacks *entry =3D g_new(StatsCallbacks, 1); + entry->provider =3D provider; entry->stats_cb =3D stats_fn; entry->schemas_cb =3D schemas_fn; =20 @@ -465,12 +468,18 @@ void add_stats_callbacks(StatRetrieveFunc *stats_fn, =20 static bool invoke_stats_cb(StatsCallbacks *entry, StatsResultList **stats_results, - StatsFilter *filter, + StatsFilter *filter, StatsRequest *request, Error **errp) { strList *targets =3D NULL; ERRP_GUARD(); =20 + if (request) { + if (request->provider !=3D entry->provider) { + return true; + } + } + switch (filter->target) { case STATS_TARGET_VM: break; @@ -500,27 +509,41 @@ StatsResultList *qmp_query_stats(StatsFilter *filter,= Error **errp) { StatsResultList *stats_results =3D NULL; StatsCallbacks *entry; + StatsRequestList *request; =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - if (!invoke_stats_cb(entry, &stats_results, filter, errp)) { - break; + if (filter->has_providers) { + for (request =3D filter->providers; request; request =3D reque= st->next) { + if (!invoke_stats_cb(entry, &stats_results, filter, + request->value, errp)) { + break; + } + } + } else { + if (!invoke_stats_cb(entry, &stats_results, filter, NULL, errp= )) { + break; + } } } =20 return stats_results; } =20 -StatsSchemaList *qmp_query_stats_schemas(Error **errp) +StatsSchemaList *qmp_query_stats_schemas(bool has_provider, + StatsProvider provider, + Error **errp) { StatsSchemaList *stats_results =3D NULL; StatsCallbacks *entry; ERRP_GUARD(); =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - entry->schemas_cb(&stats_results, errp); - if (*errp) { - qapi_free_StatsSchemaList(stats_results); - return NULL; + if (!has_provider || provider =3D=3D entry->provider) { + entry->schemas_cb(&stats_results, errp); + if (*errp) { + qapi_free_StatsSchemaList(stats_results); + return NULL; + } } } =20 diff --git a/qapi/stats.json b/qapi/stats.json index 8c9abb57f1..503918ea4c 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -69,6 +69,18 @@ { 'enum': 'StatsTarget', 'data': [ 'vm', 'vcpu' ] } =20 +## +# @StatsRequest: +# +# Indicates a set of statistics that should be returned by query-stats. +# +# @provider: provider for which to return statistics. +# +# Since: 7.1 +## +{ 'struct': 'StatsRequest', + 'data': { 'provider': 'StatsProvider' } } + ## # @StatsVCPUFilter: # @@ -86,11 +98,14 @@ # request statistics and optionally the required subset of information for # that target: # - which vCPUs to request statistics for +# - which providers to request statistics from # # Since: 7.1 ## { 'union': 'StatsFilter', - 'base': { 'target': 'StatsTarget' }, + 'base': { + 'target': 'StatsTarget', + '*providers': [ 'StatsRequest' ] }, 'discriminator': 'target', 'data': { 'vcpu': 'StatsVCPUFilter' } } =20 @@ -226,5 +241,5 @@ # Since: 7.1 ## { 'command': 'query-stats-schemas', - 'data': { }, + 'data': { '*provider': 'StatsProvider' }, 'returns': [ 'StatsSchema' ] } --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923941; cv=none; d=zohomail.com; s=zohoarc; b=VQ7h9tKcV5B//HzjUe5o6pz+AMBRtq7J8aX3UDFxdGsBGUNP6RGc54gd2RVtzfSNPpYN1Jb4JG1JlaDnZE/NmMrevNii5RzGbp9ajWGvLiyp8V/2RuiqbOrJ0g8/SDFer013W4AzJebqd9JNWdU9UT5kM79oLn+WBZYs4WK6Uvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923941; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/lNb/5F2vAV8IDFgSzr0MPhlnhPYTLhqMSK1w6y1gT8=; b=IHMVIYKwqQCb8uLgzv3Op3NRLPePVYO1667M+MA5CVOonHRGAbpDHU61an1RDvp9SR47iz7zoAzoyGuTmHZBVLOh1nPK6mDOPgsyeUQ2/YohzoA/QG7YB7HQsYqo+4R/MrM6HqHdiYArexmy4n8uADVNJNntyxl+DXxw70yckjQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923941772941.5951039087141; Mon, 30 May 2022 08:19:01 -0700 (PDT) Received: from localhost ([::1]:34822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvhAa-0000z3-Nx for importer2@patchew.org; Mon, 30 May 2022 11:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzb-0003cL-OB for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzZ-00063J-TH for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:39 -0400 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-659-kNTMoYg8MQqmwamHXu1ofg-1; Mon, 30 May 2022 11:07:36 -0400 Received: by mail-ed1-f70.google.com with SMTP id k21-20020aa7d2d5000000b0042dcac48313so3373104edr.8 for ; Mon, 30 May 2022 08:07:35 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id y12-20020a170906524c00b006f3ef214e2csm4142476ejm.146.2022.05.30.08.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923257; 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=/lNb/5F2vAV8IDFgSzr0MPhlnhPYTLhqMSK1w6y1gT8=; b=NKQGIe5TwozVTzIMdwxEYzbVnaCO3IAeIF3NzBgNLB6T9ehYbiH7XQeYpxgcL9G4GKzKrw rW5Ux+VfLE1LxFT6/C2VS+IaBhbfyIOlvovaEjXp8NMmnatUT6p1o06nKX4g3LJhCZPjSl eVVWCMo5ZyfvRrme47u/eFjbKI9+jCY= X-MC-Unique: kNTMoYg8MQqmwamHXu1ofg-1 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=/lNb/5F2vAV8IDFgSzr0MPhlnhPYTLhqMSK1w6y1gT8=; b=TcpIuH588y+Ba/NHeS1dVnIVCefa8LNHTtPD1yycvgykZHysEP4zQio0dpbZ8IqohI mpwY67Do9KdSqkEzDyAoGnyFMoaDzbW8VZDgMLCfORafxh9LWLALxb7P27fJkDgAFAFj Lz9MDzNOlNOiSTzW1+il2GVYMFQa6wOOzbagbpqcPsVnIp9oLRDrFcH04gkxNq9nx8e1 vSCXXNHDUdUM0ELnNi0zeGTkbGmRGrbObrtduAmd/DA1eom3zNpfjcfrJVk9wnGWpyCg dPn0KrzphzlrR6ZKjFFHsXjUDB4wsuz48kYAkHnsd9+d8dYHsf9b3LNCvr0612krYGe8 6b7A== X-Gm-Message-State: AOAM531AG0CBtMGihhKHz1vK4at/M+zhZp298B/Mg4wLFcldc7nR0f/N mKvbE8W5eaQdsbXMgTpR/IXhvyPw9cA3JgIFMiW9Z4pp9zrt4GY1os+iBHb1GTe/Y6tGeUwfBYL h1HAeC3F447DHJoJLdZ6U2MoPGSTSXiZ3sYIFw/mlHYYr3TljBtto665du/cuZtfmI6Y= X-Received: by 2002:a17:907:9712:b0:6ff:c09:33a2 with SMTP id jg18-20020a170907971200b006ff0c0933a2mr24379319ejc.50.1653923254290; Mon, 30 May 2022 08:07:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSHV34oAI1ePItBP5QEIQco3qxuSu2aYNQmvcdMbIz9M9BjepF65OTM/nXQ+j/Z8CTcELo5w== X-Received: by 2002:a17:907:9712:b0:6ff:c09:33a2 with SMTP id jg18-20020a170907971200b006ff0c0933a2mr24379289ejc.50.1653923253931; Mon, 30 May 2022 08:07:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 08/10] hmp: add filtering of statistics by provider Date: Mon, 30 May 2022 17:07:12 +0200 Message-Id: <20220530150714.756954-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923942864100001 Content-Type: text/plain; charset="utf-8" Allow the user to request statistics for a single provider of interest. Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- hmp-commands-info.hx | 7 ++++--- monitor/hmp-cmds.c | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 28757768f7..a67040443b 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -897,9 +897,10 @@ ERST =20 { .name =3D "stats", - .args_type =3D "target:s", - .params =3D "target", - .help =3D "show statistics; target is either vm or vcpu", + .args_type =3D "target:s,provider:s?", + .params =3D "target [provider]", + .help =3D "show statistics for the given target (vm or vcpu)= ; optionally filter by " + "provider", .cmd =3D hmp_info_stats, }, =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index c501d1fa2b..a71887e54c 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2300,6 +2300,7 @@ static StatsSchemaValueList *find_schema_value_list( } =20 static void print_stats_results(Monitor *mon, StatsTarget target, + bool show_provider, StatsResult *result, StatsSchemaList *schema) { @@ -2314,8 +2315,10 @@ static void print_stats_results(Monitor *mon, StatsT= arget target, return; } =20 - monitor_printf(mon, "provider: %s\n", - StatsProvider_str(result->provider)); + if (show_provider) { + monitor_printf(mon, "provider: %s\n", + StatsProvider_str(result->provider)); + } =20 for (stats_list =3D result->stats; stats_list; stats_list =3D stats_list->next, @@ -2356,7 +2359,8 @@ static void print_stats_results(Monitor *mon, StatsTa= rget target, } =20 /* Create the StatsFilter that is needed for an "info stats" invocation. = */ -static StatsFilter *stats_filter(StatsTarget target, int cpu_index) +static StatsFilter *stats_filter(StatsTarget target, int cpu_index, + StatsProvider provider) { StatsFilter *filter =3D g_malloc0(sizeof(*filter)); =20 @@ -2378,12 +2382,25 @@ static StatsFilter *stats_filter(StatsTarget target= , int cpu_index) default: break; } + + if (provider =3D=3D STATS_PROVIDER__MAX) { + return filter; + } + + /* "info stats" can only query either one or all the providers. */ + filter->has_providers =3D true; + filter->providers =3D g_new0(StatsRequestList, 1); + filter->providers->value =3D g_new0(StatsRequest, 1); + filter->providers->value->provider =3D provider; return filter; } =20 void hmp_info_stats(Monitor *mon, const QDict *qdict) { const char *target_str =3D qdict_get_str(qdict, "target"); + const char *provider_str =3D qdict_get_try_str(qdict, "provider"); + + StatsProvider provider =3D STATS_PROVIDER__MAX; StatsTarget target; Error *err =3D NULL; g_autoptr(StatsSchemaList) schema =3D NULL; @@ -2396,19 +2413,27 @@ void hmp_info_stats(Monitor *mon, const QDict *qdic= t) monitor_printf(mon, "invalid stats target %s\n", target_str); goto exit_no_print; } + if (provider_str) { + provider =3D qapi_enum_parse(&StatsProvider_lookup, provider_str, = -1, &err); + if (err) { + monitor_printf(mon, "invalid stats provider %s\n", provider_st= r); + goto exit_no_print; + } + } =20 - schema =3D qmp_query_stats_schemas(false, STATS_PROVIDER__MAX, &err); + schema =3D qmp_query_stats_schemas(provider_str ? true : false, + provider, &err); if (err) { goto exit; } =20 switch (target) { case STATS_TARGET_VM: - filter =3D stats_filter(target, -1); + filter =3D stats_filter(target, -1, provider); break; case STATS_TARGET_VCPU: {} int cpu_index =3D monitor_get_cpu_index(mon); - filter =3D stats_filter(target, cpu_index); + filter =3D stats_filter(target, cpu_index, provider); break; default: abort(); @@ -2419,7 +2444,7 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) goto exit; } for (entry =3D stats; entry; entry =3D entry->next) { - print_stats_results(mon, target, entry->value, schema); + print_stats_results(mon, target, provider_str =3D=3D NULL, entry->= value, schema); } =20 exit: --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923830; cv=none; d=zohomail.com; s=zohoarc; b=Fb6zMuq+Vev0QxfbWooRJLvQpEJuomxA+Jt9aaY4UU3YLNnxq6eAu2YXkRNpjG9F/s3YW2ZjhLqfRbKg8cDwsq0GIyJnI2kQ5LLoHQCn5KYsiIyV5FNqwwDYJ3bO96MqiLZy6ma7kIndw9wTm5jltAUXob3w4etRSzRz1VhKYqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gXM4f18ZB8rLO0mkcXF/18A85L4Z02SoK1bMAVyW6vU=; b=CfJWnaV0fZ5dAb5s8UxovHEz81txHYT/oui3nQwR4sSvGmpg11OfkkVl5vJAKfOGzJkDEccgH+YfqOIi12jVAHOmUYsBCsWtJasT2ChC7HPQdFFNoM2yGl4e33GZDnUJ0m97fyo24cRXxcYKlkaRJGCmfl6ND7I9e/4ztC2dCdQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923830123458.0988341453278; Mon, 30 May 2022 08:17:10 -0700 (PDT) Received: from localhost ([::1]:57000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh8n-0005FG-47 for importer2@patchew.org; Mon, 30 May 2022 11:17:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzd-0003dd-E6 for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27100) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzb-00063W-As for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:40 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-578-uOot4DLQPVG_4CFxW8UjxA-1; Mon, 30 May 2022 11:07:37 -0400 Received: by mail-ed1-f72.google.com with SMTP id o17-20020a50fd91000000b0042dbded81deso4239128edt.0 for ; Mon, 30 May 2022 08:07:37 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id v27-20020a50d59b000000b0042dd2f2bec7sm1735326edi.56.2022.05.30.08.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923258; 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=gXM4f18ZB8rLO0mkcXF/18A85L4Z02SoK1bMAVyW6vU=; b=g1hGBt7Bagk0+EGVq4LibIV8qkDmF1ongJ2NWXBY1HNckiBnoSxZDRpW0RU683MjWbbkBO pQH2NzzFaqcFNJ+t7oTr9+uijSGTjXOwBCVVNwTZWkjXoGhgYZBWl023XHS6aE/89NZ+SJ PpQk3JT0U/kE0o3Yz2NjDRUAiiyPb2o= X-MC-Unique: uOot4DLQPVG_4CFxW8UjxA-1 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=gXM4f18ZB8rLO0mkcXF/18A85L4Z02SoK1bMAVyW6vU=; b=Ksr18XFlUoDND75NE3sWUO7mOKKCBWnT3mr68KQwzWbhPhQIXv0U5gIxHj/USkMIAo 86vxYQaEFhU5FzAAPQYNtM9A2QY3R6TcpABlh+Le4XYnleXVRab/jhGzBnFpKRvFdoMh 0n0g9P6bI1UzLsUHr5fbTlfsXFpj/OhFA/R1GePk/qA7NOJdX/E+nq8vLiC7JfTWQpC2 9ocoV9zhSAXH2q2jnbiSAjsKVUDv/1m4ZGrA8c2gA9JpmjpP7eazsWdlZTtud+Twi883 TJyCfE7klvHiZfhLbmoO5F7PiimIHzydLl431h0/V8/jFMZva0sCiJb80rdlviuCHQlk bctQ== X-Gm-Message-State: AOAM531aV1M8q2daqyfQxyE29WJeplLy+e0yHQ2dQthA6j1ilFDkA2Wy koeP+wDHWs03SDNiljey+9TW5csn4n/NTTMNO5KQm+mbSLEKqJOAx4tIRaCo8hC5VKRyPJU0xll KumRHBFuRWACr5uqptaA8+sSsg4FEMEDt2eu3o8lKhxGA0G4V4++L94RIf4yvdkBI0dE= X-Received: by 2002:a05:6402:3312:b0:42d:bf2e:1869 with SMTP id e18-20020a056402331200b0042dbf2e1869mr11524477eda.348.1653923255980; Mon, 30 May 2022 08:07:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8Y8EqMaafZub3SnVKwnK2rpQ8rJrru/V/BZ0/unEU6yXbjabFvBKTp3tj4MeLWxxFQiLgeA== X-Received: by 2002:a05:6402:3312:b0:42d:bf2e:1869 with SMTP id e18-20020a056402331200b0042dbf2e1869mr11524452eda.348.1653923255627; Mon, 30 May 2022 08:07:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 09/10] qmp: add filtering of statistics by name Date: Mon, 30 May 2022 17:07:13 +0200 Message-Id: <20220530150714.756954-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923832235100001 Content-Type: text/plain; charset="utf-8" Allow retrieving only a subset of statistics. This can be useful for example in order to plot a subset of the statistics many times a second. KVM publishes ~40 statistics for each vCPU on x86; retrieving and serializing all of them would be useless Another use will be in HMP in the following patch; implementing the filter in the backend is easy enough that it was deemed okay to make this a public interface. Example: { "execute": "query-stats", "arguments": { "target": "vcpu", "vcpus": [ "/machine/unattached/device[2]", "/machine/unattached/device[4]" ], "providers": [ { "provider": "kvm", "names": [ "l1d_flush", "exits" ] } } } { "return": { "vcpus": [ { "path": "/machine/unattached/device[2]" "providers": [ { "provider": "kvm", "stats": [ { "name": "l1d_flush", "value": 41213 }, { "name": "exits", "value": 74291 } ] } ] }, { "path": "/machine/unattached/device[4]" "providers": [ { "provider": "kvm", "stats": [ { "name": "l1d_flush", "value": 16132 }, { "name": "exits", "value": 57922 } ] } ] } ] } } Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- accel/kvm/kvm-all.c | 17 +++++++++++------ include/monitor/stats.h | 2 +- monitor/qmp-cmds.c | 7 ++++++- qapi/stats.json | 6 +++++- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 66c4ac1ac6..f90f0602bc 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2312,7 +2312,7 @@ bool kvm_dirty_ring_enabled(void) } =20 static void query_stats_cb(StatsResultList **result, StatsTarget target, - strList *targets, Error **errp); + strList *names, strList *targets, Error **errp); static void query_stats_schemas_cb(StatsSchemaList **result, Error **errp); =20 static int kvm_init(MachineState *ms) @@ -3713,6 +3713,7 @@ typedef struct StatsArgs { StatsResultList **stats; StatsSchemaList **schema; } result; + strList *names; Error **errp; } StatsArgs; =20 @@ -3921,7 +3922,7 @@ static StatsDescriptors *find_stats_descriptors(Stats= Target target, int stats_fd } =20 static void query_stats(StatsResultList **result, StatsTarget target, - int stats_fd, Error **errp) + strList *names, int stats_fd, Error **errp) { struct kvm_stats_desc *kvm_stats_desc; struct kvm_stats_header *kvm_stats_header; @@ -3963,6 +3964,9 @@ static void query_stats(StatsResultList **result, Sta= tsTarget target, =20 /* Add entry to the list */ stats =3D (void *)stats_data + pdesc->offset; + if (!apply_str_list_filter(pdesc->name, names)) { + continue; + } stats_list =3D add_kvmstat_entry(pdesc, stats, stats_list, errp); } =20 @@ -4024,8 +4028,8 @@ static void query_stats_vcpu(CPUState *cpu, run_on_cp= u_data data) error_propagate(kvm_stats_args->errp, local_err); return; } - query_stats(kvm_stats_args->result.stats, STATS_TARGET_VCPU, stats_fd, - kvm_stats_args->errp); + query_stats(kvm_stats_args->result.stats, STATS_TARGET_VCPU, + kvm_stats_args->names, stats_fd, kvm_stats_args->errp); close(stats_fd); } =20 @@ -4046,7 +4050,7 @@ static void query_stats_schema_vcpu(CPUState *cpu, ru= n_on_cpu_data data) } =20 static void query_stats_cb(StatsResultList **result, StatsTarget target, - strList *targets, Error **errp) + strList *names, strList *targets, Error **errp) { KVMState *s =3D kvm_state; CPUState *cpu; @@ -4060,7 +4064,7 @@ static void query_stats_cb(StatsResultList **result, = StatsTarget target, error_setg_errno(errp, errno, "KVM errno, stats: ioctl failed"= ); return; } - query_stats(result, target, stats_fd, errp); + query_stats(result, target, names, stats_fd, errp); close(stats_fd); break; } @@ -4068,6 +4072,7 @@ static void query_stats_cb(StatsResultList **result, = StatsTarget target, { StatsArgs stats_args; stats_args.result.stats =3D result; + stats_args.names =3D names; stats_args.errp =3D errp; CPU_FOREACH(cpu) { if (!apply_str_list_filter(cpu->parent_obj.canonical_path, tar= gets)) { diff --git a/include/monitor/stats.h b/include/monitor/stats.h index 80a523dd29..fcf0983154 100644 --- a/include/monitor/stats.h +++ b/include/monitor/stats.h @@ -11,7 +11,7 @@ #include "qapi/qapi-types-stats.h" =20 typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target, - strList *targets, Error **errp); + strList *names, strList *targets, Error **er= rp); typedef void SchemaRetrieveFunc(StatsSchemaList **result, Error **errp); =20 /* diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index e49ab345d7..7314cd813d 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -472,12 +472,17 @@ static bool invoke_stats_cb(StatsCallbacks *entry, Error **errp) { strList *targets =3D NULL; + strList *names =3D NULL; ERRP_GUARD(); =20 if (request) { if (request->provider !=3D entry->provider) { return true; } + if (request->has_names && !request->names) { + return true; + } + names =3D request->has_names ? request->names : NULL; } =20 switch (filter->target) { @@ -496,7 +501,7 @@ static bool invoke_stats_cb(StatsCallbacks *entry, abort(); } =20 - entry->stats_cb(stats_results, filter->target, targets, errp); + entry->stats_cb(stats_results, filter->target, names, targets, errp); if (*errp) { qapi_free_StatsResultList(*stats_results); *stats_results =3D NULL; diff --git a/qapi/stats.json b/qapi/stats.json index 503918ea4c..2f8bfe8fdb 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -75,11 +75,14 @@ # Indicates a set of statistics that should be returned by query-stats. # # @provider: provider for which to return statistics. + +# @names: statistics to be returned (all if omitted). # # Since: 7.1 ## { 'struct': 'StatsRequest', - 'data': { 'provider': 'StatsProvider' } } + 'data': { 'provider': 'StatsProvider', + '*names': [ 'str' ] } } =20 ## # @StatsVCPUFilter: @@ -99,6 +102,7 @@ # that target: # - which vCPUs to request statistics for # - which providers to request statistics from +# - which named values to return within each provider # # Since: 7.1 ## --=20 2.36.1 From nobody Thu May 9 05:56:56 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653923790; cv=none; d=zohomail.com; s=zohoarc; b=hX8JVYf51M/ms4MQjBjbgIrjAnxVrObDTSfKSOa3GM8FyNtnLJm+HEoCY6jtpTJ06VstWVnWUnq2QFZYktus3Mtk9msHyQDU31u3dGE+UqhusT6F0ARKau8mbqyEyJoWN64+cmqTDkwyd+EBDjwKeNI0r4wrptcffv7VJTVB8Cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653923790; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GLhXjY6rKgLe+f59XTcBR4qtIYCyiwXQPvmwiUxl0zo=; b=mLOIRdSYD6ElLxiBHmd9PI1OLkZKePoIlAEEdBd0mtOh067U8atwqm/76G2qaGt8nF7KLYYVDx9y0qnuUnIs8b6BavqfYlCDx/hF5oGTWcsWAEvYUss2n/FCQiix22OmPfiPz7b54dtMW1kfMC6Bfs5x76fTyAXQcDpvNq/FI3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653923790053106.9794557009269; Mon, 30 May 2022 08:16:30 -0700 (PDT) Received: from localhost ([::1]:55030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvh88-0003oB-UH for importer2@patchew.org; Mon, 30 May 2022 11:16:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54100) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzi-0003g1-DJ for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:58954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvgzg-000641-OQ for qemu-devel@nongnu.org; Mon, 30 May 2022 11:07:46 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-645-GltYjDEePd2iqbDZKThbjw-1; Mon, 30 May 2022 11:07:39 -0400 Received: by mail-wm1-f69.google.com with SMTP id k124-20020a1ca182000000b003973db7d1a0so70090wme.1 for ; Mon, 30 May 2022 08:07:39 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id t22-20020a05600c41d600b003942a244ebesm10436682wmh.3.2022.05.30.08.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 May 2022 08:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653923263; 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=GLhXjY6rKgLe+f59XTcBR4qtIYCyiwXQPvmwiUxl0zo=; b=bVVTZWi2Kx8Hk9QNrP+g8NEnllVm8PXVRL/MltSRtv0W52w87PWVRGXCxiRrBZA+9o2GwH YWpNleHh2saLWlO6BHMbsGunW+cmieUNfzcSskHR1ot7Cue4kTKuxdEASgeICzKouZ62Ij xaQbsCJj8AmkE8UhgYybwB/C15eMHds= X-MC-Unique: GltYjDEePd2iqbDZKThbjw-1 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=GLhXjY6rKgLe+f59XTcBR4qtIYCyiwXQPvmwiUxl0zo=; b=d2aLoNBgJsOudffJLeyaXsg0KlOkGjSo9ElVWdpOWFw6kQzfQzzke4kDUVcE0Ks17T cyn4JvQzrQ4KY2twFZR5uqu4VSuo+F9nyExbUzb//7HEVI4+ZQaK0V5c5773Zv4DSZ7G y6T6sUcamASgDdlharzO7pad2fSH2nthEuQpulVbUx4eBbOX3W/Wj9X4EmsW2zTYuMU4 mmMgg/MCqY00wusJwx2A5yT3woG4Z8gkeYWeiH0kweXPZvwXexKxeA2fE+OYHXka22uX vVRhwSnPFjp3IyIamWBNrJUd003vwfYrM+qpStq4poPuHUstIhseo1iqfu59iOUBPjmE bGfw== X-Gm-Message-State: AOAM530sfb/hSCCgpULUwAfY4qKc1KemsNvpjnREGH4ylF6gWfMlRHf+ l4a88a9lsQwxDIW/xjMynMDwgqPZk3RthHYN/NbV3vMfCZWAeYXtbGnB/72nkCErbMmkcBD94oy LOnHY8XJPx9Q3+tFZ4HK270PuvXkBQ/uAhn7u0FFx2kqLNdL7qnVPAlVWPzg6YbCaiqY= X-Received: by 2002:a05:600c:502a:b0:397:44d1:d5b6 with SMTP id n42-20020a05600c502a00b0039744d1d5b6mr19478088wmr.57.1653923257770; Mon, 30 May 2022 08:07:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz581ND6eiMY6tUg2a7yaPZD61xnbooWnNVxbIjVCNOO/9tFeBE2Fz9w38H9RU44BSwYrfk9w== X-Received: by 2002:a05:600c:502a:b0:397:44d1:d5b6 with SMTP id n42-20020a05600c502a00b0039744d1d5b6mr19478050wmr.57.1653923257301; Mon, 30 May 2022 08:07:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, dgilbert@redhat.com Subject: [PATCH v5 10/10] hmp: add filtering of statistics by name Date: Mon, 30 May 2022 17:07:14 +0200 Message-Id: <20220530150714.756954-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530150714.756954-1-pbonzini@redhat.com> References: <20220530150714.756954-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, 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+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653923790998100001 Content-Type: text/plain; charset="utf-8" Allow the user to request only a specific subset of statistics. This can be useful when working on a feature or optimization that is known to affect that statistic. Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini Reviewed-by: Dr. David Alan Gilbert --- hmp-commands-info.hx | 8 ++++---- monitor/hmp-cmds.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index a67040443b..3ffa24bd67 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -897,10 +897,10 @@ ERST =20 { .name =3D "stats", - .args_type =3D "target:s,provider:s?", - .params =3D "target [provider]", - .help =3D "show statistics for the given target (vm or vcpu)= ; optionally filter by " - "provider", + .args_type =3D "target:s,names:s?,provider:s?", + .params =3D "target [names] [provider]", + .help =3D "show statistics for the given target (vm or vcpu)= ; optionally filter by" + "name (comma-separated list, or * for all) and provi= der", .cmd =3D hmp_info_stats, }, =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index a71887e54c..8775f69ff1 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2359,10 +2359,12 @@ static void print_stats_results(Monitor *mon, Stats= Target target, } =20 /* Create the StatsFilter that is needed for an "info stats" invocation. = */ -static StatsFilter *stats_filter(StatsTarget target, int cpu_index, - StatsProvider provider) +static StatsFilter *stats_filter(StatsTarget target, const char *names, + int cpu_index, StatsProvider provider) { StatsFilter *filter =3D g_malloc0(sizeof(*filter)); + StatsProvider provider_idx; + StatsRequestList *request_list =3D NULL; =20 filter->target =3D target; switch (target) { @@ -2383,15 +2385,29 @@ static StatsFilter *stats_filter(StatsTarget target= , int cpu_index, break; } =20 - if (provider =3D=3D STATS_PROVIDER__MAX) { + if (!names && provider =3D=3D STATS_PROVIDER__MAX) { return filter; } =20 - /* "info stats" can only query either one or all the providers. */ + /* + * "info stats" can only query either one or all the providers. Query= ing + * by name, but not by provider, requires the creation of one filter p= er + * provider. + */ + for (provider_idx =3D 0; provider_idx < STATS_PROVIDER__MAX; provider_= idx++) { + if (provider =3D=3D STATS_PROVIDER__MAX || provider =3D=3D provide= r_idx) { + StatsRequest *request =3D g_new0(StatsRequest, 1); + request->provider =3D provider_idx; + if (names && !g_str_equal(names, "*")) { + request->has_names =3D true; + request->names =3D strList_from_comma_list(names); + } + QAPI_LIST_PREPEND(request_list, request); + } + } + filter->has_providers =3D true; - filter->providers =3D g_new0(StatsRequestList, 1); - filter->providers->value =3D g_new0(StatsRequest, 1); - filter->providers->value->provider =3D provider; + filter->providers =3D request_list; return filter; } =20 @@ -2399,6 +2415,7 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) { const char *target_str =3D qdict_get_str(qdict, "target"); const char *provider_str =3D qdict_get_try_str(qdict, "provider"); + const char *names =3D qdict_get_try_str(qdict, "names"); =20 StatsProvider provider =3D STATS_PROVIDER__MAX; StatsTarget target; @@ -2429,11 +2446,11 @@ void hmp_info_stats(Monitor *mon, const QDict *qdic= t) =20 switch (target) { case STATS_TARGET_VM: - filter =3D stats_filter(target, -1, provider); + filter =3D stats_filter(target, names, -1, provider); break; case STATS_TARGET_VCPU: {} int cpu_index =3D monitor_get_cpu_index(mon); - filter =3D stats_filter(target, cpu_index, provider); + filter =3D stats_filter(target, names, cpu_index, provider); break; default: abort(); --=20 2.36.1