Messages in this thread Patch in this message | | | From | Borislav Petkov <> | Subject | [PATCH] x86/rapl: Do not load in a guest | Date | Thu, 3 Dec 2015 19:27:02 +0100 |
| |
From: Borislav Petkov <bp@suse.de>
qemu/kvm doesn't support RAPL and RAPL doesn't have a CPUID feature bit so check whether we're in a guest instead.
Reported-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jacob Pan <jacob.jun.pan@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 3 +++ drivers/powercap/intel_rapl.c | 3 +++ 2 files changed, 6 insertions(+)
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c index ed446bdcbf31..bc60bc1118b4 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c @@ -711,6 +711,9 @@ static int __init rapl_pmu_init(void) struct x86_pmu_quirk *quirk; int i; + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) + return 0; + /* * check for Intel processor family 6 */ diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index cc97f0869791..297a9b5074e2 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -1511,6 +1511,9 @@ static int __init rapl_init(void) int ret = 0; const struct x86_cpu_id *id; + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) + return -ENODEV; + id = x86_match_cpu(rapl_ids); if (!id) { pr_err("driver does not support CPU family %d model %d\n", -- 2.3.5
| |