From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652691888; cv=none; d=zohomail.com; s=zohoarc; b=kbBxgHZjUiujKapzQC4W7KIfQ6fSu00syutGk3Ze+xqEd6pwhMIHAz/VWKSjG7SR08RK9MzHMFisIef6ZiCwhYlbAiq05vqYfBCNhX8qjBCtyp35wVQnkkosMHS4y8edbWoz64zJhL4w7KpItgw8C/bmbjPchuRRssi0CfF85lo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652691888; 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=qIfv2qWPm3asM+3t8np85KvOVXR3MBTLfa4h8j+cxQY=; b=kFVxNqOaTq+DsGP5xuvqWwHESqZ3H7gUj8iPE64JA48mWMWOmOJhA8qvH3C3gobT9oqfhkmkm/I18pws959IZmHlZ/Zo/o0pHytgN/kJtEzpXsi4EOPUHvq6oKDd7mCaJx6pwr1V+Egx72T6GctdwzFmAsB8O3I4fT68VE5FLNs= 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+importer=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 1652691888434725.221856218485; Mon, 16 May 2022 02:04:48 -0700 (PDT) Received: from localhost ([::1]:45914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWek-0002c1-Sf for importer@patchew.org; Mon, 16 May 2022 05:04:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWbI-0000aL-Gi for qemu-devel@nongnu.org; Mon, 16 May 2022 05:01:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:34624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWbD-0006wb-GQ for qemu-devel@nongnu.org; Mon, 16 May 2022 05:01:10 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-487-P2vyp1u6MP6_aMXmR0v2ow-1; Mon, 16 May 2022 05:01:04 -0400 Received: by mail-ej1-f72.google.com with SMTP id qa15-20020a170907868f00b006f4c89bf2e3so5456380ejc.9 for ; Mon, 16 May 2022 02:01:03 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h11-20020a1709070b0b00b006f3ef214e5esm3443819ejl.196.2022.05.16.02.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691666; 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=qIfv2qWPm3asM+3t8np85KvOVXR3MBTLfa4h8j+cxQY=; b=G9Nk4cvLQZ+LqAFFx9TdGJ6nYAW9/jntF8rMmg9cKkTuDgu9Y2IpXOg5SAywrIx3XzRaxu 0vJcILJZQeMYRd2unFEFjtH08aF23m8jtmZ/dGRbheMIwKfbPZBF+/tWeDgbEPQuk7tdqq RrvKoe9KCOGxFsH0tJs/xyRwky8d44g= X-MC-Unique: P2vyp1u6MP6_aMXmR0v2ow-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=qIfv2qWPm3asM+3t8np85KvOVXR3MBTLfa4h8j+cxQY=; b=TXM1XRasXfT7PfXrluHiLE1CAaiHtKcthE+AkqAFwMrcFOu7bBB60rPJesnqO/hiOy 4eDI70q37MLkWjTp0XxN3l03bMNfBWkcVPPaWlJzErSul3ppDMpIdMZFPRQm6CwfrHMW EEPvdU52pWD7gQQzPtxtUxjRSpPwf1ZuJ06rfGkOC4hARDVf1LO0LbiIKLTkwy8x1D07 95h6ngb6mtW8Xqf6kIWSl1S5SDCEEjsqfTNA3vyJ1kn317oA0S50JNiIgwmq26gZDP3x XUk6TMgX56BXFURErvNu5pBDUNjRV+PfWmDAerroHoZUZ060y5UpVmMAPqcASjPZ4hx4 kLBw== X-Gm-Message-State: AOAM533d5ytwsp4M4jiZSF/LOOkxjxcsv4JK/6NznAK3WB1aBelcc/+t 1Xca5pOO1GYEL/Tqjimxf0VXLIR3kVHEtyEiWKUxeGq0ayZn9d7OOUj6sDtH781yn6lfBboGmQw Yrb9QhZKpA7hC0kDRaGJr+9jE2sSXVr58d2K/Xq8C11rcYDDItiAwt8S4nXFwfnv7nnw= X-Received: by 2002:a17:906:6a0e:b0:6f5:30c9:7c7d with SMTP id qw14-20020a1709066a0e00b006f530c97c7dmr13925315ejc.63.1652691662325; Mon, 16 May 2022 02:01:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUHfqniJL8dcb++MFGC16q7tNG8xzWtHQ+ZdEQ78Rq5SbObSdNkYNukB6hHKPrgDnDPuw67w== X-Received: by 2002:a17:906:6a0e:b0:6f5:30c9:7c7d with SMTP id qw14-20020a1709066a0e00b006f530c97c7dmr13925263ejc.63.1652691661655; Mon, 16 May 2022 02:01:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 1/8] qmp: Support for querying stats Date: Mon, 16 May 2022 11:00:51 +0200 Message-Id: <20220516090058.1195767-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652691889236100003 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 Signed-off-by: Paolo Bonzini --- include/monitor/stats.h | 33 ++++++ monitor/qmp-cmds.c | 71 +++++++++++++ qapi/meson.build | 1 + qapi/qapi-schema.json | 1 + qapi/stats.json | 215 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 321 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..89552ab06f --- /dev/null +++ b/include/monitor/stats.h @@ -0,0 +1,33 @@ +/* + * 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..d83faeca88 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,72 @@ 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); +} + +StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp) +{ + StatsResultList *stats_results =3D NULL; + StatsCallbacks *entry; + + QTAILQ_FOREACH(entry, &stats_callbacks, next) { + entry->stats_cb(&stats_results, filter->target, errp); + } + + return stats_results; +} + +StatsSchemaList *qmp_query_stats_schemas(Error **errp) +{ + StatsSchemaList *stats_results =3D NULL; + StatsCallbacks *entry; + + QTAILQ_FOREACH(entry, &stats_callbacks, next) { + entry->schemas_cb(&stats_results, errp); + } + + 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..f0656a6435 --- /dev/null +++ b/qapi/stats.json @@ -0,0 +1,215 @@ +# -*- 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-hi= stogram' ] } + +## +# @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 available runtime-collected statistics. +# +# Note: runtime-collected statistics and their names fall outside QEMU's +# usual deprecation policies. QEMU will try to keep the set of available +# data stable, together with their names, but will not guarantee stability +# at all costs; the same is true of providers that source statistics +# externally, e.g. from Linux. For example, if the same value is being +# tracked with different names on different architectures or by different +# providers, one of them might be renamed. A statistic might 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, they are expected to be rare. +# +# Since: 7.1 +## +{ 'command': 'query-stats-schemas', + 'data': { }, + 'returns': [ 'StatsSchema' ] } --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692131; cv=none; d=zohomail.com; s=zohoarc; b=PuRmkG3vp5+O/fM4cDfIitg0mFh0SA2pcVsHPU1QsXFV7VYh57fkeib+6ypMvEIT+28HKFTApi676TKht61SNUKAAvxFrDemkXUt0YTvx+twTlRbxQSOJVktPzyjY98iqW+kMXecPs60n5HsquR+Z/j7mfQZ6jSlKpenwR80tBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692131; 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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=We0XBzr4RxXrTI4aVDYmmgsC4p0OdZhBbup+3+4SZ/IKQDjSLQt1SWc4xmg1VyHYxF7JMnqJwfPwodVib63M4x23ECCJvAXiyAIQtrGfqFnRHz6cx+hHHsFD1LotAg+eevmO4rnSC187wAX7jv4PBmrCLiRarZajVylwnCg1bKI= 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+importer=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 1652692131947271.17896710202035; Mon, 16 May 2022 02:08:51 -0700 (PDT) Received: from localhost ([::1]:54846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWig-0000LQ-Sq for importer@patchew.org; Mon, 16 May 2022 05:08:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcl-0001gd-K0 for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcj-0007M0-67 for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:43 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-362-s_r7q8LeNVGUwRSymTg7cg-1; Mon, 16 May 2022 05:02:38 -0400 Received: by mail-ej1-f70.google.com with SMTP id bk16-20020a170906b0d000b006fe34a2e598so554069ejb.0 for ; Mon, 16 May 2022 02:02:38 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id gx13-20020a1709068a4d00b006f3ef214db6sm3479030ejc.28.2022.05.16.02.02.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691760; 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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=YetFlmAVGA3Kp+12ADEZrnfN0xWW9RrHKeDH9cRAYEl5HEidJimgi3mJ7a2NroagioZexX cl5x2N1kxGOxS1aVwkoOdPGapxwGvRnMFCIAne0in6GKnrJDm8PxmcGw94fF1LTEkVFr32 Esj21uHwX2oNOB0orUczcuo0SFnSee4= X-MC-Unique: s_r7q8LeNVGUwRSymTg7cg-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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=pq0MowawnYV7loFRarLMyBxznOl2pnfEx4MlMizYvAfCNL6RNtRNSfc8U3+4JazHq2 ONCWosnu8roXfDE3rryC9c2pqXbgp6dPPogJ1rGuaxK+ebId1UnsgjkiV2yi2cc2iDmU RZu/5JpLXkeNDtLUGoKCJSYZWOrV6j/q82zIpGUr7gH5xnfJuQQiUIvNPA1gTzDopx/h SdVJ2TCSBEOW0U53g071QtMwammWeNnXtXCeTadcf22eiX65oSrAYahHZR7Aa/wHwdTz gHWr42bWoX9fqvZW9q3xq4FVveR80KYJkW+xcUb6agf+5rjZgIwHZlwqRUvLhK2UR8jJ qCiQ== X-Gm-Message-State: AOAM530nGrtWfelxN2nvaanFJYwtX4JsmFe7z6q0N8I7Gg88thXptpVd uiF6L4xUr5hTAB8gHXBjciYiBMb+6F4bEWgMkPsyEl3vEGhFyMO5760sqUx+ep1zrEdwZDV7v24 au1bi8k6YTy4qmIAbo36TnefdZH+HoP7nb854jgtlWX37ZD6O/UJr4Tn8Wv+UZItOtCE= X-Received: by 2002:a05:6402:3cf:b0:42a:6266:3f1d with SMTP id t15-20020a05640203cf00b0042a62663f1dmr12209303edw.426.1652691756931; Mon, 16 May 2022 02:02:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2CCcY2XBOz1sZfkGCfOCI9t/cGIfFXYb7IDmGGRRJKowJwABaKTAcUh6rdyRAFIXa1CrVRw== X-Received: by 2002:a05:6402:3cf:b0:42a:6266:3f1d with SMTP id t15-20020a05640203cf00b0042a62663f1dmr12209260edw.426.1652691756498; Mon, 16 May 2022 02:02:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 2/8] kvm: Support for querying fd-based stats Date: Mon, 16 May 2022 11:02:28 +0200 Message-Id: <20220516090234.1195907-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692134071100001 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 --- accel/kvm/kvm-all.c | 403 ++++++++++++++++++++++++++++++++++++++++++++ qapi/stats.json | 2 +- 2 files changed, 404 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 32e177bd26..6a6bbe2994 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,398 @@ 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) +{ + + StatsList *stats_entry; + Stats *stats; + uint64List *val_list =3D NULL; + + 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_entry =3D g_new0(StatsList, 1); + 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++) { + uint64List *val_entry =3D g_new0(uint64List, 1); + val_entry->value =3D stats_data[i]; + val_entry->next =3D val_list; + val_list =3D val_entry; + } + stats->value->u.list =3D val_list; + stats->value->type =3D QTYPE_QLIST; + } + + stats_entry->value =3D stats; + stats_entry->next =3D stats_list; + + return stats_entry; +} + +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(&local_err, "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(&local_err, "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(errp, "KVM 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 f0656a6435..382223e197 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -51,7 +51,7 @@ # Since: 7.1 ## { 'enum': 'StatsProvider', - 'data': [ ] } + 'data': [ 'kvm' ] } =20 ## # @StatsTarget: --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692122; cv=none; d=zohomail.com; s=zohoarc; b=Z2ofREjqEgUrhxf1EWnWWEPrHC7GpWqRSM9dRCllMukRaUyx/5bBdXjKwOQ/X0WZTCmR/FJnr247mlKzel/IAg48Ktf8Tsr0E+cbWAChZbCa1Q7zBtF722kwNygo5DPFhYiFmppT9XBpzX5wuw9hBKv5wqzXCLDrlygTeCnLUZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692122; 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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=ELqFY5aeQbQdvZDoHtauFSpHFmKuMm6lYJw5SM1R+33FRQyPR0Omnvk0AH04oM3PyW35GUebyRHHIU7tJsVAaW+KXKUBZmyKDqdUTLcFVtscjowvZSBl5wavv+hqU/LgUgvchATEmugA+QgHrgvTN0QaNCOURp75MpTJ2rLu0Yo= 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+importer=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 1652692122414598.9672965186678; Mon, 16 May 2022 02:08:42 -0700 (PDT) Received: from localhost ([::1]:54130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWiW-0008I6-4M for importer@patchew.org; Mon, 16 May 2022 05:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWbI-0000aK-Gg for qemu-devel@nongnu.org; Mon, 16 May 2022 05:01:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWbE-0006wm-DU for qemu-devel@nongnu.org; Mon, 16 May 2022 05:01:11 -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-166-G10B1iJCPDqVSOKj28Jj-w-1; Mon, 16 May 2022 05:01:06 -0400 Received: by mail-ed1-f72.google.com with SMTP id cz24-20020a0564021cb800b00425dfdd7768so9347544edb.2 for ; Mon, 16 May 2022 02:01:05 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n1-20020a05640204c100b0042617ba63basm4831949edw.68.2022.05.16.02.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:01:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691667; 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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=TdYAe9Jb23MIfSgIPAkIEaoPAJApQ/UJCd9BaSuElXDRbdKXRaS9ZgHntHuarSwgUzPoUk OOiOzD3yh4bX361gjDAwDcBjlcVT5xbYiSF97Sx43g5KrKzOGfpnnEaZTmLd0Gq9T6tdOZ em3vQGAUOtcZjtWyd81QTUSkQ0Du0hU= X-MC-Unique: G10B1iJCPDqVSOKj28Jj-w-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=rRGFmmWrvFauEvbFjKsPLrTX63Qg5FEbeG2U5oVq2X0=; b=XP1P9BIQW7ybpAaPoYrfFGrSN/kQAqUeuXfjR5tL6wlROh0wSRrxoCvJlyfBDvv81A PKbwHbOWd03aZRFiYWqCotXFBnVoTEm7ZBehuQlYTxx+0GwKhuU358A/AOr3BAQxc3br pBJlc2ayoELPOkWhdIIkn+WWjHDZ78eFpiJ9MNxY3Z3+QL+XLGFHtVXOpNuBsh1/Ersa 9YKYqIiDzfYXoq1Wzld0LxMDXvysrU+21oBqtU1xzCjUDmvlwiCjRXeGW46El/Cc0+c/ 86HukLbUOuwQaNfAdntbArgbQE5y18r813imCns9SiKfHzM6TmD4SxKeGzJx26gOoqnb m8Ag== X-Gm-Message-State: AOAM533+Zj8W/0toLJ+nyd6xtUXvjpVxSonK+UbQVI6glufvwNF33n3B KxETiBdqmFoy9ukqV/UdW94GYX3PxYa2sDTGvdqzdBF7ACUDWKNA0U4AdfZB/YevCrVNULnxlN8 VJGimPkyjHczIaQUOPPKDuFZCkGWAWn0De+XyDK/0zF06jkmfnE4zsXbfhmWmwpcgxXk= X-Received: by 2002:a17:906:cf84:b0:6f3:a3d8:365f with SMTP id um4-20020a170906cf8400b006f3a3d8365fmr14900809ejb.242.1652691664165; Mon, 16 May 2022 02:01:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6QP9URW4V6UArjFzJwDIBdy4Hw0dp+Ti6p4197blolcgxRWKESHOGjSfG2wyqNcki2S/2sg== X-Received: by 2002:a17:906:cf84:b0:6f3:a3d8:365f with SMTP id um4-20020a170906cf8400b006f3a3d8365fmr14900777ejb.242.1652691663817; Mon, 16 May 2022 02:01:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 2/8] kvm: Support for querying fd-based stats Date: Mon, 16 May 2022 11:00:52 +0200 Message-Id: <20220516090058.1195767-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692124091100001 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 --- accel/kvm/kvm-all.c | 403 ++++++++++++++++++++++++++++++++++++++++++++ qapi/stats.json | 2 +- 2 files changed, 404 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 32e177bd26..6a6bbe2994 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,398 @@ 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) +{ + + StatsList *stats_entry; + Stats *stats; + uint64List *val_list =3D NULL; + + 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_entry =3D g_new0(StatsList, 1); + 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++) { + uint64List *val_entry =3D g_new0(uint64List, 1); + val_entry->value =3D stats_data[i]; + val_entry->next =3D val_list; + val_list =3D val_entry; + } + stats->value->u.list =3D val_list; + stats->value->type =3D QTYPE_QLIST; + } + + stats_entry->value =3D stats; + stats_entry->next =3D stats_list; + + return stats_entry; +} + +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(&local_err, "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(&local_err, "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(errp, "KVM 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 f0656a6435..382223e197 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -51,7 +51,7 @@ # Since: 7.1 ## { 'enum': 'StatsProvider', - 'data': [ ] } + 'data': [ 'kvm' ] } =20 ## # @StatsTarget: --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692022; cv=none; d=zohomail.com; s=zohoarc; b=P9wSdiYAo+fXtJ8BOwnq/FRzf30hj6hDSPYt0fr4+mtit7XRKTHqSwcId9IBLSEx1De9PH71uczpPoxQa29oTN5go2tm9g1L4Xuv8tTnyLcWxlT3FmKW1r45WlBvoV5E4eapfLhZTQOUNPs/5meI//6PhXFGyjPqnLxqd/VctEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692022; 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=KAz6VvdrSrO0UXQwBb7vQOWgH0WwFgWzQ436Eg4Z1QU=; b=E7mLg3oKlb5RZVUtWiN/pkZjj+GVS0cMZoz3eMubABgWRpUz2NgJM0sCJURHFpBsNT2wLgZ5LSDD6TinRjhleHk1xe0s/I34ul0iXdgZTSVmWAgsnqTcKrKqVPSbE599gJkirHFrSIupAQ9tGo2alrtzkaDfxhj59IsY6S+l7Ks= 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+importer=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 1652692022519871.1904726186489; Mon, 16 May 2022 02:07:02 -0700 (PDT) Received: from localhost ([::1]:48580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWgv-0004Qg-Eo for importer@patchew.org; Mon, 16 May 2022 05:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcn-0001gu-8h for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcl-0007MB-2D for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:44 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-FwPeIZDtOa-2Mr-f5iNr_Q-1; Mon, 16 May 2022 05:02:41 -0400 Received: by mail-ej1-f71.google.com with SMTP id qa15-20020a170907868f00b006f4c89bf2e3so5458810ejc.9 for ; Mon, 16 May 2022 02:02:41 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id i25-20020a0564020f1900b0042ab1735552sm1359586eda.66.2022.05.16.02.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691762; 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=KAz6VvdrSrO0UXQwBb7vQOWgH0WwFgWzQ436Eg4Z1QU=; b=Sp/Z60u2kl4wqrL1NdXbuVzdaKfzFNBt1yE44W6FC0bj6gB2H8LvgLQlXEVR6HbPC8x00q ane8dEVWr8p6RC+9NYXjH+JxMDPbJoKwz4SzKyThMoO/giQ1t1iV4L5fiYDZiJd4wbOyS/ ITK/xkFDJETtBzhe0RMLBovxlolUc24= X-MC-Unique: FwPeIZDtOa-2Mr-f5iNr_Q-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=KAz6VvdrSrO0UXQwBb7vQOWgH0WwFgWzQ436Eg4Z1QU=; b=NjCya/Dd1jgsJ6M5nnkZHzb2Kq5m3hKRrWR7YL+f1D/P9AH/qgQ7BdO3PTkkCWZc3o X8JnX/BEaWy8RJ2c9Z9P+/5PXW3BIieHYGlOeJM3FFxHEciDw85RMFxwPCiq8ycvysPy NjaYsZOP0HSNBc+a/aUCKX/xkqm0dz7FGKNA+aJyHPbgK9etlKxlIPPhN+qJSKKpULuP NrWKMQHxO5eVkgiBQvnl3iXeIGeLM8ZFWI9MEdSz7m1hEDFtB+exuJGjZnVN7PjZvxap bIrPYIDooOPhF5egwBNLefs2bAjp1SAuL45bPChSaTxCU26QeC9peFcHD+pu4UumAIxF hZxg== X-Gm-Message-State: AOAM533cQbF/+isBCOFd6qhkwq7//r2K069dR6BSLQAxFu/h/TVp3cUT JgRX/mUqx/ckz63btp8Ww+v+krr9c+bPaQzzpIUgcpuILtwQCu6kpZi5W3inwW5nb5GyH5QrgqJ OmFSatZXW/f2pQm5tOq+Pa1o0+UYUsYlf4FyDKQhHqpVpGjf+pVaqbR6P43vvpq17g7U= X-Received: by 2002:a17:907:9709:b0:6fd:c0e1:c86b with SMTP id jg9-20020a170907970900b006fdc0e1c86bmr13790703ejc.600.1652691759594; Mon, 16 May 2022 02:02:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkN8/j19WIBqBTjsBY3MNmxmXyTepAAjg3tYwhRfdTEqvzdDYHbsalJ21HJjT6HC1SpQU27Q== X-Received: by 2002:a17:907:9709:b0:6fd:c0e1:c86b with SMTP id jg9-20020a170907970900b006fdc0e1c86bmr13790678ejc.600.1652691759314; Mon, 16 May 2022 02:02:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 3/8] qmp: add filtering of statistics by target vCPU Date: Mon, 16 May 2022 11:02:29 +0200 Message-Id: <20220516090234.1195907-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692024014100001 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. Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 9 +++++++-- include/monitor/stats.h | 9 ++++++++- monitor/qmp-cmds.c | 34 +++++++++++++++++++++++++++++++++- qapi/stats.json | 20 +++++++++++++++++--- 4 files changed, 65 insertions(+), 7 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 6a6bbe2994..28f8a45205 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) @@ -4049,7 +4050,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; @@ -4073,6 +4075,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 (!str_in_list(cpu->parent_obj.canonical_path, targets)) { + 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 89552ab06f..92a1df3072 100644 --- a/include/monitor/stats.h +++ b/include/monitor/stats.h @@ -10,7 +10,8 @@ =20 #include "qapi/qapi-types-stats.h" =20 -typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target= , Error **errp); +typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target, + strList *targets, Error **errp); typedef void SchemaRetrieveFunc(StatsSchemaList **result, Error **errp); =20 /* @@ -30,4 +31,10 @@ 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. + */ +bool str_in_list(const char *string, strList *list); + #endif /* STATS_H */ diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index d83faeca88..1ec7409bc2 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -463,13 +463,30 @@ void add_stats_callbacks(StatRetrieveFunc *stats_fn, QTAILQ_INSERT_TAIL(&stats_callbacks, entry, next); } =20 +static strList *stats_target_filter(StatsFilter *filter) +{ + switch (filter->target) { + case STATS_TARGET_VM: + return NULL; + case STATS_TARGET_VCPU: + if (!filter->u.vcpu.has_vcpus) { + return NULL; + } + return filter->u.vcpu.vcpus; + break; + default: + abort(); + } +} + StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp) { StatsResultList *stats_results =3D NULL; + strList *targets =3D stats_target_filter(filter); StatsCallbacks *entry; =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - entry->stats_cb(&stats_results, filter->target, errp); + entry->stats_cb(&stats_results, filter->target, targets, errp); } =20 return stats_results; @@ -512,3 +529,18 @@ void add_stats_schema(StatsSchemaList **schema_results, entry->stats =3D stats_list; QAPI_LIST_PREPEND(*schema_results, entry); } + +bool str_in_list(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 382223e197..859fc0f459 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -68,16 +68,30 @@ { 'enum': 'StatsTarget', 'data': [ 'vm', 'vcpu' ] } =20 +## +# @StatsVCPUFilter: +# +# @vcpus: list of QOM paths for the desired vCPU objects. +# +# Since: 7.1 +## +{ 'struct': 'StatsVCPUFilter', + 'data': { '*vcpus': [ 'str' ] } } + ## # @StatsFilter: # # The arguments to the query-stats command; specifies a target for which to -# request statistics. +# request statistics and optionally the required subset of information for +# that target: +# - which vCPUs to request statistics for # # Since: 7.1 ## -{ 'struct': 'StatsFilter', - 'data': { 'target': 'StatsTarget' } } +{ 'union': 'StatsFilter', + 'base': { 'target': 'StatsTarget' }, + 'discriminator': 'target', + 'data': { 'vcpu': 'StatsVCPUFilter' } } =20 ## # @StatsValue: --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692344; cv=none; d=zohomail.com; s=zohoarc; b=nbxHZ4krIsknDbin5PS+8c2GH8ReKLx/FghqSUXRFq3i0S4iv2TI6ifd3Lqr5CB8SWomSFagfFe7x+DqZcXTy6gAxg7ssb/aDqiUBNm/e0VHT1/GGd6FdOOWPR7CjMhQxDxV0P/V4BM2WrdnN2+lV3LUmIBfFVGJBeOUorkql3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692344; 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=+j/CrbEnbe1mDRYnK/ApyTyZ4x3qCcODN5HJDqu7f8U=; b=PRxRODpn9jzIYrkz+lWa9FWRKJy9enB9Q7gyv6kviTH/Uxnj4PYIABCzo1hBalgeexeI3QIBnvvVVO96IUDXXP6XWHPzK+0AKFvINi78iRGO02GrqCwpRfISCHtYAN1djLwVGD8nIa4nqLZ/VlHAtAL+sUgROMMsrbMS+wtatng= 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+importer=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 1652692344077907.1053516659613; Mon, 16 May 2022 02:12:24 -0700 (PDT) Received: from localhost ([::1]:33684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWm6-0005D5-WB for importer@patchew.org; Mon, 16 May 2022 05:12:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcp-0001hz-43 for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:44125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcm-0007MY-Ir for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:46 -0400 Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-111-6RQ97vhaNbe6Dffskh5ulw-1; Mon, 16 May 2022 05:02:42 -0400 Received: by mail-ed1-f70.google.com with SMTP id n9-20020aa7d049000000b0042aab725949so2237354edo.23 for ; Mon, 16 May 2022 02:02:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id d2-20020a170907272200b006f3ef214dcfsm3482755ejl.53.2022.05.16.02.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+j/CrbEnbe1mDRYnK/ApyTyZ4x3qCcODN5HJDqu7f8U=; b=P1V+UMaGeKrMLZL6P9P3JXVlFLSGx9zBS/87Msfjn8mu7cISg6bNWdgQSv5H4kbqcER8bd TkqOaZENtST9P9hmvKIi809yUr/P+ya5lnqX0q5dJX/g0YGjKh8xynYReZkf2DepZwjxw3 /oOLM3KNXPHvl5m3lwmLi/BXMaMZkIM= X-MC-Unique: 6RQ97vhaNbe6Dffskh5ulw-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=+j/CrbEnbe1mDRYnK/ApyTyZ4x3qCcODN5HJDqu7f8U=; b=mYSixYXhSVuwrg0aGpQU3vfnXN66IVGlwaBIc2BJ/cuco/wXe5zkedvRRwvqowV+Th HYsZcXAr/pfmN/v7uLeIRUdKJJMGFERhaIP9TRuYPnulZ5OFximRubYUuKduhz3xnfd4 zo+ni/WLBrVsx4MJhwayLqI+EvMScEIpLSdOEcTq1uNt1144J1l/O42z2VosEDX6971L wnEwBx6+zLX1QWCe893hoO2SMqWaxrVCp7dAp+1zPV9I0q6Lw3AXmveDhfafBZc3vUv1 vozW6wDMH1D+Qg0rfleXd+P/G4xsrwHHMK+6wJyLQxENxJ/F8S4UDp6dpjnHcsbA5l/W Z5yA== X-Gm-Message-State: AOAM531nEXSeq9F7adFIuv8J4RPjWtFiSxrPVtLbZnFKHlbX5dB4L3FH 3sdZREpjzFllvwCl4u8pPhRE5hAaxjjWuFOdKz7GQrM/PpaK7SO7usS2dQoIaoHbJ+EO8L22Y/9 qt0EsX6Ya9BYZsrZBJRwbrpbh1aS9R/bpfMlvxDzoIcmRVdm6GI5QMwlikvRRwQ2hy9Y= X-Received: by 2002:a17:906:f88f:b0:6f3:eaed:c143 with SMTP id lg15-20020a170906f88f00b006f3eaedc143mr13878671ejb.311.1652691761281; Mon, 16 May 2022 02:02:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZStpYh+oXVAinxjC5/td0Y/qz85V7OzF5cgvWn0zZcvjNMVs5JvDg4pAVa3w3jkThmz6hFw== X-Received: by 2002:a17:906:f88f:b0:6f3:eaed:c143 with SMTP id lg15-20020a170906f88f00b006f3eaedc143mr13878648ejb.311.1652691760972; Mon, 16 May 2022 02:02:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 4/8] hmp: add basic "info stats" implementation Date: Mon, 16 May 2022 11:02:30 +0200 Message-Id: <20220516090234.1195907-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692345539100001 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 | 187 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index adfa085a9b..221feab8c0 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -894,3 +894,16 @@ SRST ``info via`` Show guest mos6522 VIA devices. ERST + + { + .name =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 93061a11af..5950133a11 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -40,6 +40,7 @@ #include "qapi/qapi-commands-pci.h" #include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-run-state.h" +#include "qapi/qapi-commands-stats.h" #include "qapi/qapi-commands-tpm.h" #include "qapi/qapi-commands-ui.h" #include "qapi/qapi-visit-net.h" @@ -52,6 +53,7 @@ #include "ui/console.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "hw/core/cpu.h" #include "hw/intc/intc.h" #include "migration/snapshot.h" #include "migration/misc.h" @@ -2233,3 +2235,188 @@ void hmp_info_memory_size_summary(Monitor *mon, con= st QDict *qdict) } hmp_handle_error(mon, err); } + +static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value) +{ + const char *prefix =3D ""; + monitor_printf(mon, " %s (%s", value->name, StatsType_str(value->ty= pe)); + + if (value->has_unit && value->unit =3D=3D STATS_UNIT_SECONDS && + (value->exponent =3D=3D 0 || value->base =3D=3D 10) && + value->exponent >=3D -9 && value->exponent <=3D 0 && + value->exponent % 3 =3D=3D 0) { + + static const char *si_prefix[] =3D { "", "milli", "micro", "nano" = }; + prefix =3D si_prefix[value->exponent / -3]; + + } else if (value->has_unit && value->unit =3D=3D STATS_UNIT_BYTES && + (value->exponent =3D=3D 0 || value->base =3D=3D 2) && + value->exponent >=3D 0 && value->exponent <=3D 40 && + value->exponent % 10 =3D=3D 0) { + + static const char *si_prefix[] =3D { + "", "kilo", "mega", "giga", "tera" }; + prefix =3D si_prefix[value->exponent / 10]; + + } else if (value->exponent) { + /* Print the base and exponent as "x ^" */ + monitor_printf(mon, ", * %d^%d", value->base, + value->exponent); + } + + if (value->has_unit) { + monitor_printf(mon, " %s%s", prefix, StatsUnit_str(value->unit)); + } + + /* Print bucket size for linear histograms */ + if (value->type =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.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692189; cv=none; d=zohomail.com; s=zohoarc; b=hRZaI5Xn+LCWM2tGKhaZzVFge9lFV5ecwgCrLrpaJ8Y9BWFNoXuXGBtBcs43PO+HoLgK9JHp3F6iDQF8AOS7nCyn0sqBmfmVDUemuRsLHaWTIr8jwkmsKCWHaadvkpR5oFRIWVo9oOwpc5ZVBPfGvbqvWSaCItvNcC9BlpFtc7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692189; 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=fhBoIdIC/g/xBCiF1CKVdxabF40cX/HqBigrIUUXWoM=; b=lTFp8AKRGC0FxA7a+e5MgxWwUaxu4C7eI7lzbtCPI9xgA/q9FgP2/M7vHGBZgkhj4PoaKi9oe5Jd5ZzOtjMAQdNPgDkQbo6ZLjqh6jEMTrX7FNJQFJCnzto9zs51B5EeBIggdhloPTh5BTGbarMnxga3wbGBatTyeokdMaRtn20= 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+importer=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 1652692189097342.733240759164; Mon, 16 May 2022 02:09:49 -0700 (PDT) Received: from localhost ([::1]:56966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWjb-0001lS-Pp for importer@patchew.org; Mon, 16 May 2022 05:09:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcs-0001jO-7V for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42810) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcp-0007Mt-Pf for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:49 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-225-EqvyErL2Psu_z8xTjFn4BQ-1; Mon, 16 May 2022 05:02:45 -0400 Received: by mail-ej1-f70.google.com with SMTP id jx8-20020a170906ca4800b006f88b28f2f6so5499486ejb.11 for ; Mon, 16 May 2022 02:02:44 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id y15-20020a170906518f00b006f3ef214df1sm3490371ejk.87.2022.05.16.02.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691766; 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=fhBoIdIC/g/xBCiF1CKVdxabF40cX/HqBigrIUUXWoM=; b=O0wOKX3AEh02IWSAVDY+dP6g0LvqHUF4YGLnAJoRylCLksX7s9OF/HPFTdRTSFBjoAq0Sr vasqZ/Ophdx5+HmE2YHo3wSIVNVaKK+6TktDpYuf43cj7H+mW6G2H6q8w0e7DRtdE2RWZb ULHrhRasub8qOt7AO20huz+O9clePog= X-MC-Unique: EqvyErL2Psu_z8xTjFn4BQ-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=fhBoIdIC/g/xBCiF1CKVdxabF40cX/HqBigrIUUXWoM=; b=YOGnFxxnN/MgoGWXR/nA/nzPst9mSVHNIzYBc2XhVjO8GZb0//02ZF2mM17PmpjYJf PNoq3AwZ+ufu51T6EiZrJTW5emvtaVaEN94QPuAlxHOGVzBPQ3LcoQSu1AKkLoe9u/jH AeZwEEq/OIzPREDTTljfQc0jtpNNvzVxzox8ZcgkG61CKP2iKn2S2KJjguBqx/rAKOFV lmsjJfzr1hmzZJ6PCEomQ568wncL6TFb9OA/vWqQ5EPmwBa1GsUoIcxFCskJS87f47Wi tE5XwuXz1LP3RwtDc3UHUBB3b1KBUB91GMnRaATQ8RcAr9oIDzp9t3fhHu7U9+A21h9D qgrg== X-Gm-Message-State: AOAM530dSSiWyrJaUk6vDQtqDiIxXuu/ajzFmT9DP8YaYYlKt7KbY8tU oD+6gdke92Cc5FNspZe/TRGZ/DhR3vyQiMOElA9w8ptFbdSDTfKb/lUb6nT+0syxBP52NuzrUH7 ohIHaWA7B8XTxRWphydeoOLATODUyr98TBTX8TLi0NyTNInYC9CunUEzgzF4CVlH2X5o= X-Received: by 2002:aa7:d88f:0:b0:42a:adb3:be01 with SMTP id u15-20020aa7d88f000000b0042aadb3be01mr5668884edq.219.1652691763604; Mon, 16 May 2022 02:02:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpo9FWFXYlzeY+BTK8kRkfOlpNVEkYeRCDitLcu2htARmCn4zd3FRLAurzFpK7UNoWhqmzzg== X-Received: by 2002:aa7:d88f:0:b0:42a:adb3:be01 with SMTP id u15-20020aa7d88f000000b0042aadb3be01mr5668845edq.219.1652691763258; Mon, 16 May 2022 02:02:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 5/8] qmp: add filtering of statistics by provider Date: Mon, 16 May 2022 11:02:31 +0200 Message-Id: <20220516090234.1195907-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692190420100001 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. Extracted from a patch by Mark Kanda. Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 3 ++- include/monitor/stats.h | 4 +++- monitor/hmp-cmds.c | 2 +- monitor/qmp-cmds.c | 33 +++++++++++++++++++++++++++++---- qapi/stats.json | 17 +++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 28f8a45205..12e003fdd2 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 92a1df3072..acfd975df9 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 * @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 5950133a11..15f1743d8c 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2388,7 +2388,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, 0, &err); if (err) { goto exit; } diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 1ec7409bc2..4d8a08879a 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 @@ -479,6 +482,22 @@ static strList *stats_target_filter(StatsFilter *filte= r) } } =20 +static bool stats_provider_requested(StatsProvider provider, + StatsFilter *filter) +{ + StatsRequestList *request; + + if (!filter->has_providers) { + return true; + } + for (request =3D filter->providers; request; request =3D request->next= ) { + if (request->value->provider =3D=3D provider) { + return true; + } + } + return false; +} + StatsResultList *qmp_query_stats(StatsFilter *filter, Error **errp) { StatsResultList *stats_results =3D NULL; @@ -486,19 +505,25 @@ StatsResultList *qmp_query_stats(StatsFilter *filter,= Error **errp) StatsCallbacks *entry; =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - entry->stats_cb(&stats_results, filter->target, targets, errp); + if (stats_provider_requested(entry->provider, filter)) { + entry->stats_cb(&stats_results, filter->target, targets, errp); + } } =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; =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - entry->schemas_cb(&stats_results, errp); + if (!has_provider || provider =3D=3D entry->provider) { + entry->schemas_cb(&stats_results, errp); + } } =20 return stats_results; diff --git a/qapi/stats.json b/qapi/stats.json index 859fc0f459..88190ae19b 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -68,6 +68,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: # @@ -85,11 +97,12 @@ # request statistics and optionally the required subset of information for # that target: # - which vCPUs to request statistics for +# - which provider to request statistics from # # Since: 7.1 ## { 'union': 'StatsFilter', - 'base': { 'target': 'StatsTarget' }, + 'base': { 'target': 'StatsTarget', '*providers': [ 'StatsRequest' = ] }, 'discriminator': 'target', 'data': { 'vcpu': 'StatsVCPUFilter' } } =20 @@ -225,5 +238,5 @@ # Since: 7.1 ## { 'command': 'query-stats-schemas', - 'data': { }, + 'data': { '*provider': 'StatsProvider' }, 'returns': [ 'StatsSchema' ] } --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692025; cv=none; d=zohomail.com; s=zohoarc; b=AFG63ANd8T9NLtczGHyIt+r1vMkac72QlikENlYVgbDi1j9H7X9mCvY8Bpvc6o2E5uqbvOeV+zaOQxDrKJFJMJSMOQOQqXR+QRXX+BU7Ctc2xtjAnG0qdzygN3tO10OjFMK7Ab9FjJyESApfWY6Ww9P1KvoMIdE9SjF6/OFQ1/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692025; 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=NSFER6z0wbGPm10VNA5292fy0AANqadloqali01ZdbE=; b=aw9ELOCYPee/UReYIw5FvA0Iv43+IBKD1S1NR55y7gIiBgOGNuaiEJI1d7LQ25klmUeJKh3qCoFovoHCzyo8RBhLjvKm3F0SW7XVHg0IQd++e6VBA7wA+w4DPzDUYyrVEeA81u/zgCd6YWVM9DJoDttVa6DptaeAAbaVIn5JZF0= 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+importer=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 1652692025308959.8292309875318; Mon, 16 May 2022 02:07:05 -0700 (PDT) Received: from localhost ([::1]:48770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWgx-0004Ys-Mi for importer@patchew.org; Mon, 16 May 2022 05:07:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWct-0001kH-8d for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcr-0007N4-1T for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:50 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-622-TRHdSY8kM1Cydt2P0Ys73g-1; Mon, 16 May 2022 05:02:47 -0400 Received: by mail-ej1-f71.google.com with SMTP id sc20-20020a1709078a1400b006f4a358c817so5491117ejc.16 for ; Mon, 16 May 2022 02:02:46 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id g42-20020a056402322a00b0042a9a1cc4bfsm3057930eda.93.2022.05.16.02.02.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691768; 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=NSFER6z0wbGPm10VNA5292fy0AANqadloqali01ZdbE=; b=abrp9zvWVDM7GG/CxHdx5VLr5gdQHVIQFv2Syg0leac7gw2Glr10jX4VaI6AMN++9latZ+ Y/s/S0yE4IiJrTtiaoWa9IyXoiHJosTJcoZV2clT4ktwioKta0gXYGw/+biTvk5PYq/jmb U4G0b1Awm2v6r/e/9/XMWFMFNqM0SGY= X-MC-Unique: TRHdSY8kM1Cydt2P0Ys73g-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=NSFER6z0wbGPm10VNA5292fy0AANqadloqali01ZdbE=; b=fIX9fcBCIY4awFCYHTkpR52coyE3aTWNblC+VVYYNMWJmBLlZoVXuDtoH418ffIt7B Rx3dfgP5T0baNbNHrqj+ZqlzvzfpkHC/dpE+sZ9SXCIzACGwg5GUjXs/unk0GYw884JL THSnsbtKhviJFo+dW0FivEUS/q+HqSJwPnK8nlDOdS3jfauSVzDUbzdKqNpee+NWXwlu lDeXe3TQoSsdrE+JpC4dc/XhN2FwTM4d8gfD1RnVMrsQ4e5Ag9x/Sg4rwbb9hy7BrGb+ /CEmWABywwlPmXash2NtNZlirzDtAhkklSF+vV+qBMRhQ//xy9o808aarMIZQPrDta4t vR0w== X-Gm-Message-State: AOAM532mg5ga3ewo4kMgOs076Y+xHk7be+AfhnJ5nhJNn+EXRV27pnl/ T4pi4luH3s1cEcp9FFjwuBDHwYnYzHcafYRxTsva/WAgunp2i7ZZwq4NnEYx92yi5qw16C3U3qM qSnSlct6DGTDeBoYEQVCuSFaBddc+e9+/BKwiNaBFBPQemZT0Iid5DKTABB6mLy42u04= X-Received: by 2002:aa7:d898:0:b0:42a:af71:dc24 with SMTP id u24-20020aa7d898000000b0042aaf71dc24mr5017355edq.162.1652691765446; Mon, 16 May 2022 02:02:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyY2+Fn5KuuiHsvI+fq76gpEh8A7FrxBe0UtUbQ+59TEAotm8jwMJLgMQDTZWO1/OTMLzp37w== X-Received: by 2002:aa7:d898:0:b0:42a:af71:dc24 with SMTP id u24-20020aa7d898000000b0042aaf71dc24mr5017326edq.162.1652691765206; Mon, 16 May 2022 02:02:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 6/8] hmp: add filtering of statistics by provider Date: Mon, 16 May 2022 11:02:32 +0200 Message-Id: <20220516090234.1195907-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692025847100003 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 --- hmp-commands-info.hx | 7 ++++--- monitor/hmp-cmds.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 221feab8c0..d4d8a1e618 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 15f1743d8c..4fa671fe0a 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2291,6 +2291,7 @@ static StatsSchemaValueList *find_schema_value_list( } =20 static void print_stats_results(Monitor *mon, StatsTarget target, + bool show_provider, StatsResult *result, StatsSchemaList *schema) { @@ -2305,8 +2306,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, @@ -2347,7 +2350,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 @@ -2369,12 +2373,27 @@ 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. */ + StatsRequest *request =3D g_new0(StatsRequest, 1); + request->provider =3D provider; + StatsRequestList *request_list =3D g_new0(StatsRequestList, 1); + QAPI_LIST_PREPEND(request_list, request); + filter->has_providers =3D true; + filter->providers =3D request_list; 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; @@ -2387,19 +2406,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, 0, &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(); @@ -2410,7 +2437,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.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692190; cv=none; d=zohomail.com; s=zohoarc; b=iG5nWAi7Tx2DaEP38y043bgQYDaYQtqovs3rC4jnihjOykKrwHT6Rxm1tk5+L67C4tyecyVJ3rgVTcysih7nV65jgCpV2wlj36d+ybL3IbiZqx1KLJRXA55IHIxL/PFT26p/kepU6GQfMVBsf3hJfm/aj8xPA2xL5bYU2rrjdyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692190; 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=TgAZI+MF3K/J0JPSBXUMUhZvdYjcVsWVqm+XOymwc/s=; b=VTLD0COak0iwsI7QbUZVlOHeeO3ZKS1UZ2rz21M4FqbLKrVmJobL3cb6NPtctdgG7l46matUmoJYCDN2XZz66bzQvQp61iQ81grigYDwl9wtbWx57SbCuoPc3Z34qjXafk+8TUJK5Jpz8jILTL42lZr1+h2PX2dO+QVYToB8Zj4= 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+importer=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 1652692190784531.9908897926484; Mon, 16 May 2022 02:09:50 -0700 (PDT) Received: from localhost ([::1]:57132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWjd-0001sG-HC for importer@patchew.org; Mon, 16 May 2022 05:09:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWd1-0001tK-8x for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:39698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWcz-0007OT-BO for qemu-devel@nongnu.org; Mon, 16 May 2022 05:02:58 -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-511-rH1CxobTOy2OeRcbWCNOyQ-1; Mon, 16 May 2022 05:02:55 -0400 Received: by mail-ed1-f70.google.com with SMTP id ay24-20020a056402203800b0042a96a76ba5so3288381edb.20 for ; Mon, 16 May 2022 02:02:55 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id 28-20020a170906005c00b006f4c557b7d2sm3444637ejg.203.2022.05.16.02.02.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691776; 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=TgAZI+MF3K/J0JPSBXUMUhZvdYjcVsWVqm+XOymwc/s=; b=a/xspd0N7PoyhnAWcYwsUU06iY51dmJWm6Q3nXUbNI35vvngDDNyLNW+sCT2OnFTwY6X1a mKgaWNa9F5TXmbl4/BmN4CXjJSemK948wkgcofEVOtmDgyqfS3UFu9MY1HbyD0u4bjb/Sr NC+0cUi5xwoyTPU8BYTifgash+wkqoY= X-MC-Unique: rH1CxobTOy2OeRcbWCNOyQ-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=TgAZI+MF3K/J0JPSBXUMUhZvdYjcVsWVqm+XOymwc/s=; b=TveKedhMXeKRTIRRcPRFufEvKvRpxw3H3HQbzTQAg+ap5ueoxXEm4j2f6b17jDXRXE sFT3PZzfYGPWbbhImg2s92Xd/8qlIesfMYPnLy6bkVh1oSf4Vpre5bkeVjXeturFaFv2 jdN0wdwYkOl6emJm/vnVFe5MmfO4GKGxsteuRVcF8JLXrgDLAEnS3VyrSPVO8h1MyG0C /b4JXFlJDb4UeuL726wlxcpyLX7sOaSYWMoClFwHNPToH5Zd5rVWgRNMwizvUyWN/S0P DhePeu5Ot2c5TVmqYUpAmvPsl2IWvFpliKv1HGzgkRS5YO3qA4SEZfrDRpeZcHRfJRE5 fZ6g== X-Gm-Message-State: AOAM533c4RjdC1ebQXczJBZhivix4m3ogBDiK46D6Wj9AnfWuhVcquub Ah9+MuW7Pun2Me7OsqGX84vHCOQ8ygQSECu4gw/WGpPJB65O8p3eqs3DyL7kKEw/NfINZ1j/0z2 CPevLdWOJ5SxUP/v47y1AeYtMNPjJWnsvxAMhrwC52VMsFBPUIJ9MFFZ9LpG5akLZ5jU= X-Received: by 2002:a17:906:c14b:b0:6f8:e6bb:f8d5 with SMTP id dp11-20020a170906c14b00b006f8e6bbf8d5mr14214181ejc.4.1652691773399; Mon, 16 May 2022 02:02:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvC6ovN9UtxAmLQ/SuERYaDAk0iaigSqLE5PLdFRZ27KIp2TZjQxyiVIVuxqlnRWJwMP6xRg== X-Received: by 2002:a17:906:c14b:b0:6f8:e6bb:f8d5 with SMTP id dp11-20020a170906c14b00b006f8e6bbf8d5mr14214151ejc.4.1652691773066; Mon, 16 May 2022 02:02:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 7/8] qmp: add filtering of statistics by name Date: Mon, 16 May 2022 11:02:33 +0200 Message-Id: <20220516090234.1195907-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692192377100003 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 --- accel/kvm/kvm-all.c | 17 +++++++++++------ include/monitor/stats.h | 4 ++-- monitor/qmp-cmds.c | 10 +++++++--- qapi/stats.json | 6 +++++- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 12e003fdd2..403bc42ce0 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2311,7 +2311,7 @@ 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, +static void query_stats_cb(StatsResultList **result, StatsTarget target, s= trList *names, strList *targets, Error **errp); static void query_stats_schemas_cb(StatsSchemaList **result, Error **errp); =20 @@ -3713,6 +3713,7 @@ typedef struct StatsArgs { StatsResultList **stats; StatsSchemaList **schema; } result; + strList *names; Error **errp; } StatsArgs; =20 @@ -3926,7 +3927,7 @@ static StatsDescriptors *find_stats_descriptors(Stats= Target target, int stats_fd return descriptors; } =20 -static void query_stats(StatsResultList **result, StatsTarget target, +static void query_stats(StatsResultList **result, StatsTarget target, strL= ist *names, int stats_fd, Error **errp) { struct kvm_stats_desc *kvm_stats_desc; @@ -3969,6 +3970,9 @@ static void query_stats(StatsResultList **result, Sta= tsTarget target, =20 /* Add entry to the list */ stats =3D (void *)stats_data + pdesc->offset; + if (!str_in_list(pdesc->name, names)) { + continue; + } stats_list =3D add_kvmstat_entry(pdesc, stats, stats_list, errp); } =20 @@ -4030,8 +4034,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 @@ -4052,7 +4056,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; @@ -4066,7 +4070,7 @@ static void query_stats_cb(StatsResultList **result, = StatsTarget target, error_setg(errp, "KVM stats: ioctl failed"); return; } - query_stats(result, target, stats_fd, errp); + query_stats(result, target, names, stats_fd, errp); close(stats_fd); break; } @@ -4074,6 +4078,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 (!str_in_list(cpu->parent_obj.canonical_path, targets)) { diff --git a/include/monitor/stats.h b/include/monitor/stats.h index acfd975df9..b4123044f7 100644 --- a/include/monitor/stats.h +++ b/include/monitor/stats.h @@ -11,8 +11,8 @@ #include "qapi/qapi-types-stats.h" =20 typedef void StatRetrieveFunc(StatsResultList **result, StatsTarget target, - strList *targets, Error **errp); -typedef void SchemaRetrieveFunc(StatsSchemaList **result, Error **errp); + strList *names, strList *targets, Error **er= rp); +typedef void SchemaRetrieveFunc(StatsSchemaList **, Error **); =20 /* * Register callbacks for the QMP query-stats command. diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 4d8a08879a..27b3d6ea74 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -483,15 +483,18 @@ static strList *stats_target_filter(StatsFilter *filt= er) } =20 static bool stats_provider_requested(StatsProvider provider, - StatsFilter *filter) + StatsFilter *filter, + strList **p_names) { StatsRequestList *request; =20 if (!filter->has_providers) { + *p_names =3D NULL; return true; } for (request =3D filter->providers; request; request =3D request->next= ) { if (request->value->provider =3D=3D provider) { + *p_names =3D request->value->has_names ? request->value->names= : NULL; return true; } } @@ -505,8 +508,9 @@ StatsResultList *qmp_query_stats(StatsFilter *filter, E= rror **errp) StatsCallbacks *entry; =20 QTAILQ_FOREACH(entry, &stats_callbacks, next) { - if (stats_provider_requested(entry->provider, filter)) { - entry->stats_cb(&stats_results, filter->target, targets, errp); + strList *names =3D NULL; + if (stats_provider_requested(entry->provider, filter, &names)) { + entry->stats_cb(&stats_results, filter->target, names, targets= , errp); } } =20 diff --git a/qapi/stats.json b/qapi/stats.json index 88190ae19b..95508b5a41 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -74,11 +74,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: @@ -98,6 +101,7 @@ # that target: # - which vCPUs to request statistics for # - which provider to request statistics from +# - which values to return within each provider # # Since: 7.1 ## --=20 2.36.0 From nobody Thu May 2 02:23:52 2024 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1652692424; cv=none; d=zohomail.com; s=zohoarc; b=Y1oUvxuTIGqx+Ajhd/+3+Lc42QopgO9ZemGZPwSJJN8tQkux7kp60ypQaHqPfjqy/ed85xgxuVFtdmOuaayU65int4qhKX/580cFz9+QezNvLEYjFThNXCPzLP4QOJVFs9SZgL/4zWQScg4y1ahVnwlex/KTKrF7CcRxqdiV29Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652692424; 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=UzqSppjpfAh1TGK2khHL4FpRe1zpCn/m2KlpoVzVRBQ=; b=jD4OAH1dav5gGCdgKht7mAj1M7ZOSd8Y0Heark8ckUObIeyViHz9EA7TLEsUSONzPe+oZFh+PpmdXH2HOcyUVVqJhxNt0qgdB6XrntbCI5yUzm1Rz/CLJJwBXc5meTCgW4Zw+xm+FPdrRDPozD/r6qwHCjrWvpMkLG4aNtYxRfg= 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+importer=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 1652692424878799.3241452423406; Mon, 16 May 2022 02:13:44 -0700 (PDT) Received: from localhost ([::1]:36162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nqWnP-0006rW-TG for importer@patchew.org; Mon, 16 May 2022 05:13:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWd2-0001wN-BK for qemu-devel@nongnu.org; Mon, 16 May 2022 05:03:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nqWd0-0007Oe-K6 for qemu-devel@nongnu.org; Mon, 16 May 2022 05:03:00 -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-156-ZsP17mlwPTyc_QtXMKwlWA-1; Mon, 16 May 2022 05:02:57 -0400 Received: by mail-ed1-f70.google.com with SMTP id bc17-20020a056402205100b0042aa0e072d3so2976774edb.17 for ; Mon, 16 May 2022 02:02:56 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k12-20020a056402048c00b0042aa153e73esm2785411edv.12.2022.05.16.02.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 May 2022 02:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652691778; 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=UzqSppjpfAh1TGK2khHL4FpRe1zpCn/m2KlpoVzVRBQ=; b=CAkCn31Ik4Cxow0Je9DH84dKtadvjYGYYSGPFyQh6AQrFW5H42PJ3CED8CuGnnFHOXgTqR GfXKBQn/I0jGvCXhNu9zhu0Rozp4JuklBsSxR05L0Ke4lwpud4EoxkHkhHXD00m+WuoNMF GqElKMeynRF1Tpw6H8mU5u1wTqzKeVk= X-MC-Unique: ZsP17mlwPTyc_QtXMKwlWA-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=UzqSppjpfAh1TGK2khHL4FpRe1zpCn/m2KlpoVzVRBQ=; b=Glihw/krN/fUl0rJZXxCRhmHujZyKiW50AhN1Dm5zHzgSNhOeMKia4bTKoeNNI0oI1 hOur0q4OPsDjWNjMKuBEJDj/8IvRJq6dFlKdd47tNkDDvpXm/wrjSq3i02Xsw94WHigk 0ScaE8T73Wn0pHbuxirVW/YA0ZhkBuL65e/WY6EcV2zvFozdJKqvUmKzW4Q3xTfzxi3v BeckfbQss0RUs81ADKk2X7A517gMF7uRf0goJ9rcsAOG3CGiMUQEgfkV2SVKI/9Q61IM Y3tlACrqlZKCA2D/Qt8LlDOrMFwff3OC7OPmIobWV09334vhC6lumYi+RXto14MU0RAY KxAQ== X-Gm-Message-State: AOAM533GWwK2BOGgrYewnaHNqKws0LhkaBrbI2pt7lQ+WzmNQwWHxlIX 5FYXacxfYGrvJYQ+vwlJAWWEf+ODaBbeSMYalSGK2OV8ieSsNN1cb/5iNzZtg+18gSJkLUeYxK8 6KoTetajpcCN56tYjYjGk6xqVfIZiUUh7ncEg5G2XkISJYDaygE2m9SaM7rt7QFYDKWE= X-Received: by 2002:a17:906:6a0f:b0:6f5:15cf:2e5 with SMTP id qw15-20020a1709066a0f00b006f515cf02e5mr13930128ejc.584.1652691775241; Mon, 16 May 2022 02:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy95QWf4jTFA19qmFbBy0p40K2hMhJIZ+Hm6NKCb8aeeXTq2TZJtoiD/wBkvaopFWAlodEccw== X-Received: by 2002:a17:906:6a0f:b0:6f5:15cf:2e5 with SMTP id qw15-20020a1709066a0f00b006f515cf02e5mr13930109ejc.584.1652691774924; Mon, 16 May 2022 02:02:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, berrange@redhat.com, dgilbert@redhat.com, Mark Kanda Subject: [PATCH v3 8/8] hmp: add filtering of statistics by name Date: Mon, 16 May 2022 11:02:34 +0200 Message-Id: <20220516090234.1195907-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220516090058.1195767-1-pbonzini@redhat.com> References: <20220516090058.1195767-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-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+importer=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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1652692425366100001 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 --- hmp-commands-info.hx | 8 ++++---- monitor/hmp-cmds.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index d4d8a1e618..767aafd1ea 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 4fa671fe0a..cff4e3ff10 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2350,10 +2350,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) { @@ -2374,15 +2376,27 @@ 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. */ - StatsRequest *request =3D g_new0(StatsRequest, 1); - request->provider =3D provider; - StatsRequestList *request_list =3D g_new0(StatsRequestList, 1); - QAPI_LIST_PREPEND(request_list, request); + /* + * "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 request_list; return filter; @@ -2392,6 +2406,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; @@ -2422,11 +2437,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.0