KVM: x86: Make the module parameter of vPMU more common
PATCH v2 1/1 KVM: x86: Make the module parameter of vPMU more common
From: Like Xu <[email protected]>
The new module parameter to control PMU virtualization should apply to Intel as well as AMD, for situations where userspace is not trusted. If the module parameter allows PMU virtualization, there could be a new KVM_CAP or guest CPUID bits whereby userspace can enable/disable PMU virtualization on a per-VM basis.
If the module parameter does not allow PMU virtualization, there should be no userspace override, since we have no precedent for authorizing that kind of override. If it's false, other counter-based profiling features (such as LBR including the associated CPUID bits if any) will not be exposed.
To keep "pmu" for the module param, e.g. same as ept, vpid, etc, a harmless wrapper interface is introduced, which also helps to distinguish the use of temporary variable with the same name.
---
v1 -> v2 Changelog:
- prefer we keep "pmu" for the module param; (Sean)
- move the definition of module_param into the context of pmu;
Previous:
https://lore.kernel.org/kvm/[email protected]/
arch/x86/kvm/cpuid.c | 6 +++--- arch/x86/kvm/pmu.c | 5 +++++ arch/x86/kvm/pmu.h | 8 ++++++++ arch/x86/kvm/svm/pmu.c | 2 +- arch/x86/kvm/svm/svm.c | 6 +----- arch/x86/kvm/svm/svm.h | 1 - arch/x86/kvm/vmx/capabilities.h | 4 ++++ arch/x86/kvm/vmx/pmu_intel.c | 2 +- 8 files changed, 23 insertions(+), 11 deletions(-)
arch/x86/kvm/cpuid.c +3 -3
@@ -770,10 +770,10 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)perf_get_x86_pmu_capability (&cap);/* -* Only support guest architectural pmu on a host -* with architectural pmu. +* The guest architecture pmu is only supported if the architecture +* pmu exists on the host and the module parameters allow it. */ -if (!cap.version) +if (!kvm_pmu_supported () || !cap.version)memset (&cap,0 ,sizeof (cap)); eax.split.version_id =min (cap.version,2 );
arch/x86/kvm/pmu.c +5 -0
@@ -19,6 +19,11 @@#include "lapic.h" #include "pmu.h" +/* Enable/disable PMU virtualization */ +bool __read_mostly pmu = true; +EXPORT_SYMBOL_GPL (pmu); +module_param (pmu, bool,0444 ); +/* This is enough to filter the vast majority of currently defined events. */ #define KVM_PMU_EVENT_FILTER_MAX_EVENTS 300
arch/x86/kvm/pmu.h +8 -0
@@ -41,6 +41,14 @@ struct kvm_pmu_ops {void (*cleanup)(struct kvm_vcpu *vcpu); }; +extern bool pmu; + +/* A wrapper interface to return the module parameter of the vPMU. */ +static inline bool kvm_pmu_supported (void ) +{ +return pmu; +} +static inline u64 pmc_bitmask (struct kvm_pmc *pmc) {struct kvm_pmu *pmu =pmc_to_pmu (pmc);
arch/x86/kvm/svm/pmu.c +1 -1
@@ -101,7 +101,7 @@ static inline struct kvm_pmc *get_gp_pmc_amd(struct kvm_pmu *pmu, u32 msr, {struct kvm_vcpu *vcpu =pmu_to_vcpu (pmu); -if (!pmu) +if (!kvm_pmu_supported ())return NULL ;switch (msr) {
arch/x86/kvm/svm/svm.c +1 -5
@@ -192,10 +192,6 @@ module_param(vgif, int, 0444);static int lbrv = true;module_param (lbrv, int,0444 ); -/* enable/disable PMU virtualization */ -bool pmu = true; -module_param (pmu, bool,0444 ); -static int tsc_scaling = true;module_param (tsc_scaling, int,0444 );
@@ -4712,7 +4708,7 @@ static __init int svm_hardware_setup(void)pr_info ("LBR virtualization supported\n" ); } -if (!pmu) +if (!kvm_pmu_supported ())pr_info ("PMU virtualization is disabled\n" );svm_set_cpu_caps ();
arch/x86/kvm/svm/svm.h +0 -1
@@ -32,7 +32,6 @@extern u32 msrpm_offsets[MSRPM_OFFSETS ]__read_mostly ;extern bool npt_enabled;extern bool intercept_smi; -extern bool pmu;/* * Clean bits in VMCB.
arch/x86/kvm/vmx/capabilities.h +4 -0
@@ -5,6 +5,7 @@#include <asm/vmx.h> #include "lapic.h" +#include "pmu.h" extern bool __read_mostly enable_vpid;extern bool __read_mostly flexpriority_enabled;
@@ -389,6 +390,9 @@ static inline u64 vmx_get_perf_capabilities(void) {u64 perf_cap =0 ; +if (!kvm_pmu_supported ()) +return perf_cap; +if (boot_cpu_has (X86_FEATURE_PDCM ))rdmsrl (MSR_IA32_PERF_CAPABILITIES , perf_cap);
arch/x86/kvm/vmx/pmu_intel.c +1 -1
@@ -487,7 +487,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->reserved_bits =0xffffffff00200000ull ; entry =kvm_find_cpuid_entry (vcpu,0xa ,0 ); -if (!entry) +if (!kvm_pmu_supported () || !entry)return ; eax.full = entry->eax; edx.full = entry->edx;
Signature · 1 line
2.33.1
Sean Christopherson
maintainerQuoted 3 lines · Like Xu
---
v1 -> v2 Changelog:
- prefer we keep "pmu" for the module param; (Sean)
...
arch/x86/kvm/pmu.c line 25
Quoted 4 lines
arch/x86/kvm/pmu.c +4
-0+/* Enable/disable PMU virtualization */ +bool __read_mostly pmu = true; +EXPORT_SYMBOL_GPL (pmu); +module_param (pmu, bool,0444 );
Sorry, I should have been more explicit. What I meant was this:
/* Enable/disable PMU virtualization */ bool __read_mostly enable_pmu = true; module_param_named(pmu, enable_pmu, bool, 0444);
That way KVM can use "enable_pmu" for all its checks, but the user only needs to type "pmu=?" when manipulating the module param.