From: Maxim Levitsky <mlevitsk@redhat.com>
To: kvm@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Jonathan Corbet <corbet@lwn.net>,
Jim Mattson <jmattson@google.com>,
Wanpeng Li <wanpengli@tencent.com>,
linux-kselftest@vger.kernel.org (open list:KERNEL SELFTEST
FRAMEWORK), Vitaly Kuznetsov <vkuznets@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
Sean Christopherson <sean.j.christopherson@intel.com>,
linux-kernel@vger.kernel.org (open list),
Ingo Molnar <mingo@redhat.com>,
x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)),
Joerg Roedel <joro@8bytes.org>, Borislav Petkov <bp@alien8.de>,
Shuah Khan <shuah@kernel.org>,
Maxim Levitsky <mlevitsk@redhat.com>,
Andrew Jones <drjones@redhat.com>,
Oliver Upton <oupton@google.com>,
linux-doc@vger.kernel.org (open list:DOCUMENTATION)
Subject: [PATCH v2 3/3] kvm/selftests: update tsc_msrs_test to cover KVM_X86_QUIRK_TSC_HOST_ACCESS
Date: Thu, 3 Dec 2020 19:11:18 +0200 [thread overview]
Message-ID: <20201203171118.372391-4-mlevitsk@redhat.com> (raw)
In-Reply-To: <20201203171118.372391-1-mlevitsk@redhat.com>
Run the test once with quirk enabled and once disabled,
and adjust the expected values accordingly.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
---
.../selftests/kvm/x86_64/tsc_msrs_test.c | 79 ++++++++++++++++---
1 file changed, 69 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c b/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
index e357d8e222d47..3900c543a7ee1 100644
--- a/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
+++ b/tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c
@@ -79,8 +79,6 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage)
{
struct ucall uc;
- vcpu_args_set(vm, vcpuid, 1, vcpuid);
-
vcpu_ioctl(vm, vcpuid, KVM_RUN, NULL);
switch (get_ucall(vm, vcpuid, &uc)) {
@@ -101,7 +99,7 @@ static void run_vcpu(struct kvm_vm *vm, uint32_t vcpuid, int stage)
}
}
-int main(void)
+void run_test(bool quirk_disabled)
{
struct kvm_vm *vm;
uint64_t val;
@@ -109,6 +107,14 @@ int main(void)
vm = vm_create_default(VCPU_ID, 0, guest_code);
val = 0;
+ if (quirk_disabled) {
+ struct kvm_enable_cap cap = {
+ .cap = KVM_CAP_DISABLE_QUIRKS,
+ .args[0] = KVM_X86_QUIRK_TSC_HOST_ACCESS,
+ };
+ vm_enable_cap(vm, &cap);
+ }
+
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), val);
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val);
@@ -124,20 +130,67 @@ int main(void)
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), val);
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val);
- /*
- * Host: writes to MSR_IA32_TSC set the host-side offset
- * and therefore do not change MSR_IA32_TSC_ADJUST.
- */
- vcpu_set_msr(vm, 0, MSR_IA32_TSC, HOST_ADJUST + val);
+ if (quirk_disabled) {
+ struct kvm_tsc_state state = {
+ .tsc = HOST_ADJUST + val,
+ .flags = 0
+ };
+ vcpu_ioctl(vm, VCPU_ID, KVM_SET_TSC_STATE, &state);
+ } else {
+ /*
+ * Host: writes to MSR_IA32_TSC set the host-side offset
+ * and therefore do not change MSR_IA32_TSC_ADJUST
+ */
+ vcpu_set_msr(vm, 0, MSR_IA32_TSC, HOST_ADJUST + val);
+ }
+
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), HOST_ADJUST + val);
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val);
+
+ if (quirk_disabled) {
+ /*
+ * Host: writes to MSR_IA32_TSC work like in the guest
+ * when quirk is disabled
+ */
+ vcpu_set_msr(vm, 0, MSR_IA32_TSC, val);
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), val);
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val - HOST_ADJUST);
+
+ /* Restore the value */
+ vcpu_set_msr(vm, 0, MSR_IA32_TSC, HOST_ADJUST + val);
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val);
+ }
+
run_vcpu(vm, VCPU_ID, 3);
- /* Host: writes to MSR_IA32_TSC_ADJUST do not modify the TSC. */
+ /*
+ * Host: writes to MSR_IA32_TSC_ADJUST do not modify the TSC,
+ * (unless the quirk is disabled)
+ */
vcpu_set_msr(vm, 0, MSR_IA32_TSC_ADJUST, UNITY * 123456);
- ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), HOST_ADJUST + val);
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC),
+ quirk_disabled ? UNITY * 123456 + HOST_ADJUST : HOST_ADJUST + val);
ASSERT_EQ(vcpu_get_msr(vm, 0, MSR_IA32_TSC_ADJUST), UNITY * 123456);
+ if (quirk_disabled) {
+ /*
+ * Host: writes via KVM_SET_TSC_STATE
+ * to MSR_IA32_TSC and MSR_IA32_TSC_ADJUST can be done
+ * independently
+ */
+ struct kvm_tsc_state state = {
+ .tsc = UNITY * 42,
+ .tsc_adjust = UNITY * 42 - HOST_ADJUST,
+ .flags = KVM_TSC_STATE_TSC_ADJUST_VALID
+ };
+
+ vcpu_ioctl(vm, VCPU_ID, KVM_SET_TSC_STATE, &state);
+
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), UNITY * 42);
+ ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST),
+ UNITY * 42 - HOST_ADJUST);
+ }
+
/* Restore previous value. */
vcpu_set_msr(vm, 0, MSR_IA32_TSC_ADJUST, val);
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC), HOST_ADJUST + val);
@@ -162,6 +215,12 @@ int main(void)
ASSERT_EQ(rounded_host_rdmsr(MSR_IA32_TSC_ADJUST), val - HOST_ADJUST);
kvm_vm_free(vm);
+}
+
+int main(void)
+{
+ run_test(false);
+ run_test(true);
return 0;
}
--
2.26.2
next prev parent reply other threads:[~2020-12-03 17:13 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 17:11 [PATCH v2 0/3] RFC: Precise TSC migration Maxim Levitsky
2020-12-03 17:11 ` [PATCH v2 1/3] KVM: x86: implement KVM_{GET|SET}_TSC_STATE Maxim Levitsky
2020-12-06 16:19 ` Thomas Gleixner
2020-12-07 12:16 ` Maxim Levitsky
2020-12-07 13:16 ` Vitaly Kuznetsov
2020-12-07 17:41 ` Thomas Gleixner
2020-12-08 9:48 ` Peter Zijlstra
2020-12-10 11:42 ` Paolo Bonzini
2020-12-10 12:14 ` Peter Zijlstra
2020-12-10 12:22 ` Paolo Bonzini
2020-12-10 13:01 ` Peter Zijlstra
2020-12-10 20:20 ` Thomas Gleixner
2020-12-07 16:38 ` Thomas Gleixner
2020-12-07 16:53 ` Andy Lutomirski
2020-12-07 17:00 ` Maxim Levitsky
2020-12-07 18:04 ` Andy Lutomirski
2020-12-07 23:11 ` Marcelo Tosatti
2020-12-08 17:43 ` Andy Lutomirski
2020-12-08 19:24 ` Thomas Gleixner
2020-12-08 20:32 ` Andy Lutomirski
2020-12-09 0:19 ` Thomas Gleixner
2020-12-09 4:08 ` Andy Lutomirski
2020-12-09 10:14 ` Thomas Gleixner
2020-12-10 23:42 ` Andy Lutomirski
2020-12-08 11:24 ` Maxim Levitsky
2020-12-08 9:35 ` Peter Zijlstra
2020-12-07 23:34 ` Marcelo Tosatti
2020-12-07 17:29 ` Oliver Upton
2020-12-08 11:13 ` Maxim Levitsky
2020-12-08 15:57 ` Oliver Upton
2020-12-08 15:58 ` Oliver Upton
2020-12-08 17:10 ` Maxim Levitsky
2020-12-08 16:40 ` Thomas Gleixner
2020-12-08 17:08 ` Maxim Levitsky
2020-12-10 11:48 ` Paolo Bonzini
2020-12-10 14:25 ` Maxim Levitsky
2020-12-07 23:29 ` Marcelo Tosatti
2020-12-08 14:50 ` Maxim Levitsky
2020-12-08 16:02 ` Thomas Gleixner
2020-12-08 16:25 ` Maxim Levitsky
2020-12-08 17:33 ` Andy Lutomirski
2020-12-08 21:25 ` Thomas Gleixner
2020-12-08 18:12 ` Marcelo Tosatti
2020-12-08 21:35 ` Thomas Gleixner
2020-12-08 21:20 ` Thomas Gleixner
2020-12-10 11:48 ` Paolo Bonzini
2020-12-10 14:52 ` Maxim Levitsky
2020-12-10 15:16 ` Andy Lutomirski
2020-12-10 17:59 ` Oliver Upton
2020-12-10 18:05 ` Paolo Bonzini
2020-12-10 18:13 ` Oliver Upton
2020-12-10 21:25 ` Thomas Gleixner
2020-12-10 22:01 ` Andy Lutomirski
2020-12-10 22:28 ` Thomas Gleixner
2020-12-10 23:19 ` Andy Lutomirski
2020-12-11 0:03 ` Thomas Gleixner
2020-12-08 18:11 ` Marcelo Tosatti
2020-12-08 21:33 ` Thomas Gleixner
2020-12-09 16:34 ` Marcelo Tosatti
2020-12-09 20:58 ` Thomas Gleixner
2020-12-10 15:26 ` Marcelo Tosatti
2020-12-10 21:48 ` Thomas Gleixner
2020-12-11 0:27 ` Marcelo Tosatti
2020-12-11 13:30 ` Thomas Gleixner
2020-12-11 14:18 ` Marcelo Tosatti
2020-12-11 21:04 ` Thomas Gleixner
2020-12-11 21:59 ` Paolo Bonzini
2020-12-12 13:03 ` Thomas Gleixner
2020-12-15 10:59 ` Marcelo Tosatti
2020-12-15 16:55 ` Andy Lutomirski
2020-12-15 22:34 ` Thomas Gleixner
2020-12-11 13:37 ` Paolo Bonzini
2020-12-08 17:35 ` Marcelo Tosatti
2020-12-03 17:11 ` [PATCH v2 2/3] KVM: x86: introduce KVM_X86_QUIRK_TSC_HOST_ACCESS Maxim Levitsky
2020-12-03 17:11 ` Maxim Levitsky [this message]
2020-12-07 23:16 ` [PATCH v2 0/3] RFC: Precise TSC migration Marcelo Tosatti
2020-12-10 11:48 ` 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=20201203171118.372391-4-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=drjones@redhat.com \
--cc=hpa@zytor.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=oupton@google.com \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@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).