[PATCH] x86, mce: therm_throt: don't log redundant normality

[PATCH] x86, mce: therm_throt: don't log redundant normality

[Hugh Dickins]

Hi Dmitry,

I'm delighted to find your 0d01f31439c1e4d602bf9fdc924ab66f407f5e38
"x86, mce: therm_throt - change when we print messages" in rc6:
thank you.

I too had been annoyed by "critical" CPU1 Temperature/speed normal
messages, with no indication that anything had been abnormal: after
resume on a Fujitsu-Siemens Esprimo Mobile (whereas startup decided
the Duo's CPU0 Thermal monitoring would be handled by SMI not by MCE).

I hadn't reported it yet, because I couldn't quite work out what to do
about it: your patch looks good, so long as someone else doesn't have
a machine which jumps between throttled and unthrottled too quickly.

But could we add one more thing on top of your patch?  Though it no
longer keeps announcing "I am normal", can we please also get rid
of the accompanying "Machine check events logged" message too?
If the non-event isn't worth showing (I agree that it isn't),
then I think it's not worth logging either.

Hugh


[PATCH] x86, mce: therm_throt - don't log redundant normality

0d01f31439c1e4d602bf9fdc924ab66f407f5e38 "x86, mce: therm_throt -
change when we print messages" removed redundant announcements of
"Temperature/speed normal".  They're not worth logging either:
remove their accompanying "Machine check events logged" messages.

Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
---

 arch/x86/kernel/cpu/mcheck/therm_throt.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--- 2.6.31-rc6/arch/x86/kernel/cpu/mcheck/therm_throt.c	2009-08-14 09:34:06.000000000 +0100
+++ linux/arch/x86/kernel/cpu/mcheck/therm_throt.c	2009-08-14 13:22:07.000000000 +0100
@@ -116,11 +116,14 @@ static int therm_throt_process(int curr)
 		       cpu, __get_cpu_var(thermal_throttle_count));
 
 		add_taint(TAINT_MACHINE_CHECK);
-	} else if (was_throttled) {
+		return 1;
+	}
+	if (was_throttled) {
 		printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
+		return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 #ifdef CONFIG_SYSFS

Re: [PATCH] x86, mce: therm_throt: don't log redundant normality

[Ingo Molnar]

* Hugh Dickins <hugh.dickins@tiscali.co.uk> wrote:

> Hi Dmitry,
> 
> I'm delighted to find your 
> 0d01f31439c1e4d602bf9fdc924ab66f407f5e38 "x86, mce: therm_throt - 
> change when we print messages" in rc6: thank you.
> 
> I too had been annoyed by "critical" CPU1 Temperature/speed normal 
> messages, with no indication that anything had been abnormal: 
> after resume on a Fujitsu-Siemens Esprimo Mobile (whereas startup 
> decided the Duo's CPU0 Thermal monitoring would be handled by SMI 
> not by MCE).
> 
> I hadn't reported it yet, because I couldn't quite work out what 
> to do about it: your patch looks good, so long as someone else 
> doesn't have a machine which jumps between throttled and 
> unthrottled too quickly.
> 
> But could we add one more thing on top of your patch?  Though it 
> no longer keeps announcing "I am normal", can we please also get 
> rid of the accompanying "Machine check events logged" message too? 
> If the non-event isn't worth showing (I agree that it isn't), then 
> I think it's not worth logging either.

Yeah, makes sense - i've queued it up, thanks Hugh!

	Ingo

[tip:x86/urgent] x86, mce: therm_throt: Don't log redundant normality

[tip-bot for Hugh Dickins]

Commit-ID:  4e5c25d405e18a2f279ca2bfc855508ec3a0186b
Gitweb:     http://git.kernel.org/tip/4e5c25d405e18a2f279ca2bfc855508ec3a0186b
Author:     Hugh Dickins <hugh.dickins@tiscali.co.uk>
AuthorDate: Sun, 16 Aug 2009 15:54:37 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 16 Aug 2009 17:25:41 +0200

x86, mce: therm_throt: Don't log redundant normality

0d01f31439c1e4d602bf9fdc924ab66f407f5e38 "x86, mce: therm_throt
- change when we print messages" removed redundant
announcements of "Temperature/speed normal".

They're not worth logging and remove their accompanying
"Machine check events logged" messages as well from the
console.

Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Dmitry Torokhov <dtor@mail.ru>
LKML-Reference: <Pine.LNX.4.64.0908161544100.7929@sister.anvils>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/kernel/cpu/mcheck/therm_throt.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 8bc64cf..5957a93 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -116,11 +116,14 @@ static int therm_throt_process(int curr)
 		       cpu, __get_cpu_var(thermal_throttle_count));
 
 		add_taint(TAINT_MACHINE_CHECK);
-	} else if (was_throttled) {
+		return 1;
+	}
+	if (was_throttled) {
 		printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
+		return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 #ifdef CONFIG_SYSFS