[Xen-changelog] [xen stable-4.4] x86/mce: don't spam the console with "CPUx: Temperature z"

[patchbot@xxxxxxx]

commit 5c952a54260402447fc65d7cf07fcb3a6e62e9db
Author:     Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
AuthorDate: Tue Jun 24 09:40:56 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Jun 24 09:40:56 2014 +0200

    x86/mce: don't spam the console with "CPUx: Temperature z"
    
    If the machine has been quite busy it ends up with these messages
    printed on the hypervisor console:
    
    (XEN) CPU3: Temperature/speed normal
    (XEN) CPU1: Temperature/speed normal
    (XEN) CPU0: Temperature/speed normal
    (XEN) CPU1: Temperature/speed normal
    (XEN) CPU0: Temperature/speed normal
    (XEN) CPU2: Temperature/speed normal
    (XEN) CPU3: Temperature/speed normal
    (XEN) CPU0: Temperature/speed normal
    (XEN) CPU2: Temperature/speed normal
    (XEN) CPU3: Temperature/speed normal
    (XEN) CPU1: Temperature/speed normal
    (XEN) CPU0: Temperature above threshold
    (XEN) CPU0: Running in modulated clock mode
    (XEN) CPU1: Temperature/speed normal
    (XEN) CPU2: Temperature/speed normal
    (XEN) CPU3: Temperature/speed normal
    
    While the state changes are important, the non-altered state
    information is not needed. As such add a latch mechanism to only print
    the information if it has changed since the last update (and the
    hardware doesn't properly suppress redundant notifications).
    
    This was observed on Intel DQ67SW,
    BIOS SWQ6710H.86A.0066.2012.1105.1504 11/05/2012
    
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Christoph Egger <chegger@xxxxxxxxx>
    master commit: 323338f86fb6cd6f6dba4f59a84eed71b3552d21
    master date: 2014-06-16 11:59:32 +0200
---
 xen/arch/x86/cpu/mcheck/mce_intel.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c 
b/xen/arch/x86/cpu/mcheck/mce_intel.c
index b32fdb2..5b93870 100644
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c
@@ -49,11 +49,15 @@ static int __read_mostly nr_intel_ext_msrs;
 #define INTEL_SRAR_INSTR_FETCH 0x150
 
 #ifdef CONFIG_X86_MCE_THERMAL
+#define MCE_RING                0x1
+static DEFINE_PER_CPU(int, last_state);
+
 static void intel_thermal_interrupt(struct cpu_user_regs *regs)
 {
     uint64_t msr_content;
     unsigned int cpu = smp_processor_id();
     static DEFINE_PER_CPU(s_time_t, next);
+    int *this_last_state;
 
     ack_APIC_irq();
 
@@ -62,13 +66,17 @@ static void intel_thermal_interrupt(struct cpu_user_regs 
*regs)
 
     per_cpu(next, cpu) = NOW() + MILLISECS(5000);
     rdmsrl(MSR_IA32_THERM_STATUS, msr_content);
-    if (msr_content & 0x1) {
-        printk(KERN_EMERG "CPU%d: Temperature above threshold\n", cpu);
-        printk(KERN_EMERG "CPU%d: Running in modulated clock mode\n",
-                cpu);
+    this_last_state = &per_cpu(last_state, cpu);
+    if ( *this_last_state == (msr_content & MCE_RING) )
+        return;
+    *this_last_state = msr_content & MCE_RING;
+    if ( msr_content & MCE_RING )
+    {
+        printk(KERN_EMERG "CPU%u: Temperature above threshold\n", cpu);
+        printk(KERN_EMERG "CPU%u: Running in modulated clock mode\n", cpu);
         add_taint(TAINT_MACHINE_CHECK);
     } else {
-        printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
+        printk(KERN_INFO "CPU%u: Temperature/speed normal\n", cpu);
     }
 }
 
@@ -802,6 +810,7 @@ static int cpu_mcabank_alloc(unsigned int cpu)
 
     per_cpu(no_cmci_banks, cpu) = cmci;
     per_cpu(mce_banks_owned, cpu) = owned;
+    per_cpu(last_state, cpu) = -1;
 
     return 0;
 out:
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.4

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog