From: Ben Gardon <bgardon@google.com>
To: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>
Cc: linux-kernel@vger.kernel.org, Peter Xu <peterx@redhat.com>,
Sean Christopherson <seanjc@google.com>,
David Matlack <dmatlack@google.com>,
Jim Mattson <jmattson@google.com>,
David Dunn <daviddunn@google.com>,
Jing Zhang <jingzhangos@google.com>,
Junaid Shahid <junaids@google.com>,
Ben Gardon <bgardon@google.com>
Subject: [PATCH v9 02/10] KVM: selftests: Read binary stats header in lib
Date: Mon, 13 Jun 2022 21:25:15 +0000 [thread overview]
Message-ID: <20220613212523.3436117-3-bgardon@google.com> (raw)
In-Reply-To: <20220613212523.3436117-1-bgardon@google.com>
Move the code to read the binary stats header to the KVM selftests
library. It will be re-used by other tests to check KVM behavior.
No functional change intended.
Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Ben Gardon <bgardon@google.com>
---
tools/testing/selftests/kvm/include/kvm_util_base.h | 8 ++++++++
tools/testing/selftests/kvm/kvm_binary_stats_test.c | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
index cdaea2383543..3d3dd144f427 100644
--- a/tools/testing/selftests/kvm/include/kvm_util_base.h
+++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
@@ -303,6 +303,14 @@ static inline int vm_get_stats_fd(struct kvm_vm *vm)
return fd;
}
+static inline void read_stats_header(int stats_fd, struct kvm_stats_header *header)
+{
+ ssize_t ret;
+
+ ret = read(stats_fd, header, sizeof(*header));
+ TEST_ASSERT(ret == sizeof(*header), "Read stats header");
+}
+
void vm_create_irqchip(struct kvm_vm *vm);
void vm_set_user_memory_region(struct kvm_vm *vm, uint32_t slot, uint32_t flags,
diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
index ae48d4153f85..64db17faacd2 100644
--- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c
+++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c
@@ -33,8 +33,8 @@ static void stats_test(int stats_fd)
struct kvm_stats_desc *pdesc;
/* Read kvm stats header */
- ret = read(stats_fd, &header, sizeof(header));
- TEST_ASSERT(ret == sizeof(header), "Read stats header");
+ read_stats_header(stats_fd, &header);
+
size_desc = sizeof(*stats_desc) + header.name_size;
/* Read kvm stats id string */
--
2.36.1.476.g0c4daa206d-goog
next prev parent reply other threads:[~2022-06-13 21:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-13 21:25 [PATCH v9 00/10] KVM: x86: Add a cap to disable NX hugepages on a VM Ben Gardon
2022-06-13 21:25 ` [PATCH v9 01/10] KVM: selftests: Remove dynamic memory allocation for stats header Ben Gardon
2022-06-13 21:25 ` Ben Gardon [this message]
2022-06-13 21:25 ` [PATCH v9 03/10] KVM: selftests: Read binary stats desc in lib Ben Gardon
2022-06-13 21:25 ` [PATCH v9 04/10] KVM: selftests: Clean up coding style in binary stats test Ben Gardon
2022-06-13 21:25 ` [PATCH v9 05/10] KVM: selftests: Read binary stat data in lib Ben Gardon
2022-06-13 21:25 ` [PATCH v9 06/10] KVM: selftests: Add NX huge pages test Ben Gardon
2022-06-13 21:25 ` [PATCH v9 07/10] KVM: x86: Fix errant brace in KVM capability handling Ben Gardon
2022-06-13 21:25 ` [PATCH v9 08/10] KVM: x86/MMU: Allow NX huge pages to be disabled on a per-vm basis Ben Gardon
2022-06-13 21:25 ` [PATCH v9 09/10] KVM: selftests: Test disabling NX hugepages on a VM Ben Gardon
2022-06-13 21:25 ` [PATCH v9 10/10] KVM: selftests: Cache binary stats metadata for duration of test 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=20220613212523.3436117-3-bgardon@google.com \
--to=bgardon@google.com \
--cc=daviddunn@google.com \
--cc=dmatlack@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
all inboxes | Powered by JetHome®