From: Peter Zijlstra <peterz@infradead.org>
To: Andy Lutomirski <luto@amacapital.net>
Cc: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org,
tglx@linutronix.de, wei@redhat.com, acme@kernel.org,
linux-tip-commits@vger.kernel.org
Subject: Re: [tip:perf/core] perf/x86: Tone down kernel messages when the PMU check fails in a virtual environment
Date: Tue, 7 Oct 2014 14:47:58 +0200 [thread overview]
Message-ID: <20141007124757.GH19379@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <5433053F.6020507@amacapital.net>
On Mon, Oct 06, 2014 at 02:10:23PM -0700, Andy Lutomirski wrote:
> On 10/02/2014 10:28 PM, tip-bot for Wei Huang wrote:
> > msr_fail:
> > printk(KERN_CONT "Broken PMU hardware detected, using software events only.\n");
> > - printk(KERN_ERR "Failed to access perfctr msr (MSR %x is %Lx)\n", reg, val_new);
> > + printk(boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR
> > + "Failed to access perfctr msr (MSR %x is %Lx)\n", reg, val_new);
> >
>
> This is bogus. String concatenation doesn't work like that.
>
> Try "%sFailed...", boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_ERR :
> KERN_INFO), etc.
Haha, indeed. The hypervisor message is empty in this case. Wei, test
this much? ;-)
---
Subject: perf: Fix bogus kernel printk
Andy spotted the fail in what was intended as a conditional printk
level.
Fixes: cc6cd47e7395 ("perf/x86: Tone down kernel messages when the PMU check fails in a virtual environment")
Reported-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
arch/x86/kernel/cpu/perf_event.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -243,8 +243,9 @@ static bool check_hw_exists(void)
msr_fail:
printk(KERN_CONT "Broken PMU hardware detected, using software events only.\n");
- printk(boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR
- "Failed to access perfctr msr (MSR %x is %Lx)\n", reg, val_new);
+ printk("%sFailed to access perfctr msr (MSR %x is %Lx)\n",
+ boot_cpu_has(X86_FEATURE_HYPERVISOR) ? KERN_INFO : KERN_ERR,
+ reg, val_new);
return false;
}
next prev parent reply other threads:[~2014-10-07 12:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 3:55 [PATCH 1/1] perf/x86: Use KERN_INFO when checking PMU fails on virtual environment Wei Huang
2014-09-30 4:19 ` Wei Huang
2014-10-03 5:28 ` [tip:perf/core] perf/x86: Tone down kernel messages when the PMU check fails in a " tip-bot for Wei Huang
2014-10-06 21:10 ` Andy Lutomirski
2014-10-07 12:47 ` Peter Zijlstra [this message]
2014-10-28 11:08 ` [tip:perf/urgent] perf: Fix bogus kernel printk tip-bot for Peter Zijlstra (Intel)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141007124757.GH19379@twins.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=acme@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=wei@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).