Skip to contentSkip to conversation

hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET

PATCH Applied Jessica Clarke 3 participants 3 messages Nov 16, 2020 – Nov 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET

---
 target/i386/hvf/x86_cpuid.c | 4 ++++
 1 file changed, 4 insertions(+)
target/i386/hvf/x86_cpuid.c +4 -0
index 16762b6eb4..fc1f87ec57 100644
@@ -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
#1 lore raw
Quoted 12 lines · Jessica Clarke
---
  target/i386/hvf/x86_cpuid.c | 4 ++++
  1 file changed, 4 insertions(+)
target/i386/hvf/x86_cpuid.c +0 -0
index 16762b6eb4..fc1f87ec57 100644

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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Jessica Clarke
Quoted 24 lines · Jessica Clarke
---
 target/i386/hvf/x86_cpuid.c | 4 ++++
 1 file changed, 4 insertions(+)
target/i386/hvf/x86_cpuid.c +4 -0
index 16762b6eb4..fc1f87ec57 100644
@@ -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

Thanks,
Roman