From: Jing Zhang <jingzhangos@google.com>
To: KVM <kvm@vger.kernel.org>, KVM ARM <kvmarm@lists.cs.columbia.edu>,
Linux MIPS <linux-mips@vger.kernel.org>,
KVM PPC <kvm-ppc@vger.kernel.org>,
Linux S390 <linux-s390@vger.kernel.org>,
Linux kselftest <linux-kselftest@vger.kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Marc Zyngier <maz@kernel.org>, James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Will Deacon <will@kernel.org>,
Huacai Chen <chenhuacai@kernel.org>,
Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Paul Mackerras <paulus@ozlabs.org>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Claudio Imbrenda <imbrenda@linux.ibm.com>,
Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Jim Mattson <jmattson@google.com>,
Peter Shier <pshier@google.com>, Oliver Upton <oupton@google.com>,
David Rientjes <rientjes@google.com>,
Emanuele Giuseppe Esposito <eesposit@redhat.com>
Cc: Jing Zhang <jingzhangos@google.com>
Subject: [RFC PATCH 4/4] KVM: selftests: Add selftest for KVM binary form statistics interface
Date: Wed, 10 Mar 2021 00:30:24 +0000 [thread overview]
Message-ID: <20210310003024.2026253-5-jingzhangos@google.com> (raw)
In-Reply-To: <20210310003024.2026253-1-jingzhangos@google.com>
Check if the KVM binary form statistics works correctly and whether the
statistics name strings are synced correctly with KVM internal stats
data.
Signed-off-by: Jing Zhang <jingzhangos@google.com>
---
tools/testing/selftests/kvm/.gitignore | 1 +
tools/testing/selftests/kvm/Makefile | 3 +
.../selftests/kvm/kvm_bin_form_stats.c | 89 +++++++++++++++++++
3 files changed, 93 insertions(+)
create mode 100644 tools/testing/selftests/kvm/kvm_bin_form_stats.c
diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
index 32b87cc77c8e..0c8241bd9a17 100644
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@ -38,3 +38,4 @@
/memslot_modification_stress_test
/set_memory_region_test
/steal_time
+/kvm_bin_form_stats
diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile
index a6d61f451f88..5cdd52ccedf2 100644
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@ -72,6 +72,7 @@ TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus
TEST_GEN_PROGS_x86_64 += memslot_modification_stress_test
TEST_GEN_PROGS_x86_64 += set_memory_region_test
TEST_GEN_PROGS_x86_64 += steal_time
+TEST_GEN_PROGS_x86_64 += kvm_bin_form_stats
TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list
TEST_GEN_PROGS_aarch64 += aarch64/get-reg-list-sve
@@ -81,6 +82,7 @@ TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
TEST_GEN_PROGS_aarch64 += set_memory_region_test
TEST_GEN_PROGS_aarch64 += steal_time
+TEST_GEN_PROGS_aarch64 += kvm_bin_form_stats
TEST_GEN_PROGS_s390x = s390x/memop
TEST_GEN_PROGS_s390x += s390x/resets
@@ -89,6 +91,7 @@ TEST_GEN_PROGS_s390x += demand_paging_test
TEST_GEN_PROGS_s390x += dirty_log_test
TEST_GEN_PROGS_s390x += kvm_create_max_vcpus
TEST_GEN_PROGS_s390x += set_memory_region_test
+TEST_GEN_PROGS_s390x += kvm_bin_form_stats
TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(UNAME_M))
LIBKVM += $(LIBKVM_$(UNAME_M))
diff --git a/tools/testing/selftests/kvm/kvm_bin_form_stats.c b/tools/testing/selftests/kvm/kvm_bin_form_stats.c
new file mode 100644
index 000000000000..36cf206470b1
--- /dev/null
+++ b/tools/testing/selftests/kvm/kvm_bin_form_stats.c
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * kvm_bin_form_stats
+ *
+ * Copyright (C) 2021, Google LLC.
+ *
+ * Test for fd-based IOCTL commands for retrieving KVM statistics data in
+ * binary form. KVM_CAP_STATS_BINARY_FORM, KVM_STATS_GET_INFO,
+ * KVM_STATS_GET_NAMES and KVM_STATS_GET_DATA are checked.
+ */
+
+#define _GNU_SOURCE /* for program_invocation_short_name */
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_util.h"
+
+#include "kvm_util.h"
+#include "asm/kvm.h"
+#include "linux/kvm.h"
+
+int main(int argc, char *argv[])
+{
+ struct kvm_stats_info stats_info = {0};
+ struct kvm_stats_names *stats_names;
+ struct kvm_stats_data *stats_data;
+ struct kvm_vm *kvm;
+ int i, ret;
+
+ kvm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);
+
+ ret = kvm_check_cap(KVM_CAP_STATS_BINARY_FORM);
+ if (ret < 0) {
+ pr_info("Binary form statistics interface is not supported!\n");
+ goto out_free_kvm;
+ }
+
+ ret = -1;
+ vm_ioctl(kvm, KVM_STATS_GET_INFO, &stats_info);
+ if (stats_info.num_stats == 0) {
+ pr_info("KVM_STATS_GET_INFO failed!\n");
+ pr_info("Or the number of stistics data is zero.\n");
+ goto out_free_kvm;
+ }
+
+ /* Allocate memory for stats name strings and value */
+ stats_names = malloc(sizeof(*stats_names) +
+ stats_info.num_stats * KVM_STATS_NAME_LEN);
+ if (!stats_names) {
+ pr_info("Memory allocation failed!\n");
+ goto out_free_kvm;
+ }
+
+ stats_data = malloc(sizeof(*stats_data) +
+ stats_info.num_stats * sizeof(__u64));
+ if (!stats_data) {
+ pr_info("Memory allocation failed!\n");
+ goto out_free_names;
+ }
+
+ /* Retrieve the name strings and data */
+ stats_names->size = stats_info.num_stats * KVM_STATS_NAME_LEN;
+ vm_ioctl(kvm, KVM_STATS_GET_NAMES, stats_names);
+
+ stats_data->size = stats_info.num_stats * sizeof(__u64);
+ vm_ioctl(kvm, KVM_STATS_GET_DATA, stats_data);
+
+ /* Display supported statistics names */
+ for (i = 0; i < (int)stats_info.num_stats; i++) {
+ char *name = (char *)stats_names->names + i * KVM_STATS_NAME_LEN;
+
+ if (strnlen(name, KVM_STATS_NAME_LEN) == 0) {
+ pr_info("Empty stats name at offset %d!\n", i);
+ goto out_free_data;
+ }
+ pr_info("%s\n", name);
+ }
+
+ ret = 0;
+out_free_data:
+ free(stats_data);
+out_free_names:
+ free(stats_names);
+out_free_kvm:
+ kvm_vm_free(kvm);
+ return ret;
+}
--
2.30.1.766.gb4fecdf3b7-goog
prev parent reply other threads:[~2021-03-10 0:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 0:30 [RFC PATCH 0/4] KVM: stats: Retrieve statistics data in binary format Jing Zhang
2021-03-10 0:30 ` [RFC PATCH 1/4] KVM: stats: Separate statistics name strings from debugfs code Jing Zhang
2021-03-10 14:19 ` Marc Zyngier
2021-03-10 18:51 ` Jing Zhang
2021-03-10 0:30 ` [RFC PATCH 2/4] KVM: stats: Define APIs for aggregated stats retrieval in binary format Jing Zhang
2021-03-10 14:58 ` Marc Zyngier
2021-03-10 19:36 ` Jing Zhang
2021-03-10 0:30 ` [RFC PATCH 3/4] KVM: stats: Add ioctl commands to pull statistics " Jing Zhang
2021-03-10 14:55 ` Paolo Bonzini
2021-03-10 21:41 ` Jing Zhang
2021-03-12 18:11 ` Paolo Bonzini
2021-03-12 22:27 ` Jing Zhang
2021-03-13 9:35 ` Paolo Bonzini
2021-03-15 22:31 ` Jing Zhang
2021-03-16 17:54 ` Paolo Bonzini
2021-03-10 15:51 ` Marc Zyngier
2021-03-10 16:03 ` Paolo Bonzini
2021-03-10 17:05 ` Marc Zyngier
2021-03-10 17:11 ` Paolo Bonzini
2021-03-10 17:31 ` Marc Zyngier
2021-03-10 17:44 ` Paolo Bonzini
2021-03-10 21:43 ` Jing Zhang
2021-03-10 0:30 ` Jing Zhang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210310003024.2026253-5-jingzhangos@google.com \
--to=jingzhangos@google.com \
--cc=aleksandar.qemu.devel@gmail.com \
--cc=borntraeger@de.ibm.com \
--cc=chenhuacai@kernel.org \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eesposit@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=james.morse@arm.com \
--cc=jmattson@google.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oupton@google.com \
--cc=paulus@ozlabs.org \
--cc=pbonzini@redhat.com \
--cc=pshier@google.com \
--cc=rientjes@google.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.com \
--cc=tsbogend@alpha.franken.de \
--cc=vkuznets@redhat.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).