Commit 005bd007 authored Aug 01, 2016 by Juergen Gross Committed by Ingo Molnar Aug 01, 2016

perf/x86: Modify error message in virtualized environment



It is known that PMU isn't working in some virtualized environments.

Modify the message issued in that case to mention why hardware PMU
isn't usable instead of reporting it to be broken.

As a side effect this will correct a little bug in the error message:
The error message was meant to be either of level err or info
depending on the environment (native or virtualized). As the level is
taken from the format string and not the printed string, specifying
it via %s and a conditional argument didn't work the way intended.

Signed-off-by: Juergen Gross <jgross@suse.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: acme@kernel.org
Link: http://lkml.kernel.org/r/1470051427-16795-1-git-send-email-jgross@suse.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent d761f3ed

arch/x86/events/core.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -262,10 +262,13 @@ static bool check_hw_exists(void)
		return true;

		msr_fail:
		if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
		pr_cont("PMU not available due to virtualization, using software events only.\n");
		} else {
		pr_cont("Broken PMU hardware detected, using software events only.\n");
		printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
		boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,
		pr_err("Failed to access perfctr msr (MSR %x is %Lx)\n",
		reg, val_new);
		}

		return false;
		}

Admin message