Commit 4732f244 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86: Making the module parameter of vPMU more common 



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.

Change its name from "pmu" to "enable_pmu" as we have temporary
variables with the same name in our code like "struct kvm_pmu *pmu".

Fixes: b1d66dad ("KVM: x86/svm: Add module param to control PMU virtualization")
Suggested-by : Jim Mattson <jmattson@google.com>
Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Message-Id: <20220111073823.21885-1-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ecebb966

arch/x86/kvm/cpuid.c

+3 −3
Original line number Diff line number Diff line
@@ -845,10 +845,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 (!cap.version || !enable_pmu)

			memset(&cap, 0, sizeof(cap));



		eax.split.version_id = min(cap.version, 2);

arch/x86/kvm/svm/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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 (!enable_pmu)

		return NULL;



	switch (msr) {

arch/x86/kvm/svm/svm.c

+2 −6
Original line number Diff line number Diff line
@@ -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);
@@ -957,7 +953,7 @@ static __init void svm_set_cpu_caps(void) 
		kvm_cpu_cap_set(X86_FEATURE_VIRT_SSBD);



	/* AMD PMU PERFCTR_CORE CPUID */

	if (pmu && boot_cpu_has(X86_FEATURE_PERFCTR_CORE))

	if (enable_pmu && boot_cpu_has(X86_FEATURE_PERFCTR_CORE))

		kvm_cpu_cap_set(X86_FEATURE_PERFCTR_CORE);



	/* CPUID 0x8000001F (SME/SEV features) */
@@ -1093,7 +1089,7 @@ static __init int svm_hardware_setup(void) 
			pr_info("LBR virtualization supported\n");

	}



	if (!pmu)

	if (!enable_pmu)

		pr_info("PMU virtualization is disabled\n");



	svm_set_cpu_caps();

arch/x86/kvm/svm/svm.h

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <asm/vmx.h>



#include "lapic.h"

#include "x86.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 (!enable_pmu)

		return perf_cap;



	if (boot_cpu_has(X86_FEATURE_PDCM))

		rdmsrl(MSR_IA32_PERF_CAPABILITIES, perf_cap);