conf: qemu: add support for Hyper-V frequency MSRs

Qemu-2.12 gained 'hv-frequencies' cpu flag to enable Hyper-V frequency MSRs. These MSRs are required (but not sufficient) to make Hyper-V on KVM pass stable TSC page clocksource to L2 guests. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: John Ferlan <jferlan@redhat.com>
2025-02-26 05:12:20 +00:00 · 2018-08-09 15:14:19 +02:00 · 2018-08-09 15:14:19 +02:00 · 8253bca961
commit 8253bca961
parent a408a6dae8
14 changed files with 30 additions and 2 deletions
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@ -1974,6 +1974,7 @@
    &lt;synic state='on'/&gt;
    &lt;reset state='on'/&gt;
    &lt;vendor_id state='on' value='KVM Hv'/&gt;
+    &lt;frequencies state='on'/&gt;
  &lt;/hyperv&gt;
  &lt;kvm&gt;
    &lt;hidden state='on'/&gt;
@ -2096,6 +2097,12 @@
          <td>on, off; value - string, up to 12 characters</td>
          <td><span class="since">1.3.3 (QEMU 2.5)</span></td>
        </tr>
+        <tr>
+          <td>frequencies</td>
+          <td>Expose frequency MSRs</td>
+          <td> on, off</td>
+          <td><span class="since">4.7.0 (QEMU 2.12)</span></td>
+        </tr>
      </table>
      </dd>
      <dt><code>pvspinlock</code></dt>
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@ -5733,6 +5733,11 @@
            </optional>
          </element>
        </optional>
+        <optional>
+          <element name="frequencies">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
      </interleave>
    </element>
  </define>
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@ -169,7 +169,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
              "synic",
              "stimer",
              "reset",
-              "vendor_id")
+              "vendor_id",
+              "frequencies")

 VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
              "hidden")
@ -20278,6 +20279,7 @@ virDomainDefParseXML(xmlDocPtr xml,
            case VIR_DOMAIN_HYPERV_SYNIC:
            case VIR_DOMAIN_HYPERV_STIMER:
            case VIR_DOMAIN_HYPERV_RESET:
+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
                break;

            case VIR_DOMAIN_HYPERV_SPINLOCKS:
@ -22462,6 +22464,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
            case VIR_DOMAIN_HYPERV_SYNIC:
            case VIR_DOMAIN_HYPERV_STIMER:
            case VIR_DOMAIN_HYPERV_RESET:
+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
                if (src->hyperv_features[i] != dst->hyperv_features[i]) {
                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                   _("State of HyperV enlightenment "
@ -28177,6 +28180,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
                    case VIR_DOMAIN_HYPERV_SYNIC:
                    case VIR_DOMAIN_HYPERV_STIMER:
                    case VIR_DOMAIN_HYPERV_RESET:
+                    case VIR_DOMAIN_HYPERV_FREQUENCIES:
                        break;

                    case VIR_DOMAIN_HYPERV_SPINLOCKS:
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@ -1791,6 +1791,7 @@ typedef enum {
    VIR_DOMAIN_HYPERV_STIMER,
    VIR_DOMAIN_HYPERV_RESET,
    VIR_DOMAIN_HYPERV_VENDOR_ID,
+    VIR_DOMAIN_HYPERV_FREQUENCIES,

    VIR_DOMAIN_HYPERV_LAST
 } virDomainHyperv;
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@ -109,6 +109,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VPINDEX,
                0x40000003, 0x00000040);
 KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RESET,
                0x40000003, 0x00000080);
+KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES,
+                0x40000003, 0x00000800);

 static virCPUx86Feature x86_kvm_features[] =
 {
@ -129,6 +131,7 @@ static virCPUx86Feature x86_kvm_features[] =
    KVM_FEATURE(VIR_CPU_x86_KVM_HV_VAPIC),
    KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX),
    KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET),
+    KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES),
 };

 typedef struct _virCPUx86Model virCPUx86Model;
--- a/src/cpu/cpu_x86_data.h
+++ b/src/cpu/cpu_x86_data.h
@ -63,6 +63,7 @@ struct _virCPUx86CPUID {
 # define VIR_CPU_x86_KVM_HV_VAPIC     "__kvm_hv_vapic"
 # define VIR_CPU_x86_KVM_HV_VPINDEX   "__kvm_hv_vpindex"
 # define VIR_CPU_x86_KVM_HV_RESET     "__kvm_hv_reset"
+# define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies"


 # define VIR_CPU_X86_DATA_INIT { 0 }
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@ -6866,6 +6866,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
            case VIR_DOMAIN_HYPERV_SYNIC:
            case VIR_DOMAIN_HYPERV_STIMER:
            case VIR_DOMAIN_HYPERV_RESET:
+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
                if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
                    virBufferAsprintf(&buf, ",hv_%s",
                                      virDomainHypervTypeToString(i));
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@ -1536,6 +1536,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
            case VIR_DOMAIN_HYPERV_SYNIC:
            case VIR_DOMAIN_HYPERV_STIMER:
            case VIR_DOMAIN_HYPERV_RESET:
+            case VIR_DOMAIN_HYPERV_FREQUENCIES:
                if (value) {
                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                   _("HyperV feature '%s' should not "
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@ -3912,6 +3912,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
        case VIR_DOMAIN_HYPERV_SYNIC:
        case VIR_DOMAIN_HYPERV_STIMER:
        case VIR_DOMAIN_HYPERV_RESET:
+        case VIR_DOMAIN_HYPERV_FREQUENCIES:
            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                           _("host doesn't support hyperv '%s' feature"),
                           virDomainHypervTypeToString(i));
--- a/tests/qemuxml2argvdata/hyperv-off.xml
+++ b/tests/qemuxml2argvdata/hyperv-off.xml
@ -20,6 +20,7 @@
      <stimer state='off'/>
      <reset state='off'/>
      <vendor_id state='off'/>
+      <frequencies state='off'/>
    </hyperv>
  </features>
  <clock offset='utc'/>
--- a/tests/qemuxml2argvdata/hyperv.args
+++ b/tests/qemuxml2argvdata/hyperv.args
@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
-hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv' \
+hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies' \
 -m 214 \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--- a/tests/qemuxml2argvdata/hyperv.xml
+++ b/tests/qemuxml2argvdata/hyperv.xml
@ -20,6 +20,7 @@
      <stimer state='on'/>
      <reset state='on'/>
      <vendor_id state='on' value='KVM Hv'/>
+      <frequencies state='on'/>
    </hyperv>
  </features>
  <clock offset='utc'/>
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@ -20,6 +20,7 @@
      <stimer state='off'/>
      <reset state='off'/>
      <vendor_id state='off'/>
+      <frequencies state='off'/>
    </hyperv>
  </features>
  <clock offset='utc'/>
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.xml
@ -20,6 +20,7 @@
      <stimer state='on'/>
      <reset state='on'/>
      <vendor_id state='on' value='KVM Hv'/>
+      <frequencies state='on'/>
    </hyperv>
  </features>
  <clock offset='utc'/>