On 11/10/2017 18:22, Nadav Amit wrote:
> Haozhong Zhang <haozhong.zhang@xxxxxxxxx> wrote:
>
>> Test whether KVM loads the correct L1 CR4 as guest CR4 when emulating
>> L2 to L1 exit.
>>
>> Signed-off-by: Haozhong Zhang <haozhong.zhang@xxxxxxxxx>
>> ---
>> lib/x86/processor.h | 2 ++
>> x86/vmx_tests.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 2 files changed, 59 insertions(+)
>>
>> diff --git a/lib/x86/processor.h b/lib/x86/processor.h
>> index e658d83..2473862 100644
>> --- a/lib/x86/processor.h
>> +++ b/lib/x86/processor.h
>> @@ -21,10 +21,12 @@
>> #define X86_CR0_WP 0x00010000
>> #define X86_CR0_AM 0x00040000
>> #define X86_CR0_PG 0x80000000
>> +#define X86_CR3_PCID_MASK 0x00000fff
>> #define X86_CR4_TSD 0x00000004
>> #define X86_CR4_DE 0x00000008
>> #define X86_CR4_PSE 0x00000010
>> #define X86_CR4_PAE 0x00000020
>> +#define X86_CR4_MCE 0x00000040
>> #define X86_CR4_VMXE 0x00002000
>> #define X86_CR4_PCIDE 0x00020000
>> #define X86_CR4_SMAP 0x00200000
>> diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
>> index 4a3e94b..c829f91 100644
>> --- a/x86/vmx_tests.c
>> +++ b/x86/vmx_tests.c
>> @@ -3668,6 +3668,62 @@ static void vmentry_movss_shadow_test(void)
>> vmcs_write(GUEST_RFLAGS, X86_EFLAGS_FIXED);
>> }
>>
>> +#define X86_FEATURE_PCID (1 << 17)
>> +#define X86_FEATURE_MCE (1 << 7)
>> +
>> +static int write_cr4_checking(unsigned long val)
>> +{
>> + asm volatile(ASM_TRY("1f")
>> + "mov %0, %%cr4\n\t"
>> + "1:": : "r" (val));
>> + return exception_vector();
>> +}
>> +
>> +static void vmx_cr4_load_test(void)
>> +{
>> + struct cpuid _cpuid = cpuid(1);
>> + unsigned long cr4 = read_cr4(), cr3 = read_cr3();
>> +
>> + if (!(_cpuid.c & X86_FEATURE_PCID)) {
>> + report_skip("PCID not detected");
>> + return;
>> + }
>> + if (!(_cpuid.d & X86_FEATURE_PCID)) {
>
> Shouldn’t it be X86_FEATURE_MCE ?
>
Hmm... yes. :)
Paolo
Attachment:
signature.asc
Description: OpenPGP digital signature
