From: Juergen Gross Date: Mon, 1 Aug 2016 11:37:07 +0000 (+0200) Subject: perf/x86: Modify error message in virtualized environment X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=005bd0077a79c4bcfe64e7331b275e12f742093f;p=openwrt%2Fstaging%2Fblogic.git 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 Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: acme@kernel.org Link: http://lkml.kernel.org/r/1470051427-16795-1-git-send-email-jgross@suse.com Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index c17f0de5fd39..ba1335d16529 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -262,10 +262,13 @@ static bool check_hw_exists(void) return true; msr_fail: - 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, - reg, val_new); + 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"); + pr_err("Failed to access perfctr msr (MSR %x is %Lx)\n", + reg, val_new); + } return false; }