From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753314AbcHALiP (ORCPT ); Mon, 1 Aug 2016 07:38:15 -0400 Received: from mx2.suse.de ([195.135.220.15]:50171 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753271AbcHALiI (ORCPT ); Mon, 1 Aug 2016 07:38:08 -0400 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, tglx@linutronix.de, hpa@zytor.com, Juergen Gross Subject: [PATCH] x86/events: modify error message in virtualized environment Date: Mon, 1 Aug 2016 13:37:07 +0200 Message-Id: <1470051427-16795-1-git-send-email-jgross@suse.com> X-Mailer: git-send-email 2.6.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/x86/events/core.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index c17f0de..ba1335d 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; } -- 2.6.6