hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET
PATCH 1/1 hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET
Signed-off-by Jessica Clarke <[email protected]>
--- target/i386/hvf/x86_cpuid.c | 4 ++++ 1 file changed, 4 insertions(+)
target/i386/hvf/x86_cpuid.c +4 -0
@@ -122,6 +122,10 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,CPUID_PAT |CPUID_PSE36 |CPUID_EXT2_MMXEXT |CPUID_MMX |CPUID_FXSR |CPUID_EXT2_FXSR |CPUID_EXT2_PDPE1GB |CPUID_EXT2_3DNOWEXT |CPUID_EXT2_3DNOW |CPUID_EXT2_LM |CPUID_EXT2_RDTSCP |CPUID_EXT2_NX ; +hv_vmx_read_capability (HV_VMX_CAP_PROCBASED2 , &cap); +if (!(cap &CPU_BASED2_RDTSCP )) { + edx &= ~CPUID_EXT2_RDTSCP ; + }hv_vmx_read_capability (HV_VMX_CAP_PROCBASED , &cap);if (!(cap &CPU_BASED_TSC_OFFSET )) { edx &= ~CPUID_EXT2_RDTSCP ;
Signature · 1 line
2.28.0
Paolo Bonzini
AppliedQuoted 12 lines · Jessica Clarke
Signed-off-by Jessica Clarke <[email protected]>--- target/i386/hvf/x86_cpuid.c | 4 ++++ 1 file changed, 4 insertions(+)target/i386/hvf/x86_cpuid.c +0
-0
target/i386/hvf/x86_cpuid.c uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, · line 131
Quoted 10 lines
target/i386/hvf/x86_cpuid.c +4
-0@@ -122,6 +122,10 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,CPUID_PAT |CPUID_PSE36 |CPUID_EXT2_MMXEXT |CPUID_MMX |CPUID_FXSR |CPUID_EXT2_FXSR |CPUID_EXT2_PDPE1GB |CPUID_EXT2_3DNOWEXT |CPUID_EXT2_3DNOW |CPUID_EXT2_LM |CPUID_EXT2_RDTSCP |CPUID_EXT2_NX ; +hv_vmx_read_capability (HV_VMX_CAP_PROCBASED2 , &cap); +if (!(cap &CPU_BASED2_RDTSCP )) { + edx &= ~CPUID_EXT2_RDTSCP ; + }hv_vmx_read_capability (HV_VMX_CAP_PROCBASED , &cap);if (!(cap &CPU_BASED_TSC_OFFSET )) { edx &= ~CPUID_EXT2_RDTSCP ;
Queued, thanks.
Paolo
Quoted 24 lines · Jessica Clarke
Signed-off-by Jessica Clarke <[email protected]>--- target/i386/hvf/x86_cpuid.c | 4 ++++ 1 file changed, 4 insertions(+)target/i386/hvf/x86_cpuid.c +4
-0@@ -122,6 +122,10 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,CPUID_PAT |CPUID_PSE36 |CPUID_EXT2_MMXEXT |CPUID_MMX |CPUID_FXSR |CPUID_EXT2_FXSR |CPUID_EXT2_PDPE1GB |CPUID_EXT2_3DNOWEXT |CPUID_EXT2_3DNOW |CPUID_EXT2_LM |CPUID_EXT2_RDTSCP |CPUID_EXT2_NX ; +hv_vmx_read_capability (HV_VMX_CAP_PROCBASED2 , &cap); +if (!(cap &CPU_BASED2_RDTSCP )) { + edx &= ~CPUID_EXT2_RDTSCP ; + }hv_vmx_read_capability (HV_VMX_CAP_PROCBASED , &cap);if (!(cap &CPU_BASED_TSC_OFFSET )) { edx &= ~CPUID_EXT2_RDTSCP ;Signature · 1 line
2.28.0
Reviewed-by Roman Bolshakov <[email protected]>
Thanks,
Roman