From: David Matlack <dmatlack@google.com>
To: Ben Gardon <bgardon@google.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Jim Mattson <jmattson@google.com>,
David Dunn <daviddunn@google.com>,
Jing Zhang <jingzhangos@google.com>,
Junaid Shahid <junaids@google.com>
Subject: Re: [PATCH v3 02/11] KVM: selftests: Dump VM stats in binary stats test
Date: Tue, 5 Apr 2022 22:19:03 +0000 [thread overview]
Message-ID: <YkzAV8FPdSjzDOd1@google.com> (raw)
In-Reply-To: <20220330174621.1567317-3-bgardon@google.com>
On Wed, Mar 30, 2022 at 10:46:12AM -0700, Ben Gardon wrote:
> Add kvm_util library functions to read KVM stats through the binary
> stats interface and then dump them to stdout when running the binary
> stats test. Subsequent commits will extend the kvm_util code and use it
> to make assertions in a test for NX hugepages.
>
> CC: Jing Zhang <jingzhangos@google.com>
> Signed-off-by: Ben Gardon <bgardon@google.com>
> ---
> .../selftests/kvm/include/kvm_util_base.h | 1 +
> .../selftests/kvm/kvm_binary_stats_test.c | 3 +
> tools/testing/selftests/kvm/lib/kvm_util.c | 143 ++++++++++++++++++
> 3 files changed, 147 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
> index 976aaaba8769..4783fd1cd4cf 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util_base.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
> @@ -401,6 +401,7 @@ void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid);
>
> int vm_get_stats_fd(struct kvm_vm *vm);
> int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid);
> +void dump_vm_stats(struct kvm_vm *vm);
>
> uint32_t guest_get_vcpuid(void);
>
> diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
> index 17f65d514915..afc4701ce8dd 100644
> --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c
> +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
> @@ -174,6 +174,9 @@ static void vm_stats_test(struct kvm_vm *vm)
> stats_test(stats_fd);
> close(stats_fd);
> TEST_ASSERT(fcntl(stats_fd, F_GETFD) == -1, "Stats fd not freed");
> +
> + /* Dump VM stats */
> + dump_vm_stats(vm);
> }
>
> static void vcpu_stats_test(struct kvm_vm *vm, int vcpu_id)
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index 11a692cf4570..f87df68b150d 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -2562,3 +2562,146 @@ int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid)
>
> return ioctl(vcpu->fd, KVM_GET_STATS_FD, NULL);
> }
> +
> +/* Caller is responsible for freeing the returned kvm_stats_header. */
> +static struct kvm_stats_header *read_vm_stats_header(int stats_fd)
> +{
> + struct kvm_stats_header *header;
> + ssize_t ret;
> +
> + /* Read kvm stats header */
> + header = malloc(sizeof(*header));
> + TEST_ASSERT(header, "Allocate memory for stats header");
> +
> + ret = read(stats_fd, header, sizeof(*header));
> + TEST_ASSERT(ret == sizeof(*header), "Read stats header");
> +
> + return header;
> +}
It seems like this helper could be used in kvm_binary_stats_test.c to
eliminate duplicate code.
> +
> +static void dump_header(int stats_fd, struct kvm_stats_header *header)
> +{
> + ssize_t ret;
> + char *id;
> +
> + printf("flags: %u\n", header->flags);
> + printf("name size: %u\n", header->name_size);
> + printf("num_desc: %u\n", header->num_desc);
> + printf("id_offset: %u\n", header->id_offset);
> + printf("desc_offset: %u\n", header->desc_offset);
> + printf("data_offset: %u\n", header->data_offset);
> +
> + /* Read kvm stats id string */
> + id = malloc(header->name_size);
> + TEST_ASSERT(id, "Allocate memory for id string");
> + ret = pread(stats_fd, id, header->name_size, header->id_offset);
> + TEST_ASSERT(ret == header->name_size, "Read id string");
> +
> + printf("id: %s\n", id);
> +
> + free(id);
> +}
> +
> +static ssize_t stats_desc_size(struct kvm_stats_header *header)
> +{
> + return sizeof(struct kvm_stats_desc) + header->name_size;
> +}
> +
> +/* Caller is responsible for freeing the returned kvm_stats_desc. */
> +static struct kvm_stats_desc *read_vm_stats_desc(int stats_fd,
> + struct kvm_stats_header *header)
> +{
> + struct kvm_stats_desc *stats_desc;
> + size_t size_desc;
> + ssize_t ret;
> +
> + size_desc = header->num_desc * stats_desc_size(header);
> +
> + /* Allocate memory for stats descriptors */
> + stats_desc = malloc(size_desc);
> + TEST_ASSERT(stats_desc, "Allocate memory for stats descriptors");
> +
> + /* Read kvm stats descriptors */
> + ret = pread(stats_fd, stats_desc, size_desc, header->desc_offset);
> + TEST_ASSERT(ret == size_desc, "Read KVM stats descriptors");
> +
> + return stats_desc;
> +}
Same with this helper.
> +
> +/* Caller is responsible for freeing the memory *data. */
> +static int read_stat_data(int stats_fd, struct kvm_stats_header *header,
> + struct kvm_stats_desc *desc, uint64_t **data)
> +{
> + u64 *stats_data;
> + ssize_t ret;
> +
> + stats_data = malloc(desc->size * sizeof(*stats_data));
> +
> + ret = pread(stats_fd, stats_data, desc->size * sizeof(*stats_data),
> + header->data_offset + desc->offset);
> +
> + /* ret is in bytes. */
> + ret = ret / sizeof(*stats_data);
> +
> + TEST_ASSERT(ret == desc->size,
> + "Read data of KVM stats: %s", desc->name);
> +
> + *data = stats_data;
> +
> + return ret;
> +}
Same with this helper.
> +
> +static void dump_stat(int stats_fd, struct kvm_stats_header *header,
> + struct kvm_stats_desc *desc)
> +{
> + u64 *stats_data;
> + ssize_t ret;
> + int i;
> +
> + printf("\tflags: %u\n", desc->flags);
> + printf("\texponent: %u\n", desc->exponent);
> + printf("\tsize: %u\n", desc->size);
> + printf("\toffset: %u\n", desc->offset);
> + printf("\tbucket_size: %u\n", desc->bucket_size);
> + printf("\tname: %s\n", (char *)&desc->name);
> +
> + ret = read_stat_data(stats_fd, header, desc, &stats_data);
> +
> + printf("\tdata: %lu", *stats_data);
> + for (i = 1; i < ret; i++)
> + printf(", %lu", *(stats_data + i));
> + printf("\n\n");
> +
> + free(stats_data);
> +}
> +
> +void dump_vm_stats(struct kvm_vm *vm)
> +{
> + struct kvm_stats_desc *stats_desc;
> + struct kvm_stats_header *header;
> + struct kvm_stats_desc *desc;
> + size_t size_desc;
> + int stats_fd;
> + int i;
> +
> + stats_fd = vm_get_stats_fd(vm);
> +
> + header = read_vm_stats_header(stats_fd);
> + dump_header(stats_fd, header);
> +
> + stats_desc = read_vm_stats_desc(stats_fd, header);
> +
> + size_desc = stats_desc_size(header);
> +
> + /* Read kvm stats data one by one */
> + for (i = 0; i < header->num_desc; ++i) {
> + desc = (void *)stats_desc + (i * size_desc);
> + dump_stat(stats_fd, header, desc);
> + }
> +
> + free(stats_desc);
> + free(header);
> +
> + close(stats_fd);
> +}
> +
> --
> 2.35.1.1021.g381101b075-goog
>
next prev parent reply other threads:[~2022-04-06 2:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 17:46 [PATCH v3 00/11] KVM: x86: Add a cap to disable NX hugepages on a VM Ben Gardon
2022-03-30 17:46 ` [PATCH v3 01/11] KVM: selftests: Add vm_alloc_page_table_in_memslot library function Ben Gardon
2022-03-30 17:46 ` [PATCH v3 02/11] KVM: selftests: Dump VM stats in binary stats test Ben Gardon
2022-03-30 18:50 ` Jing Zhang
2022-04-05 22:19 ` David Matlack [this message]
2022-04-06 20:37 ` Ben Gardon
2022-04-08 19:51 ` Sean Christopherson
2022-06-30 21:00 ` Mingwei Zhang
2022-07-07 19:48 ` Sean Christopherson
2022-03-30 17:46 ` [PATCH v3 03/11] KVM: selftests: Test reading a single stat Ben Gardon
2022-03-30 18:51 ` Jing Zhang
2022-04-05 22:24 ` David Matlack
2022-04-06 20:48 ` Ben Gardon
2022-03-30 17:46 ` [PATCH v3 04/11] KVM: selftests: Add memslot parameter to elf_load Ben Gardon
2022-04-05 22:27 ` David Matlack
2022-03-30 17:46 ` [PATCH v3 05/11] KVM: selftests: Improve error message in vm_phy_pages_alloc Ben Gardon
2022-04-05 22:29 ` David Matlack
2022-03-30 17:46 ` [PATCH v3 06/11] KVM: selftests: Add NX huge pages test Ben Gardon
2022-04-05 22:38 ` David Matlack
2022-04-07 16:52 ` Ben Gardon
2022-03-30 17:46 ` [PATCH v3 07/11] KVM: x86/MMU: Factor out updating NX hugepages state for a VM Ben Gardon
2022-04-05 22:40 ` David Matlack
2022-03-30 17:46 ` [PATCH v3 08/11] KVM: x86/MMU: Allow NX huge pages to be disabled on a per-vm basis Ben Gardon
2022-04-05 22:46 ` David Matlack
2022-03-30 17:46 ` [PATCH v3 09/11] KVM: x86: Fix errant brace in KVM capability handling Ben Gardon
2022-03-30 17:46 ` [PATCH v3 10/11] KVM: x86/MMU: Require reboot permission to disable NX hugepages Ben Gardon
2022-03-30 18:02 ` Sean Christopherson
2022-03-30 23:42 ` Ben Gardon
2022-03-30 17:46 ` [PATCH v3 11/11] selftests: KVM: Test disabling NX hugepages on a VM Ben Gardon
2022-04-05 22:55 ` David Matlack
2022-04-07 18:26 ` Ben Gardon
2022-04-07 18:39 ` Ben Gardon
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=YkzAV8FPdSjzDOd1@google.com \
--to=dmatlack@google.com \
--cc=bgardon@google.com \
--cc=daviddunn@google.com \
--cc=jingzhangos@google.com \
--cc=jmattson@google.com \
--cc=junaids@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=seanjc@google.com \
/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