Re: [XEN PATCH v5 10/13] x86/vpmu: guard calls to vmx/svm functions

[Sergiy Kibrik]

31.07.24 15:29, Jan Beulich:

@@ -326,14 +328,14 @@ static inline void __core2_vpmu_load(struct vcpu *v)
      if ( vpmu_is_set(vcpu_vpmu(v), VPMU_CPU_HAS_DS) )
          wrmsrl(MSR_IA32_DS_AREA, core2_vpmu_cxt->ds_area);

- if ( !is_hvm_vcpu(v) )

+    if ( !is_vmx_vcpu(v) )
      {
          wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, 
core2_vpmu_cxt->global_ovf_ctrl);
          core2_vpmu_cxt->global_ovf_ctrl = 0;
          wrmsrl(MSR_CORE_PERF_GLOBAL_CTRL, core2_vpmu_cxt->global_ctrl);
      }
      /* Restore MSR from context when used with a fork */
-    else if ( mem_sharing_is_fork(v->domain) )
+    else if ( is_vmx_vcpu(v) && mem_sharing_is_fork(v->domain) )
          vmx_write_guest_msr(v, MSR_CORE_PERF_GLOBAL_CTRL,
                              core2_vpmu_cxt->global_ctrl);
  }

Same here. With those dropped (I could do so while committing, as long as you
agree):
Reviewed-by: Jan Beulich<jbeul...@suse.com>

oops, these are leftovers from prev. patch versions, not needed anymore ofc.
As there'll be v6 of this patch series I'll fix it then.

  -Sergiy