From: Oliver Upton <oupton@google.com>
To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Marc Zyngier <maz@kernel.org>, Peter Shier <pshier@google.com>,
Jim Mattson <jmattson@google.com>,
David Matlack <dmatlack@google.com>,
Ricardo Koller <ricarkol@google.com>,
Jing Zhang <jingzhangos@google.com>,
Raghavendra Rao Anata <rananta@google.com>,
James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
linux-arm-kernel@lists.infradead.org,
Andrew Jones <drjones@redhat.com>, Will Deacon <will@kernel.org>,
Catalin Marinas <catalin.marinas@arm.com>,
Oliver Upton <oupton@google.com>
Subject: [PATCH v8 9/9] selftests: KVM: Test vtimer offset reg in get-reg-list
Date: Thu, 16 Sep 2021 18:15:55 +0000 [thread overview]
Message-ID: <20210916181555.973085-10-oupton@google.com> (raw)
In-Reply-To: <20210916181555.973085-1-oupton@google.com>
Assert that KVM exposes KVM_REG_ARM_TIMER_OFFSET in the KVM_GET_REG_LIST
ioctl when userspace buys in to the new behavior.
Signed-off-by: Oliver Upton <oupton@google.com>
---
.../selftests/kvm/aarch64/get-reg-list.c | 42 +++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
index cc898181faab..4f337d8b793a 100644
--- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c
+++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c
@@ -40,6 +40,7 @@ static __u64 *blessed_reg, blessed_n;
struct reg_sublist {
const char *name;
long capability;
+ long enable_capability;
int feature;
bool finalize;
__u64 *regs;
@@ -397,6 +398,19 @@ static void check_supported(struct vcpu_config *c)
}
}
+static void enable_caps(struct kvm_vm *vm, struct vcpu_config *c)
+{
+ struct kvm_enable_cap cap = {0};
+ struct reg_sublist *s;
+
+ for_each_sublist(c, s) {
+ if (s->enable_capability) {
+ cap.cap = s->enable_capability;
+ vm_enable_cap(vm, &cap);
+ }
+ }
+}
+
static bool print_list;
static bool print_filtered;
static bool fixup_core_regs;
@@ -412,6 +426,8 @@ static void run_test(struct vcpu_config *c)
check_supported(c);
vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);
+ enable_caps(vm, c);
+
prepare_vcpu_init(c, &init);
aarch64_vcpu_add_default(vm, 0, &init, NULL);
finalize_vcpu(vm, 0, c);
@@ -1014,6 +1030,10 @@ static __u64 sve_rejects_set[] = {
KVM_REG_ARM64_SVE_VLS,
};
+static __u64 vtimer_offset_regs[] = {
+ KVM_REG_ARM_TIMER_OFFSET,
+};
+
#define BASE_SUBLIST \
{ "base", .regs = base_regs, .regs_n = ARRAY_SIZE(base_regs), }
#define VREGS_SUBLIST \
@@ -1025,6 +1045,10 @@ static __u64 sve_rejects_set[] = {
{ "sve", .capability = KVM_CAP_ARM_SVE, .feature = KVM_ARM_VCPU_SVE, .finalize = true, \
.regs = sve_regs, .regs_n = ARRAY_SIZE(sve_regs), \
.rejects_set = sve_rejects_set, .rejects_set_n = ARRAY_SIZE(sve_rejects_set), }
+#define VTIMER_OFFSET_SUBLIST \
+ { "vtimer_offset", .capability = KVM_CAP_ARM_VTIMER_OFFSET, \
+ .enable_capability = KVM_CAP_ARM_VTIMER_OFFSET, .regs = vtimer_offset_regs, \
+ .regs_n = ARRAY_SIZE(vtimer_offset_regs), }
static struct vcpu_config vregs_config = {
.sublists = {
@@ -1041,6 +1065,14 @@ static struct vcpu_config vregs_pmu_config = {
{0},
},
};
+static struct vcpu_config vregs_vtimer_config = {
+ .sublists = {
+ BASE_SUBLIST,
+ VREGS_SUBLIST,
+ VTIMER_OFFSET_SUBLIST,
+ {0},
+ },
+};
static struct vcpu_config sve_config = {
.sublists = {
BASE_SUBLIST,
@@ -1056,11 +1088,21 @@ static struct vcpu_config sve_pmu_config = {
{0},
},
};
+static struct vcpu_config sve_vtimer_config = {
+ .sublists = {
+ BASE_SUBLIST,
+ SVE_SUBLIST,
+ VTIMER_OFFSET_SUBLIST,
+ {0},
+ },
+};
static struct vcpu_config *vcpu_configs[] = {
&vregs_config,
&vregs_pmu_config,
+ &vregs_vtimer_config,
&sve_config,
&sve_pmu_config,
+ &sve_vtimer_config,
};
static int vcpu_configs_n = ARRAY_SIZE(vcpu_configs);
--
2.33.0.464.g1972c5931b-goog
next prev parent reply other threads:[~2021-09-16 18:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 18:15 [PATCH v8 0/9] selftests: KVM: Test offset-based counter controls Oliver Upton
2021-09-16 18:15 ` [PATCH v8 1/9] tools: arch: x86: pull in pvclock headers Oliver Upton
2021-09-16 18:15 ` [PATCH v8 2/9] selftests: KVM: Add test for KVM_{GET,SET}_CLOCK Oliver Upton
2021-10-05 6:51 ` Andrew Jones
2021-09-16 18:15 ` [PATCH v8 3/9] selftests: KVM: Fix kvm device helper ioctl assertions Oliver Upton
2021-09-16 18:15 ` [PATCH v8 4/9] selftests: KVM: Add helpers for vCPU device attributes Oliver Upton
2021-09-16 18:15 ` [PATCH v8 5/9] selftests: KVM: Introduce system counter offset test Oliver Upton
2021-09-16 18:15 ` [PATCH v8 6/9] selftests: KVM: Add support for aarch64 to system_counter_offset_test Oliver Upton
2021-09-16 18:15 ` [PATCH v8 7/9] selftests: KVM: Test physical counter offsetting Oliver Upton
2021-09-16 18:15 ` [PATCH v8 8/9] selftests: KVM: Add counter emulation benchmark Oliver Upton
2021-09-16 18:15 ` Oliver Upton [this message]
2021-09-20 12:28 ` [PATCH v8 9/9] selftests: KVM: Test vtimer offset reg in get-reg-list Andrew Jones
2021-09-24 16:43 ` [PATCH v8 0/9] selftests: KVM: Test offset-based counter controls Paolo Bonzini
2021-10-05 8:58 ` Paolo Bonzini
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=20210916181555.973085-10-oupton@google.com \
--to=oupton@google.com \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=dmatlack@google.com \
--cc=drjones@redhat.com \
--cc=james.morse@arm.com \
--cc=jingzhangos@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=pshier@google.com \
--cc=rananta@google.com \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
--cc=suzuki.poulose@arm.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