From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BCACC433ED for ; Wed, 19 May 2021 22:00:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 034AE60FE6 for ; Wed, 19 May 2021 22:00:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229785AbhESWBl (ORCPT ); Wed, 19 May 2021 18:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbhESWBi (ORCPT ); Wed, 19 May 2021 18:01:38 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 660B4C06175F for ; Wed, 19 May 2021 15:00:18 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id cu11-20020a17090afa8bb029015d5d5d2175so4283451pjb.3 for ; Wed, 19 May 2021 15:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fHdkF3fvolNOuFYwz6ESdopNclQTfwqdr+0wQQPe+sY=; b=BnC3sZNBw4v/c6aPf3jnVQ/9sWKoJpnWKVz8buEgWQkeNIEWVx56tnO+80KohVSNmx sVdFzzFCvTyur0BR+y7I/xMFUi2UGp6YoNFl0Ck7/rPjxfD1Ucnr3SSeMzzSYZnv9ey3 5vUZ8AxhJeH5jb1FipuZo5VYXx/xyMe7SObrQ80WzR57HDPjkfENRqfRqtjv3lNlVcB6 LRkTLBSjxGvtgZ/PXMWIj8bo8v65vASJOB2r4CxcwfPOq6GojQlginHqJC8vGiLfqsDB +qvhBj2yvZCgJwmCJ93xNtrbSlWTy45xXBw4DoyFkruDy/2o7+NLplqqLQtaplHhSCt5 /KAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fHdkF3fvolNOuFYwz6ESdopNclQTfwqdr+0wQQPe+sY=; b=EZTGPJWd7Mx8DyoDiqdMybnBKxLQrMu3oq1Z2St2Dk1PFwMq+zmgTZf8d3TPXR33yO 61DbWsMNYRsTheXUA2qLW5QQB6b71cjiymTg3LLOd6djvveSi/0OuVZX1UDKWz68iyd1 4+9/niHr8s/WLRbgT0gmDmld0oXpoQfGLX2UDc1AZ937uwDZwXaLw5CWnFMJ17EVc00T ODTtQ+5EGSsS7F/6YHccGBywzH6i3Nn6LuINeVmNcIOAoPz1Dh9py1MPVnlCez0N7beR 2JxU45EdUFpUZpcjl45Hf8++xkhCRlOW5Q3jP77GgBBJoS6ylAY85aeC5XtHA1dsIkVd QXSw== X-Gm-Message-State: AOAM533d9wy4pcb+oqBqNe6AvzLL7EBpEV7TmMxSnJK0Hb8n8jpcYY6T wKCDJqd2vM7QPaGcLeuCd399fw== X-Google-Smtp-Source: ABdhPJx5qcRD/MIeqmgFi/W9uuc7aZJFj6EaB1Q1M39ddui7F144kxvLemyc1DkfY6bGF8jpNagyaw== X-Received: by 2002:a17:902:c213:b029:f0:bbdf:3852 with SMTP id 19-20020a170902c213b02900f0bbdf3852mr1953006pll.56.1621461617480; Wed, 19 May 2021 15:00:17 -0700 (PDT) Received: from google.com (150.12.83.34.bc.googleusercontent.com. [34.83.12.150]) by smtp.gmail.com with ESMTPSA id a16sm294411pfa.95.2021.05.19.15.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 15:00:16 -0700 (PDT) Date: Wed, 19 May 2021 15:00:13 -0700 From: Ricardo Koller To: Jing Zhang Cc: KVM , KVMARM , LinuxMIPS , KVMPPC , LinuxS390 , Linuxkselftest , Paolo Bonzini , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Will Deacon , Huacai Chen , Aleksandar Markovic , Thomas Bogendoerfer , Paul Mackerras , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Claudio Imbrenda , Sean Christopherson , Vitaly Kuznetsov , Jim Mattson , Peter Shier , Oliver Upton , David Rientjes , Emanuele Giuseppe Esposito Subject: Re: [PATCH v5 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface Message-ID: References: <20210517145314.157626-1-jingzhangos@google.com> <20210517145314.157626-5-jingzhangos@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210517145314.157626-5-jingzhangos@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On Mon, May 17, 2021 at 02:53:14PM +0000, Jing Zhang wrote: > Add selftest to check KVM stats descriptors validity. > > Signed-off-by: Jing Zhang > --- > 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 | 379 ++++++++++++++++++ > tools/testing/selftests/kvm/lib/kvm_util.c | 12 + > 5 files changed, 398 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 bd83158e0e0b..35796667c944 100644 > --- a/tools/testing/selftests/kvm/.gitignore > +++ b/tools/testing/selftests/kvm/.gitignore > @@ -43,3 +43,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 e439d027939d..2984c86c848a 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -76,6 +76,7 @@ TEST_GEN_PROGS_x86_64 += kvm_page_table_test > 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 > @@ -87,6 +88,7 @@ TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus > TEST_GEN_PROGS_aarch64 += kvm_page_table_test > 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 > @@ -96,6 +98,7 @@ TEST_GEN_PROGS_s390x += dirty_log_test > TEST_GEN_PROGS_s390x += kvm_create_max_vcpus > TEST_GEN_PROGS_s390x += kvm_page_table_test > 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 a8f022794ce3..ee01a67022d9 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -387,4 +387,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..dae44397d0f4 > --- /dev/null > +++ b/tools/testing/selftests/kvm/kvm_bin_form_stats.c > @@ -0,0 +1,379 @@ > +// 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 > +#include > +#include > +#include > +#include > + > +#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; > + } It seems that the only difference between vm_stats_test and vcpu_stats_test is what function to use for getting the fd. If that's the case, it might be better to move all the checks to a common function. > + /* 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; > + } As mentioned by David, it would be better to replace the checks with TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. > + /* 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)) { Could you make the check more strict? TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset, "The data block should be at the end of the descriptor block."); > + printf("VM 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); You could stress kvm_vm_stats_read() more by calling pread for more offsets. For example, for every descriptor: pread(..., header.desc_offset + i * size_desc) I realize that the typical usage will be to read once for all descriptors. But kvm_vm_stats_read (and kvm_vcpu_stats_read) need to handle any offset, and doing so seems to be quite complicated. Actually, you could stress kvm_vm_stats_read() even more by calling it for _every_ possible offset (and eventually invalid offsets and sizes). One easier way to check this is by calling read all descriptors into some reference buffer using a single pread, and then call it for all offsets while comparing against the reference buf. > + 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; cast to (struct kvm_stats_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; default: TEST_FAIL("Unexpected unit ..."); > + } > + /* Check name string */ > + if (strlen(pdesc->name) >= header.name_size) { > + printf("KVM stats name(%s) too long!\n", pdesc->name); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(header.name_size > 0 && strlen(pdesc->name) + 1 == header.name_size); > + /* 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; > + } This won't be needed if you use the suggested TEST_ASSERT (the other overlap check). > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\n"); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(size_data == header.count * stats_data->value[0]); > + > + /* 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("VCPU Descriptor block is overlapped with data block!\n"); > + goto out_close_fd; > + } Same as above (tighter check). > + > + /* 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; > + } > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\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 fc83f6c5902d..d9e0b2c8b906 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -2090,3 +2090,15 @@ 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.1.751.gd2f1c929bd-goog > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AE78C43470 for ; Wed, 19 May 2021 22:00:24 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 16ECF6124C for ; Wed, 19 May 2021 22:00:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16ECF6124C Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 8252A4B5DD; Wed, 19 May 2021 18:00:23 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cU0pkcYlKhN5; Wed, 19 May 2021 18:00:21 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C266E4B7E7; Wed, 19 May 2021 18:00:21 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E6D894B5DD for ; Wed, 19 May 2021 18:00:20 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rpR+1brYegEs for ; Wed, 19 May 2021 18:00:19 -0400 (EDT) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 020AA4B5D6 for ; Wed, 19 May 2021 18:00:18 -0400 (EDT) Received: by mail-pj1-f46.google.com with SMTP id ep16-20020a17090ae650b029015d00f578a8so4158886pjb.2 for ; Wed, 19 May 2021 15:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=fHdkF3fvolNOuFYwz6ESdopNclQTfwqdr+0wQQPe+sY=; b=BnC3sZNBw4v/c6aPf3jnVQ/9sWKoJpnWKVz8buEgWQkeNIEWVx56tnO+80KohVSNmx sVdFzzFCvTyur0BR+y7I/xMFUi2UGp6YoNFl0Ck7/rPjxfD1Ucnr3SSeMzzSYZnv9ey3 5vUZ8AxhJeH5jb1FipuZo5VYXx/xyMe7SObrQ80WzR57HDPjkfENRqfRqtjv3lNlVcB6 LRkTLBSjxGvtgZ/PXMWIj8bo8v65vASJOB2r4CxcwfPOq6GojQlginHqJC8vGiLfqsDB +qvhBj2yvZCgJwmCJ93xNtrbSlWTy45xXBw4DoyFkruDy/2o7+NLplqqLQtaplHhSCt5 /KAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=fHdkF3fvolNOuFYwz6ESdopNclQTfwqdr+0wQQPe+sY=; b=pr3gsx8DpcpPk6jVjLeqqPE4z0uvVp+PYxPQRHlA9/LwyhLGRiIdhhBYcEOEtfI2z6 K5OFcozSd+mPfN/w6vY1xMq9PqfhD3YMW+7kU6GBMqdXEEZhRQetiA9CTZDDjFj389m2 /xvnb8U90OsZSVnCFp+CHD8n0lPpVWCQcA8U5VXfVM+h6V6As0wyrGGHGRwZ1bozuuDU bjm+j/yv2oi827soSjXMaLaBb8OsHNoCfbQ5eYrhfiuX5pKpme/UnTjT4m0nKWftE7Sf DKWn7z2xhafx8Gzp4t2riQPGHY7Y5M6QnqEDAbBz75tirEwBUR27BdjlFCbtgHvWK37Z 4KGg== X-Gm-Message-State: AOAM5319o5uF+5y8JvUf5VquVa+bUeckkkaP5vw9S0YnjHEIw4vVVjl7 cgcmTW2ukS1v6DFuvxK/AIDtLg== X-Google-Smtp-Source: ABdhPJx5qcRD/MIeqmgFi/W9uuc7aZJFj6EaB1Q1M39ddui7F144kxvLemyc1DkfY6bGF8jpNagyaw== X-Received: by 2002:a17:902:c213:b029:f0:bbdf:3852 with SMTP id 19-20020a170902c213b02900f0bbdf3852mr1953006pll.56.1621461617480; Wed, 19 May 2021 15:00:17 -0700 (PDT) Received: from google.com (150.12.83.34.bc.googleusercontent.com. [34.83.12.150]) by smtp.gmail.com with ESMTPSA id a16sm294411pfa.95.2021.05.19.15.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 May 2021 15:00:16 -0700 (PDT) Date: Wed, 19 May 2021 15:00:13 -0700 From: Ricardo Koller To: Jing Zhang Subject: Re: [PATCH v5 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface Message-ID: References: <20210517145314.157626-1-jingzhangos@google.com> <20210517145314.157626-5-jingzhangos@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210517145314.157626-5-jingzhangos@google.com> Cc: KVM , David Hildenbrand , Paul Mackerras , Linuxkselftest , Claudio Imbrenda , Will Deacon , KVMARM , Emanuele Giuseppe Esposito , LinuxS390 , Janosch Frank , Oliver Upton , Marc Zyngier , Huacai Chen , Christian Borntraeger , Aleksandar Markovic , David Rientjes , KVMPPC , Jim Mattson , Thomas Bogendoerfer , Sean Christopherson , Cornelia Huck , Peter Shier , LinuxMIPS , Paolo Bonzini , Vitaly Kuznetsov X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Mon, May 17, 2021 at 02:53:14PM +0000, Jing Zhang wrote: > Add selftest to check KVM stats descriptors validity. > > Signed-off-by: Jing Zhang > --- > 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 | 379 ++++++++++++++++++ > tools/testing/selftests/kvm/lib/kvm_util.c | 12 + > 5 files changed, 398 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 bd83158e0e0b..35796667c944 100644 > --- a/tools/testing/selftests/kvm/.gitignore > +++ b/tools/testing/selftests/kvm/.gitignore > @@ -43,3 +43,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 e439d027939d..2984c86c848a 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -76,6 +76,7 @@ TEST_GEN_PROGS_x86_64 += kvm_page_table_test > 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 > @@ -87,6 +88,7 @@ TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus > TEST_GEN_PROGS_aarch64 += kvm_page_table_test > 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 > @@ -96,6 +98,7 @@ TEST_GEN_PROGS_s390x += dirty_log_test > TEST_GEN_PROGS_s390x += kvm_create_max_vcpus > TEST_GEN_PROGS_s390x += kvm_page_table_test > 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 a8f022794ce3..ee01a67022d9 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -387,4 +387,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..dae44397d0f4 > --- /dev/null > +++ b/tools/testing/selftests/kvm/kvm_bin_form_stats.c > @@ -0,0 +1,379 @@ > +// 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 > +#include > +#include > +#include > +#include > + > +#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; > + } It seems that the only difference between vm_stats_test and vcpu_stats_test is what function to use for getting the fd. If that's the case, it might be better to move all the checks to a common function. > + /* 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; > + } As mentioned by David, it would be better to replace the checks with TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. > + /* 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)) { Could you make the check more strict? TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset, "The data block should be at the end of the descriptor block."); > + printf("VM 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); You could stress kvm_vm_stats_read() more by calling pread for more offsets. For example, for every descriptor: pread(..., header.desc_offset + i * size_desc) I realize that the typical usage will be to read once for all descriptors. But kvm_vm_stats_read (and kvm_vcpu_stats_read) need to handle any offset, and doing so seems to be quite complicated. Actually, you could stress kvm_vm_stats_read() even more by calling it for _every_ possible offset (and eventually invalid offsets and sizes). One easier way to check this is by calling read all descriptors into some reference buffer using a single pread, and then call it for all offsets while comparing against the reference buf. > + 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; cast to (struct kvm_stats_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; default: TEST_FAIL("Unexpected unit ..."); > + } > + /* Check name string */ > + if (strlen(pdesc->name) >= header.name_size) { > + printf("KVM stats name(%s) too long!\n", pdesc->name); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(header.name_size > 0 && strlen(pdesc->name) + 1 == header.name_size); > + /* 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; > + } This won't be needed if you use the suggested TEST_ASSERT (the other overlap check). > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\n"); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(size_data == header.count * stats_data->value[0]); > + > + /* 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("VCPU Descriptor block is overlapped with data block!\n"); > + goto out_close_fd; > + } Same as above (tighter check). > + > + /* 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; > + } > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\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 fc83f6c5902d..d9e0b2c8b906 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -2090,3 +2090,15 @@ 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.1.751.gd2f1c929bd-goog > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Koller Date: Wed, 19 May 2021 22:00:13 +0000 Subject: Re: [PATCH v5 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface Message-Id: List-Id: References: <20210517145314.157626-1-jingzhangos@google.com> <20210517145314.157626-5-jingzhangos@google.com> In-Reply-To: <20210517145314.157626-5-jingzhangos@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jing Zhang Cc: KVM , KVMARM , LinuxMIPS , KVMPPC , LinuxS390 , Linuxkselftest , Paolo Bonzini , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , Will Deacon , Huacai Chen , Aleksandar Markovic , Thomas Bogendoerfer , Paul Mackerras , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Claudio Imbrenda , Sean Christopherson , Vitaly Kuznetsov , Jim Mattson , Peter Shier , Oliver Upton , David Rientjes , Emanuele Giuseppe Esposito On Mon, May 17, 2021 at 02:53:14PM +0000, Jing Zhang wrote: > Add selftest to check KVM stats descriptors validity. > > Signed-off-by: Jing Zhang > --- > 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 | 379 ++++++++++++++++++ > tools/testing/selftests/kvm/lib/kvm_util.c | 12 + > 5 files changed, 398 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 bd83158e0e0b..35796667c944 100644 > --- a/tools/testing/selftests/kvm/.gitignore > +++ b/tools/testing/selftests/kvm/.gitignore > @@ -43,3 +43,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 e439d027939d..2984c86c848a 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -76,6 +76,7 @@ TEST_GEN_PROGS_x86_64 += kvm_page_table_test > 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 > @@ -87,6 +88,7 @@ TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus > TEST_GEN_PROGS_aarch64 += kvm_page_table_test > 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 > @@ -96,6 +98,7 @@ TEST_GEN_PROGS_s390x += dirty_log_test > TEST_GEN_PROGS_s390x += kvm_create_max_vcpus > TEST_GEN_PROGS_s390x += kvm_page_table_test > 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 a8f022794ce3..ee01a67022d9 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -387,4 +387,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..dae44397d0f4 > --- /dev/null > +++ b/tools/testing/selftests/kvm/kvm_bin_form_stats.c > @@ -0,0 +1,379 @@ > +// 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 > +#include > +#include > +#include > +#include > + > +#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; > + } It seems that the only difference between vm_stats_test and vcpu_stats_test is what function to use for getting the fd. If that's the case, it might be better to move all the checks to a common function. > + /* 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; > + } As mentioned by David, it would be better to replace the checks with TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. > + /* 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)) { Could you make the check more strict? TEST_ASSERT(header.desc_offset + size_desc * header.count = header.data_offset, "The data block should be at the end of the descriptor block."); > + printf("VM 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); You could stress kvm_vm_stats_read() more by calling pread for more offsets. For example, for every descriptor: pread(..., header.desc_offset + i * size_desc) I realize that the typical usage will be to read once for all descriptors. But kvm_vm_stats_read (and kvm_vcpu_stats_read) need to handle any offset, and doing so seems to be quite complicated. Actually, you could stress kvm_vm_stats_read() even more by calling it for _every_ possible offset (and eventually invalid offsets and sizes). One easier way to check this is by calling read all descriptors into some reference buffer using a single pread, and then call it for all offsets while comparing against the reference buf. > + 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; cast to (struct kvm_stats_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; default: TEST_FAIL("Unexpected unit ..."); > + } > + /* Check name string */ > + if (strlen(pdesc->name) >= header.name_size) { > + printf("KVM stats name(%s) too long!\n", pdesc->name); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(header.name_size > 0 && strlen(pdesc->name) + 1 = header.name_size); > + /* 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; > + } This won't be needed if you use the suggested TEST_ASSERT (the other overlap check). > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\n"); > + goto out_free_desc; > + } Tighter check: TEST_ASSERT(size_data = header.count * stats_data->value[0]); > + > + /* 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("VCPU Descriptor block is overlapped with data block!\n"); > + goto out_close_fd; > + } Same as above (tighter check). > + > + /* 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; > + } > + /* Check validity of all stats data size */ > + if (size_data < header.count * sizeof(stats_data->value[0])) { > + printf("Data size is not correct!\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 fc83f6c5902d..d9e0b2c8b906 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -2090,3 +2090,15 @@ 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.1.751.gd2f1c929bd-goog > > _______________________________________________ > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm