diff options
| author | Sean Christopherson <sean.j.christopherson@intel.com> | 2020-04-28 16:11:35 -0700 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-05-04 12:34:55 -0400 |
| commit | 8feb8cfb0e31fe2ad7ebd101828a4d957ee52739 (patch) | |
| tree | 652132fb188853498d1858431e7f7595004c8818 | |
| parent | 149c2513efc820a4d4a8dd1a3827f8310e95d5be (diff) | |
| download | kvm-unit-tests-8feb8cfb0e31fe2ad7ebd101828a4d957ee52739.tar.gz | |
x86: msr: Don't test bits 63:32 of SYSENTER MSRs on 32-bit builds
Squish the "address" stuffed into SYSENTER_EIP/ESP into an unsigned long
so as to drop bits 63:32 on 32-bit builds. VMX diverges from bare metal
in the sense that the associated VMCS fields are natural width fields,
whereas the actual MSRs hold 64-bit values, even on CPUs that don't
support 64-bit mode. This causes the tests to fail if bits 63:32 are
non-zero and a VM-Exit/VM-Enter occurs on and/or between WRMSR/RDMSR,
e.g. when running the tests in L1 or deeper.
Don't bother trying to actually test that bits 63:32 are dropped, the
behavior depends on the (virtual) CPU capabilities, not the build, and
the behavior is specific to VMX as both SVM and bare metal preserve the
full 64-bit values. And because practically no one cares about 32-bit
KVM, let alone an obscure architectural quirk that doesn't affect real
world kernels.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200428231135.12903-1-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | x86/msr.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -16,6 +16,7 @@ struct msr_info { #define addr_64 0x0000123456789abcULL +#define addr_ul (unsigned long)addr_64 struct msr_info msr_info[] = { @@ -23,10 +24,10 @@ struct msr_info msr_info[] = .val_pairs = {{ .valid = 1, .value = 0x1234, .expected = 0x1234}} }, { .index = 0x00000175, .name = "MSR_IA32_SYSENTER_ESP", - .val_pairs = {{ .valid = 1, .value = addr_64, .expected = addr_64}} + .val_pairs = {{ .valid = 1, .value = addr_ul, .expected = addr_ul}} }, { .index = 0x00000176, .name = "IA32_SYSENTER_EIP", - .val_pairs = {{ .valid = 1, .value = addr_64, .expected = addr_64}} + .val_pairs = {{ .valid = 1, .value = addr_ul, .expected = addr_ul}} }, { .index = 0x000001a0, .name = "MSR_IA32_MISC_ENABLE", // reserved: 1:2, 4:6, 8:10, 13:15, 17, 19:21, 24:33, 35:63 |