From: Jing Zhang <jingzhangos@google.com>
To: KVM <kvm@vger.kernel.org>, KVMARM <kvmarm@lists.cs.columbia.edu>,
LinuxMIPS <linux-mips@vger.kernel.org>,
KVMPPC <kvm-ppc@vger.kernel.org>,
LinuxS390 <linux-s390@vger.kernel.org>,
Linuxkselftest <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>
Subject: [PATCH 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface
Date: Fri, 2 Apr 2021 22:43:59 +0000 [thread overview]
Message-ID: <20210402224359.2297157-5-jingzhangos@google.com> (raw)
In-Reply-To: <20210402224359.2297157-1-jingzhangos@google.com>
Signed-off-by: Jing Zhang <jingzhangos@google.com>
---
tools/testing/selftests/kvm/.gitignore | 1 +
tools/testing/selftests/kvm/Makefile | 3 +
.../testing/selftests/kvm/include/kvm_util.h | 3 +
.../selftests/kvm/kvm_bin_form_stats.c | 370 ++++++++++++++++++
tools/testing/selftests/kvm/lib/kvm_util.c | 11 +
5 files changed, 388 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/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index 2d7eb6989e83..407f3a35ed3b 100644
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -378,4 +378,7 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc);
#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \
__GUEST_ASSERT((_condition), 4, (arg1), (arg2), (arg3), (arg4))
+int vm_get_statsfd(struct kvm_vm *vm);
+int vcpu_get_statsfd(struct kvm_vm *vm, uint32_t vcpuid);
+
#endif /* SELFTEST_KVM_UTIL_H */
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..5ed2fe74ce55
--- /dev/null
+++ b/tools/testing/selftests/kvm/kvm_bin_form_stats.c
@@ -0,0 +1,370 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * kvm_bin_form_stats
+ *
+ * Copyright (C) 2021, Google LLC.
+ *
+ * Test the fd-based interface for KVM statistics.
+ */
+
+#define _GNU_SOURCE /* for program_invocation_short_name */
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include "test_util.h"
+
+#include "kvm_util.h"
+#include "asm/kvm.h"
+#include "linux/kvm.h"
+
+int vm_stats_test(struct kvm_vm *vm)
+{
+ ssize_t ret;
+ int i, stats_fd, err = -1;
+ size_t size_desc, size_data = 0;
+ struct kvm_stats_header header;
+ struct kvm_stats_desc *stats_desc, *pdesc;
+ struct kvm_vm_stats_data *stats_data;
+
+ // Get fd for VM stats
+ stats_fd = vm_get_statsfd(vm);
+ if (stats_fd < 0) {
+ perror("Get VM stats fd");
+ return err;
+ }
+ // Read kvm vm stats header
+ ret = read(stats_fd, &header, sizeof(header));
+ if (ret != sizeof(header)) {
+ perror("Read VM stats header");
+ goto out_close_fd;
+ }
+ size_desc = sizeof(*stats_desc) + header.name_size;
+ // Check id string in header, that should start with "kvm"
+ if (strncmp(header.id, "kvm", 3) ||
+ strlen(header.id) >= KVM_STATS_ID_MAXLEN) {
+ printf("Invalid KVM VM stats type!\n");
+ goto out_close_fd;
+ }
+ // Sanity check for other fields in header
+ if (header.count == 0) {
+ err = 0;
+ goto out_close_fd;
+ }
+ // Check overlap
+ if (header.desc_offset == 0 || header.data_offset == 0 ||
+ header.desc_offset < sizeof(header) ||
+ header.data_offset < sizeof(header)) {
+ printf("Invalid offset fields in header!\n");
+ goto out_close_fd;
+ }
+ if (header.desc_offset < header.data_offset &&
+ (header.desc_offset + size_desc * header.count >
+ header.data_offset)) {
+ printf("Descriptor block is overlapped with data block!\n");
+ goto out_close_fd;
+ }
+
+ // Allocate memory for stats descriptors
+ stats_desc = calloc(header.count, size_desc);
+ if (!stats_desc) {
+ perror("Allocate memory for VM stats descriptors");
+ goto out_close_fd;
+ }
+ // Read kvm vm stats descriptors
+ ret = pread(stats_fd, stats_desc,
+ size_desc * header.count, header.desc_offset);
+ if (ret != size_desc * header.count) {
+ perror("Read KVM VM stats descriptors");
+ goto out_free_desc;
+ }
+ // Sanity check for fields in descriptors
+ for (i = 0; i < header.count; ++i) {
+ pdesc = (void *)stats_desc + i * size_desc;
+ // Check type,unit,scale boundaries
+ if ((pdesc->flags & KVM_STATS_TYPE_MASK) > KVM_STATS_TYPE_MAX) {
+ printf("Unknown KVM stats type!\n");
+ goto out_free_desc;
+ }
+ if ((pdesc->flags & KVM_STATS_UNIT_MASK) > KVM_STATS_UNIT_MAX) {
+ printf("Unknown KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ if ((pdesc->flags & KVM_STATS_SCALE_MASK) >
+ KVM_STATS_SCALE_MAX) {
+ printf("Unknown KVM stats scale!\n");
+ goto out_free_desc;
+ }
+ /* Check exponent for stats unit
+ * Exponent for counter should be greater than or equal to 0
+ * Exponent for unit bytes should be greater than or equal to 0
+ * Exponent for unit seconds should be less than or equal to 0
+ * Exponent for unit clock cycles should be greater than or
+ * equal to 0
+ */
+ switch (pdesc->flags & KVM_STATS_UNIT_MASK) {
+ case KVM_STATS_UNIT_NONE:
+ case KVM_STATS_UNIT_BYTES:
+ case KVM_STATS_UNIT_CYCLES:
+ if (pdesc->exponent < 0) {
+ printf("Unsupported KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ break;
+ case KVM_STATS_UNIT_SECONDS:
+ if (pdesc->exponent > 0) {
+ printf("Unsupported KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ break;
+ }
+ // Check name string
+ if (strlen(pdesc->name) >= header.name_size) {
+ printf("KVM stats name(%s) too long!\n", pdesc->name);
+ goto out_free_desc;
+ }
+ // Check size field, which should not be zero
+ if (pdesc->size == 0) {
+ printf("KVM descriptor(%s) with size of 0!\n",
+ pdesc->name);
+ goto out_free_desc;
+ }
+ size_data = pdesc->size * sizeof(stats_data->value[0]);
+ }
+ // Check overlap
+ if (header.data_offset < header.desc_offset &&
+ header.data_offset + size_data > header.desc_offset) {
+ printf("Data block is overlapped with Descriptor block!\n");
+ goto out_free_desc;
+ }
+
+ // Allocate memory for stats data
+ stats_data = malloc(size_data);
+ if (!stats_data) {
+ perror("Allocate memory for VM stats data");
+ goto out_free_desc;
+ }
+ // Read kvm vm stats data
+ ret = pread(stats_fd, stats_data, size_data, header.data_offset);
+ if (ret != size_data) {
+ perror("Read KVM VM stats data");
+ goto out_free_data;
+ }
+
+ err = 0;
+out_free_data:
+ free(stats_data);
+out_free_desc:
+ free(stats_desc);
+out_close_fd:
+ close(stats_fd);
+ return err;
+}
+
+int vcpu_stats_test(struct kvm_vm *vm, int vcpu_id)
+{
+ ssize_t ret;
+ int i, stats_fd, err = -1;
+ size_t size_desc, size_data = 0;
+ struct kvm_stats_header header;
+ struct kvm_stats_desc *stats_desc, *pdesc;
+ struct kvm_vcpu_stats_data *stats_data;
+
+ // Get fd for VCPU stats
+ stats_fd = vcpu_get_statsfd(vm, vcpu_id);
+ if (stats_fd < 0) {
+ perror("Get VCPU stats fd");
+ return err;
+ }
+ // Read kvm vcpu stats header
+ ret = read(stats_fd, &header, sizeof(header));
+ if (ret != sizeof(header)) {
+ perror("Read VCPU stats header");
+ goto out_close_fd;
+ }
+ size_desc = sizeof(*stats_desc) + header.name_size;
+ // Check id string in header, that should start with "kvm"
+ if (strncmp(header.id, "kvm", 3) ||
+ strlen(header.id) >= KVM_STATS_ID_MAXLEN) {
+ printf("Invalid KVM VCPU stats type!\n");
+ goto out_close_fd;
+ }
+ // Sanity check for other fields in header
+ if (header.count == 0) {
+ err = 0;
+ goto out_close_fd;
+ }
+ // Check overlap
+ if (header.desc_offset == 0 || header.data_offset == 0 ||
+ header.desc_offset < sizeof(header) ||
+ header.data_offset < sizeof(header)) {
+ printf("Invalid offset fields in header!\n");
+ goto out_close_fd;
+ }
+ if (header.desc_offset < header.data_offset &&
+ (header.desc_offset + size_desc * header.count >
+ header.data_offset)) {
+ printf("Descriptor block is overlapped with data block!\n");
+ goto out_close_fd;
+ }
+
+ // Allocate memory for stats descriptors
+ stats_desc = calloc(header.count, size_desc);
+ if (!stats_desc) {
+ perror("Allocate memory for VCPU stats descriptors");
+ goto out_close_fd;
+ }
+ // Read kvm vcpu stats descriptors
+ ret = pread(stats_fd, stats_desc,
+ size_desc * header.count, header.desc_offset);
+ if (ret != size_desc * header.count) {
+ perror("Read KVM VCPU stats descriptors");
+ goto out_free_desc;
+ }
+ // Sanity check for fields in descriptors
+ for (i = 0; i < header.count; ++i) {
+ pdesc = (void *)stats_desc + i * size_desc;
+ // Check boundaries
+ if ((pdesc->flags & KVM_STATS_TYPE_MASK) > KVM_STATS_TYPE_MAX) {
+ printf("Unknown KVM stats type!\n");
+ goto out_free_desc;
+ }
+ if ((pdesc->flags & KVM_STATS_UNIT_MASK) > KVM_STATS_UNIT_MAX) {
+ printf("Unknown KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ if ((pdesc->flags & KVM_STATS_SCALE_MASK) >
+ KVM_STATS_SCALE_MAX) {
+ printf("Unknown KVM stats scale!\n");
+ goto out_free_desc;
+ }
+ /* Check exponent for stats unit
+ * Exponent for counter should be greater than or equal to 0
+ * Exponent for unit bytes should be greater than or equal to 0
+ * Exponent for unit seconds should be less than or equal to 0
+ * Exponent for unit clock cycles should be greater than or
+ * equal to 0
+ */
+ switch (pdesc->flags & KVM_STATS_UNIT_MASK) {
+ case KVM_STATS_UNIT_NONE:
+ case KVM_STATS_UNIT_BYTES:
+ case KVM_STATS_UNIT_CYCLES:
+ if (pdesc->exponent < 0) {
+ printf("Unsupported KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ break;
+ case KVM_STATS_UNIT_SECONDS:
+ if (pdesc->exponent > 0) {
+ printf("Unsupported KVM stats unit!\n");
+ goto out_free_desc;
+ }
+ break;
+ }
+ // Check name string
+ if (strlen(pdesc->name) >= header.name_size) {
+ printf("KVM stats name(%s) too long!\n", pdesc->name);
+ goto out_free_desc;
+ }
+ // Check size field, which should not be zero
+ if (pdesc->size == 0) {
+ printf("KVM descriptor(%s) with size of 0!\n",
+ pdesc->name);
+ goto out_free_desc;
+ }
+ size_data = pdesc->size * sizeof(stats_data->value[0]);
+ }
+ // Check overlap
+ if (header.data_offset < header.desc_offset &&
+ header.data_offset + size_data > header.desc_offset) {
+ printf("Data block is overlapped with Descriptor block!\n");
+ goto out_free_desc;
+ }
+
+ // Allocate memory for stats data
+ stats_data = malloc(size_data);
+ if (!stats_data) {
+ perror("Allocate memory for VCPU stats data");
+ goto out_free_desc;
+ }
+ // Read kvm vcpu stats data
+ ret = pread(stats_fd, stats_data, size_data, header.data_offset);
+ if (ret != size_data) {
+ perror("Read KVM VCPU stats data");
+ goto out_free_data;
+ }
+
+ err = 0;
+out_free_data:
+ free(stats_data);
+out_free_desc:
+ free(stats_desc);
+out_close_fd:
+ close(stats_fd);
+ return err;
+}
+
+/*
+ * Usage: kvm_bin_form_stats [#vm] [#vcpu]
+ * The first parameter #vm set the number of VMs being created.
+ * The second parameter #vcpu set the number of VCPUs being created.
+ * By default, 1 VM and 1 VCPU for the VM would be created for testing.
+ */
+
+int main(int argc, char *argv[])
+{
+ int max_vm = 1, max_vcpu = 1, ret, i, j, err = -1;
+ struct kvm_vm **vms;
+
+ // Get the number of VMs and VCPUs that would be created for testing.
+ if (argc > 1) {
+ max_vm = strtol(argv[1], NULL, 0);
+ if (max_vm <= 0)
+ max_vm = 1;
+ }
+ if (argc > 2 ) {
+ max_vcpu = strtol(argv[2], NULL, 0);
+ if (max_vcpu <= 0)
+ max_vcpu = 1;
+ }
+
+ // Check the extension for binary stats
+ ret = kvm_check_cap(KVM_CAP_STATS_BINARY_FD);
+ if (ret < 0) {
+ printf("Binary form statistics interface is not supported!\n");
+ return err;
+ }
+
+ // Create VMs and VCPUs
+ vms = malloc(sizeof(vms[0]) * max_vm);
+ if (!vms) {
+ perror("Allocate memory for storing VM pointers");
+ return err;
+ }
+ for (i = 0; i < max_vm; ++i) {
+ vms[i] = vm_create(VM_MODE_DEFAULT,
+ DEFAULT_GUEST_PHY_PAGES, O_RDWR);
+ for (j = 0; j < max_vcpu; ++j) {
+ vm_vcpu_add(vms[i], j);
+ }
+ }
+
+ // Check stats read for every VM and VCPU
+ for (i = 0; i < max_vm; ++i) {
+ if (vm_stats_test(vms[i]))
+ goto out_free_vm;
+ for (j = 0; j < max_vcpu; ++j) {
+ if (vcpu_stats_test(vms[i], j))
+ goto out_free_vm;
+ }
+ }
+
+ err = 0;
+out_free_vm:
+ for (i = 0; i < max_vm; ++i)
+ kvm_vm_free(vms[i]);
+ free(vms);
+ return err;
+}
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index e5fbf16f725b..be305e7b54ca 100644
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -2013,3 +2013,14 @@ unsigned int vm_calc_num_guest_pages(enum vm_guest_mode mode, size_t size)
n = DIV_ROUND_UP(size, vm_guest_mode_params[mode].page_size);
return vm_adjust_num_guest_pages(mode, n);
}
+
+int vm_get_statsfd(struct kvm_vm *vm)
+{
+ return ioctl(vm->fd, KVM_STATS_GETFD, NULL);
+}
+
+int vcpu_get_statsfd(struct kvm_vm *vm, uint32_t vcpuid)
+{
+ struct vcpu *vcpu = vcpu_find(vm, vcpuid);
+ return ioctl(vcpu->fd, KVM_STATS_GETFD, NULL);
+}
--
2.31.0.208.g409f899ff0-goog
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
prev parent reply other threads:[~2021-04-02 22:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-02 22:43 [PATCH 0/4] KVM statistics data fd-based binary interface Jing Zhang
2021-04-02 22:43 ` [PATCH 1/4] KVM: stats: Separate common stats from architecture specific ones Jing Zhang
2021-04-02 22:43 ` [PATCH 2/4] KVM: stats: Add fd-based API to read binary stats data Jing Zhang
2021-04-03 5:24 ` kernel test robot
2021-04-03 17:42 ` Jing Zhang
2021-04-03 17:35 ` Jing Zhang
2021-04-02 22:43 ` [PATCH 3/4] KVM: stats: Add documentation for statistics data binary interface Jing Zhang
2021-04-02 22:43 ` 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=20210402224359.2297157-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).