From patchwork Mon May 23 15:07:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 12859164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4FE09C433F5 for ; Mon, 23 May 2022 15:21:00 +0000 (UTC) Received: from localhost ([::1]:60528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nt9rf-0006dY-Bx for qemu-devel@archiver.kernel.org; Mon, 23 May 2022 11:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt9ek-0005pQ-J3 for qemu-devel@nongnu.org; Mon, 23 May 2022 11:07:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nt9ei-00009e-52 for qemu-devel@nongnu.org; Mon, 23 May 2022 11:07:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653318455; 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=PpkdlRyhhdisilTj7KUhUaYIHHem8cw0LzeE6Gi4nAE=; b=bgRNEYlXmKC2I0j4+8BV8ZptrkfpKZJI26Knb2yJ25Bkhc8SCajTt6O+b9IR6DOj26BfjD x/syCrPfNBxFhUoDEn2Uwve+egIMWZaU/sDYCzjeQi/jO9xRXQAd32m0fJ7R8iq/Fisa1E 81dMIvueTjfOck7ny2zT/JbcqNxR4Bk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-626-MHPGuSo8Mhe2-mT3fY3Jag-1; Mon, 23 May 2022 11:07:32 -0400 X-MC-Unique: MHPGuSo8Mhe2-mT3fY3Jag-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 08DB73806659; Mon, 23 May 2022 15:07:32 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.195.170]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2201040C1438; Mon, 23 May 2022 15:07:30 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Mark Kanda Subject: [PATCH 6/8] hmp: add filtering of statistics by provider Date: Mon, 23 May 2022 17:07:20 +0200 Message-Id: <20220523150722.349700-6-pbonzini@redhat.com> In-Reply-To: <20220523150722.349700-1-pbonzini@redhat.com> References: <20220523150509.349412-1-pbonzini@redhat.com> <20220523150722.349700-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 { .name = "stats", - .args_type = "target:s", - .params = "target", - .help = "show statistics; target is either vm or vcpu", + .args_type = "target:s,provider:s?", + .params = "target [provider]", + .help = "show statistics for the given target (vm or vcpu); optionally filter by " + "provider", .cmd = hmp_info_stats, }, diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 8d2c4792d5..02a455090d 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2297,6 +2297,7 @@ static StatsSchemaValueList *find_schema_value_list( } static void print_stats_results(Monitor *mon, StatsTarget target, + bool show_provider, StatsResult *result, StatsSchemaList *schema) { @@ -2311,8 +2312,10 @@ static void print_stats_results(Monitor *mon, StatsTarget target, return; } - monitor_printf(mon, "provider: %s\n", - StatsProvider_str(result->provider)); + if (show_provider) { + monitor_printf(mon, "provider: %s\n", + StatsProvider_str(result->provider)); + } for (stats_list = result->stats; stats_list; stats_list = stats_list->next, @@ -2353,7 +2356,8 @@ static void print_stats_results(Monitor *mon, StatsTarget target, } /* 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 = g_malloc0(sizeof(*filter)); @@ -2375,12 +2379,27 @@ static StatsFilter *stats_filter(StatsTarget target, int cpu_index) default: break; } + + if (provider == STATS_PROVIDER__MAX) { + return filter; + } + + /* "info stats" can only query either one or all the providers. */ + StatsRequest *request = g_new0(StatsRequest, 1); + request->provider = provider; + StatsRequestList *request_list = g_new0(StatsRequestList, 1); + QAPI_LIST_PREPEND(request_list, request); + filter->has_providers = true; + filter->providers = request_list; return filter; } void hmp_info_stats(Monitor *mon, const QDict *qdict) { const char *target_str = qdict_get_str(qdict, "target"); + const char *provider_str = qdict_get_try_str(qdict, "provider"); + + StatsProvider provider = STATS_PROVIDER__MAX; StatsTarget target; Error *err = NULL; g_autoptr(StatsSchemaList) schema = NULL; @@ -2393,19 +2412,27 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) monitor_printf(mon, "invalid stats target %s\n", target_str); goto exit_no_print; } + if (provider_str) { + provider = qapi_enum_parse(&StatsProvider_lookup, provider_str, -1, &err); + if (err) { + monitor_printf(mon, "invalid stats provider %s\n", provider_str); + goto exit_no_print; + } + } - schema = qmp_query_stats_schemas(false, 0, &err); + schema = qmp_query_stats_schemas(provider_str ? true : false, + provider, &err); if (err) { goto exit; } switch (target) { case STATS_TARGET_VM: - filter = stats_filter(target, -1); + filter = stats_filter(target, -1, provider); break; case STATS_TARGET_VCPU: {} int cpu_index = monitor_get_cpu_index(mon); - filter = stats_filter(target, cpu_index); + filter = stats_filter(target, cpu_index, provider); break; default: abort(); @@ -2416,7 +2443,7 @@ void hmp_info_stats(Monitor *mon, const QDict *qdict) goto exit; } for (entry = stats; entry; entry = entry->next) { - print_stats_results(mon, target, entry->value, schema); + print_stats_results(mon, target, provider_str == NULL, entry->value, schema); } exit: