x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL}
PATCH v2 1/1 x86/msr: fix handling of MSR_IA32_PERF_{STATUS/CTL}
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to MSR_IA32_PERF_CTL. However since commit 322ec7c89f6 the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.
Additionally some HVM guests (Windows at least) will attempt to read MSR_IA32_PERF_CTL and will panic if given back a #GP fault:
vmx.c:3035:d8v0 RDMSR 0x00000199 unimplemented
d8v0 VIRIDIAN CRASH: 3b c0000096 fffff806871c1651 ffffda0253683720 0
Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to MSR_IA32_PERF_CTL by such guest will already be silently dropped.
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>
v2:
* fix is_cpufreq_controller() to exclude PVH dom0, and collapse to nothing in !CONFIG_PV builds
* Drop the cross-vendor checks. It isn't possible to configure dom0 as cross-vendor, and anyone using is_cpufreq_controller() without an exact model match has far bigger problems.
* At least Centaur implements these MSRs. Add access.
--- xen/arch/x86/msr.c | 34 ++++++++++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 14 -------------- xen/include/xen/sched.h | 17 +++++++++++++++++ 3 files changed, 51 insertions(+), 14 deletions(-)
xen/arch/x86/msr.c +34 -0
@@ -242,6 +242,25 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault;break ; +/* +* These MSRs are not enumerated in CPUID. They have been around +* since the Pentium 4, and implemented by other vendors. +* +* Some versions of Windows try reading these before setting up a #GP +* handler, and Linux has several unguarded reads as well. Provide +* RAZ semantics, in general, but permit a cpufreq controller dom0 to +* have full access. +*/ +case MSR_IA32_PERF_STATUS : +case MSR_IA32_PERF_CTL : +if ( !(cp->x86_vendor & (X86_VENDOR_INTEL |X86_VENDOR_CENTAUR )) ) + goto gp_fault; + + *val =0 ; +if (likely (!is_cpufreq_controller (d)) ||rdmsr_safe (msr, *val) ==0 ) +break ; + goto gp_fault; +case MSR_IA32_THERM_STATUS :if ( cp->x86_vendor !=X86_VENDOR_INTEL ) goto gp_fault;
@@ -448,6 +467,21 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) goto gp_fault;break ; +/* +* This MSR are not enumerated in CPUID. It has been around since the +* Pentium 4, and implemented by other vendors. +* +* To match the RAZ semantics, implement as write-discard, except for +* a cpufreq controller dom0 which has full access. +*/ +case MSR_IA32_PERF_CTL : +if ( !(cp->x86_vendor & (X86_VENDOR_INTEL |X86_VENDOR_CENTAUR )) ) + goto gp_fault; + +if (likely (!is_cpufreq_controller (d)) ||wrmsr_safe (msr, val) ==0 ) +break ; + goto gp_fault; + case MSR_X2APIC_FIRST ... MSR_X2APIC_LAST:if ( !is_hvm_domain (d) || v != curr ) goto gp_fault;
xen/arch/x86/pv/emul-priv-op.c +0 -14
@@ -849,12 +849,6 @@ static inline uint64_t guest_misc_enable(uint64_t val)return val; } -static inline bool is_cpufreq_controller (const struct domain *d) -{ -return ((cpufreq_controller == FREQCTL_dom0_kernel) && -is_hardware_domain (d)); -} -static uint64_t guest_efer (const struct domain *d) {uint64_t val;
@@ -1121,14 +1115,6 @@ static int write_msr(unsigned int reg, uint64_t val,return X86EMUL_OKAY ;break ; -case MSR_IA32_PERF_CTL : -if ( boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) -break ; -if (likely (!is_cpufreq_controller (currd)) || -wrmsr_safe (reg, val) ==0 ) -return X86EMUL_OKAY ; -break ; -case MSR_IA32_THERM_CONTROL :case MSR_IA32_ENERGY_PERF_BIAS :if ( boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )
xen/include/xen/sched.h +17 -0
@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{ +/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* +* It would be far better to paravirtualise the interface. +*/ +return (IS_ENABLED (CONFIG_PV ) && + (cpufreq_controller == FREQCTL_dom0_kernel) && +is_pv_domain (d) &&is_hardware_domain (d)); +} +int cpupool_move_domain (struct domain *d,struct cpupool *c);int cpupool_do_sysctl (struct xen_sysctl_cpupool_op *op);int cpupool_get_id (const struct domain *d);
Signature · 1 line
2.11.0
Quoted 24 lines · Andrew Cooper
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to
MSR_IA32_PERF_CTL. However since commit322ec7c89f6the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.Additionally some HVM guests (Windows at least) will attempt to read
MSR_IA32_PERF_CTLand will panic if given back a #GP fault:vmx.c:3035:d8v0 RDMSR
0x00000199unimplemented
d8v0 VIRIDIAN CRASH: 3bc0000096fffff806871c1651ffffda02536837200Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to
MSR_IA32_PERF_CTLby such guest will already be silently dropped.
Quoted 4 lines
Fixes 322ec7c89f6 ('x86/pv: disallow access to unknown MSRs')Fixes 84e848fd7a1 ('x86/hvm: disallow access to unknown MSRs')Signed-off-by Roger Pau Monné <[email protected]>Signed-off-by Andrew Cooper <[email protected]>
Quoted 11 lines
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>v2:
* fixis_cpufreq_controller()to exclude PVH dom0, and collapse to nothing in !CONFIG_PV builds
* Drop the cross-vendor checks. It isn't possible to configure dom0 as cross-vendor, and anyone usingis_cpufreq_controller()without an exact model match has far bigger problems.
I was on the verge of doing this in v1, but wasn't really sure whether there was any use case to change the vendor for dom0 cpuid.
Quoted 101 lines
* At least Centaur implements these MSRs. Add access.
--- xen/arch/x86/msr.c | 34 ++++++++++++++++++++++++++++++++++ xen/arch/x86/pv/emul-priv-op.c | 14 -------------- xen/include/xen/sched.h | 17 +++++++++++++++++ 3 files changed, 51 insertions(+), 14 deletions(-)xen/arch/x86/msr.c +34
-0@@ -242,6 +242,25 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) goto gp_fault;break ; +/* +* These MSRs are not enumerated in CPUID. They have been around +* since the Pentium 4, and implemented by other vendors. +* +* Some versions of Windows try reading these before setting up a #GP +* handler, and Linux has several unguarded reads as well. Provide +* RAZ semantics, in general, but permit a cpufreq controller dom0 to +* have full access. +*/ +case MSR_IA32_PERF_STATUS : +case MSR_IA32_PERF_CTL : +if ( !(cp->x86_vendor & (X86_VENDOR_INTEL |X86_VENDOR_CENTAUR )) ) + goto gp_fault; + + *val =0 ; +if (likely (!is_cpufreq_controller (d)) ||rdmsr_safe (msr, *val) ==0 ) +break ; + goto gp_fault; +case MSR_IA32_THERM_STATUS :if ( cp->x86_vendor !=X86_VENDOR_INTEL ) goto gp_fault;@@ -448,6 +467,21 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) goto gp_fault;break ; +/* +* This MSR are not enumerated in CPUID. It has been around since the +* Pentium 4, and implemented by other vendors. +* +* To match the RAZ semantics, implement as write-discard, except for +* a cpufreq controller dom0 which has full access. +*/ +case MSR_IA32_PERF_CTL : +if ( !(cp->x86_vendor & (X86_VENDOR_INTEL |X86_VENDOR_CENTAUR )) ) + goto gp_fault; + +if (likely (!is_cpufreq_controller (d)) ||wrmsr_safe (msr, val) ==0 ) +break ; + goto gp_fault; + case MSR_X2APIC_FIRST ... MSR_X2APIC_LAST:if ( !is_hvm_domain (d) || v != curr ) goto gp_fault;xen/arch/x86/pv/emul-priv-op.c +0
-14@@ -849,12 +849,6 @@ static inline uint64_t guest_misc_enable(uint64_t val)return val; } -static inline bool is_cpufreq_controller (const struct domain *d) -{ -return ((cpufreq_controller == FREQCTL_dom0_kernel) && -is_hardware_domain (d)); -} -static uint64_t guest_efer (const struct domain *d) {uint64_t val;@@ -1121,14 +1115,6 @@ static int write_msr(unsigned int reg, uint64_t val,return X86EMUL_OKAY ;break ; -case MSR_IA32_PERF_CTL : -if ( boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) -break ; -if (likely (!is_cpufreq_controller (currd)) || -wrmsr_safe (reg, val) ==0 ) -return X86EMUL_OKAY ; -break ; -case MSR_IA32_THERM_CONTROL :case MSR_IA32_ENERGY_PERF_BIAS :if ( boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )xen/include/xen/sched.h +2
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{
xen/include/xen/sched.h extern enum cpufreq_controller { · line 1083
Quoted 10 lines
xen/include/xen/sched.h +10
-0+/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* +* It would be far better to paravirtualise the interface. +*/
Would it be useful to add an assert here that the domain cpuid vendor and the BSP cpuid vendor match?
Is it even possible to fake a different cpuid vendor for dom0?
Thanks, Roger.
Quoted 25 lines · Roger Pau Monné
Quoted 24 lines · Andrew Cooper
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to
MSR_IA32_PERF_CTL. However since commit322ec7c89f6the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.Additionally some HVM guests (Windows at least) will attempt to read
MSR_IA32_PERF_CTLand will panic if given back a #GP fault:vmx.c:3035:d8v0 RDMSR
0x00000199unimplemented
d8v0 VIRIDIAN CRASH: 3bc0000096fffff806871c1651ffffda02536837200Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to
MSR_IA32_PERF_CTLby such guest will already be silently dropped.
Quoted 18 lines
Quoted 4 lines
Fixes 322ec7c89f6 ('x86/pv: disallow access to unknown MSRs')Fixes 84e848fd7a1 ('x86/hvm: disallow access to unknown MSRs')Signed-off-by Roger Pau Monné <[email protected]>Signed-off-by Andrew Cooper <[email protected]>Reviewed-by Roger Pau Monné <[email protected]>Quoted 11 lines
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>v2:
* fixis_cpufreq_controller()to exclude PVH dom0, and collapse to nothing in !CONFIG_PV builds
* Drop the cross-vendor checks. It isn't possible to configure dom0 as cross-vendor, and anyone usingis_cpufreq_controller()without an exact model match has far bigger problems.
This already answers ...
Quoted 22 lines
Quoted 8 lines
xen/include/xen/sched.h +2
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{xen/include/xen/sched.h extern enum cpufreq_controller { · line 1083
Quoted 10 lines
xen/include/xen/sched.h +10
-0+/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* +* It would be far better to paravirtualise the interface. +*/ Would it be useful to add an assert here that the domain cpuid vendor and the BSP cpuid vendor match?
Quoted 1 line
Is it even possible to fake a different cpuid vendor for dom0?
... your question here.
Jan
Quoted 66 lines · Jan Beulich
Quoted 25 lines · Roger Pau Monné
Quoted 24 lines · Andrew Cooper
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to
MSR_IA32_PERF_CTL. However since commit322ec7c89f6the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.Additionally some HVM guests (Windows at least) will attempt to read
MSR_IA32_PERF_CTLand will panic if given back a #GP fault:vmx.c:3035:d8v0 RDMSR
0x00000199unimplemented
d8v0 VIRIDIAN CRASH: 3bc0000096fffff806871c1651ffffda02536837200Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to
MSR_IA32_PERF_CTLby such guest will already be silently dropped.Quoted 17 lines
Quoted 4 lines
Fixes 322ec7c89f6 ('x86/pv: disallow access to unknown MSRs')Fixes 84e848fd7a1 ('x86/hvm: disallow access to unknown MSRs')Signed-off-by Roger Pau Monné <[email protected]>Signed-off-by Andrew Cooper <[email protected]>Reviewed-by Roger Pau Monné <[email protected]>Quoted 11 lines
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Wei Liu <[email protected]>v2:
* fixis_cpufreq_controller()to exclude PVH dom0, and collapse to nothing in !CONFIG_PV builds
* Drop the cross-vendor checks. It isn't possible to configure dom0 as cross-vendor, and anyone usingis_cpufreq_controller()without an exact model match has far bigger problems.This already answers ...
Quoted 21 lines
Quoted 8 lines
xen/include/xen/sched.h +2
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{xen/include/xen/sched.h extern enum cpufreq_controller { · line 1083
Quoted 10 lines
xen/include/xen/sched.h +10
-0+/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* +* It would be far better to paravirtualise the interface. +*/ Would it be useful to add an assert here that the domain cpuid vendor and the BSP cpuid vendor match?
Quoted 2 lines
Quoted 1 line
Is it even possible to fake a different cpuid vendor for dom0?
... your question here.
Technically at the moment it is possible to configure a non-dom0 hardware domain as cross vendor, but anyone doing so can keep all the resulting pieces.
~Andrew
Quoted 24 lines · Andrew Cooper
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to
MSR_IA32_PERF_CTL. However since commit322ec7c89f6the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.Additionally some HVM guests (Windows at least) will attempt to read
MSR_IA32_PERF_CTLand will panic if given back a #GP fault:vmx.c:3035:d8v0 RDMSR
0x00000199unimplemented
d8v0 VIRIDIAN CRASH: 3bc0000096fffff806871c1651ffffda02536837200Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to
MSR_IA32_PERF_CTLby such guest will already be silently dropped.
Quoted 4 lines
Fixes 322ec7c89f6 ('x86/pv: disallow access to unknown MSRs')Fixes 84e848fd7a1 ('x86/hvm: disallow access to unknown MSRs')Signed-off-by Roger Pau Monné <[email protected]>Signed-off-by Andrew Cooper <[email protected]>
with a nit, a minor adjustment request, and a question:
xen/arch/x86/msr.c int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) · line 471
Quoted 6 lines
xen/arch/x86/msr.c +2
-0@@ -448,6 +467,21 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) goto gp_fault;break ; +/* +* This MSR are not enumerated in CPUID. It has been around since the
s/are/is/
Quoted 12 lines
xen/include/xen/sched.h +6
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{ +/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs.
xen/include/xen/sched.h extern enum cpufreq_controller { · line 1087
Quoted 10 lines
xen/include/xen/sched.h +10
-0+* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* +* It would be far better to paravirtualise the interface. +*/ +return (IS_ENABLED (CONFIG_PV ) && + (cpufreq_controller == FREQCTL_dom0_kernel) && +is_pv_domain (d) &&is_hardware_domain (d)); +}
IS_ENABLED(CONFIG_PV) is already part of is_pv_domain() and hence imo shouldn't be used explicitly here.
Also, this being an x86 concept, is it really a good idea to put in xen/sched.h? I guess this builds on Arm just because of DCE from the IS_ENABLED(CONFIG_PV) (where afaict the one in is_pv_domain() will still do). (But yes, I do realize that cpufreq_controller itself gets declared in this file, so maybe better to do some subsequent cleanup.)
Jan
Quoted 25 lines · Jan Beulich
Quoted 24 lines · Andrew Cooper
From: Roger Pau Monné <[email protected]>
Currently a PV hardware domain can also be given control over the CPU frequency, and such guest is allowed to write to
MSR_IA32_PERF_CTL. However since commit322ec7c89f6the default behavior has been changed to reject accesses to not explicitly handled MSRs, preventing PV guests that manage CPU frequency from reading MSR_IA32_PERF_{STATUS/CTL}.Additionally some HVM guests (Windows at least) will attempt to read
MSR_IA32_PERF_CTLand will panic if given back a #GP fault:vmx.c:3035:d8v0 RDMSR
0x00000199unimplemented
d8v0 VIRIDIAN CRASH: 3bc0000096fffff806871c1651ffffda02536837200Move the handling of MSR_IA32_PERF_{STATUS/CTL} to the common MSR handling shared between HVM and PV guests, and add an explicit case for reads to MSR_IA32_PERF_{STATUS/CTL}.
Restore previous behavior and allow PV guests with the required permissions to read the contents of the mentioned MSRs. Non privileged guests will get 0 when trying to read those registers, as writes to
MSR_IA32_PERF_CTLby such guest will already be silently dropped.
Quoted 5 lines
Quoted 4 lines
Fixes 322ec7c89f6 ('x86/pv: disallow access to unknown MSRs')Fixes 84e848fd7a1 ('x86/hvm: disallow access to unknown MSRs')Signed-off-by Roger Pau Monné <[email protected]>Signed-off-by Andrew Cooper <[email protected]>Reviewed-by Jan Beulich <[email protected]>
Thanks,
Quoted 9 lines
with a nit, a minor adjustment request, and a question:
xen/arch/x86/msr.c int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) · line 471
Quoted 6 lines
xen/arch/x86/msr.c +2
-0@@ -448,6 +467,21 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) goto gp_fault;break ; +/* +* This MSR are not enumerated in CPUID. It has been around since the s/are/is/
Oops, yes.
Quoted 17 lines
Quoted 17 lines
xen/include/xen/sched.h +10
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{ +/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +*
Quoted 8 lines
xen/include/xen/sched.h extern enum cpufreq_controller { · line 1087
Quoted 6 lines
xen/include/xen/sched.h +6
-0+* It would be far better to paravirtualise the interface. +*/ +return (IS_ENABLED (CONFIG_PV ) && + (cpufreq_controller == FREQCTL_dom0_kernel) && +is_pv_domain (d) &&is_hardware_domain (d)); +}
IS_ENABLED(CONFIG_PV)is already part ofis_pv_domain()and hence imo shouldn't be used explicitly here.
Ah yes. Will drop.
Quoted 6 lines
Also, this being an x86 concept, is it really a good idea to put in
xen/sched.h? I guess this builds on Arm just because of DCE from theIS_ENABLED(CONFIG_PV)(where afaict the one inis_pv_domain()will still do). (But yes, I do realize thatcpufreq_controlleritself gets declared in this file, so maybe better to do some subsequent cleanup.)
I can't spot anywhere obviously better for it to live. We don't have a common cpufreq.h, and I'm not sure that cpuidle.h is an appropriate place to live either.
Thanks,
~Andrew
Quoted 36 lines · Andrew Cooper
Quoted 17 lines · Jan Beulich
Quoted 16 lines · Andrew Cooper
xen/include/xen/sched.h +10
-0@@ -1069,6 +1069,23 @@ extern enum cpufreq_controller { FREQCTL_none, FREQCTL_dom0_kernel, FREQCTL_xen } cpufreq_controller; +static always_inline bool is_cpufreq_controller(const struct domain *d) +{ +/* +* A PV dom0 can be nominated as the cpufreq controller, instead of using +* Xen's cpufreq driver, at which point dom0 gets direct access to certain +* MSRs. +* +* This interface only works when dom0 is identity pinned and has the same +* number of vCPUs as pCPUs on the system. +* Quoted 8 lines
xen/include/xen/sched.h extern enum cpufreq_controller { · line 1087
Quoted 6 lines
xen/include/xen/sched.h +6
-0+* It would be far better to paravirtualise the interface. +*/ +return (IS_ENABLED (CONFIG_PV ) && + (cpufreq_controller == FREQCTL_dom0_kernel) && +is_pv_domain (d) &&is_hardware_domain (d)); +}
IS_ENABLED(CONFIG_PV)is already part ofis_pv_domain()and hence imo shouldn't be used explicitly here.Ah yes. Will drop.
Quoted 6 lines
Also, this being an x86 concept, is it really a good idea to put in
xen/sched.h? I guess this builds on Arm just because of DCE from theIS_ENABLED(CONFIG_PV)(where afaict the one inis_pv_domain()will still do). (But yes, I do realize thatcpufreq_controlleritself gets declared in this file, so maybe better to do some subsequent cleanup.)
Quoted 2 lines
I can't spot anywhere obviously better for it to live. We don't have a common
cpufreq.h,
Not the most obvious place for it to live at, butxen/include/acpi/cpufreq/cpufreq.h ?
Jan