Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755988AbZJ2Djd (ORCPT ); Wed, 28 Oct 2009 23:39:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755422AbZJ2Djc (ORCPT ); Wed, 28 Oct 2009 23:39:32 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:41782 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbZJ2Djb (ORCPT ); Wed, 28 Oct 2009 23:39:31 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Message-ID: <4AE90E43.2030709@jp.fujitsu.com> Date: Thu, 29 Oct 2009 12:38:43 +0900 From: Hidetoshi Seto User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: linux-kernel@vger.kernel.org, x86@kernel.org CC: Andi Kleen , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Mike Travis , Roland Dreier Subject: [PATCH] x86, mce: short output of MCE banks ownership information Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3266 Lines: 103 The output of MCE banks ownership information on boot tend to be long on new processor which has many banks: CPU 1 MCA banks SHD:0 SHD:1 CMCI:2 CMCI:3 CMCI:5 SHD:6 SHD:7 SHD:8 SHD:9 SHD:12 SHD:13 SHD:14 SHD:15 SHD:16 SHD:17 SHD:18 SHD:19 SHD:20 SHD:21 This patch changes this message to shorter format, in lower message level (KERN_INFO -> KERN_DEBUG), and replace "MCA" by "MCE": CPU 1 MCE banks map: ssCC PCss ssPP ssss ssss ss where: s: shared, C: checked by CMCI, P: checked by poll. (NOTE: This patch still use old format on the output when ownership is updated, e.g. a cpu take over the ownership from hot-removed cpu. CPU 1 MCE banks map updated: CMCI:6 CMCI:7 CMCI:10 CMCI:11 CPU 1 MCE banks map: ssCC PCCC ssPP ssCC ssss ss ) Signed-off-by: Hidetoshi Seto --- arch/x86/kernel/cpu/mcheck/mce_intel.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c index 7c78563..2b4c78b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_intel.c +++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c @@ -64,12 +64,25 @@ static void intel_threshold_interrupt(void) mce_notify_irq(); } +static void print_banks_map(int banks) +{ + int i; + + pr_debug("CPU %d MCE banks map:", smp_processor_id()); + for (i = 0; i < banks; i++) { + pr_cont("%s%s", (i % 4) ? "" : " ", + test_bit(i, __get_cpu_var(mce_banks_owned)) ? "C" : + test_bit(i, __get_cpu_var(mce_poll_banks)) ? "P" : "s"); + } + pr_cont("\n"); +} + static void print_update(char *type, int *hdr, int num) { if (*hdr == 0) - printk(KERN_INFO "CPU %d MCA banks", smp_processor_id()); + pr_debug("CPU %d MCE banks map updated:", smp_processor_id()); *hdr = 1; - printk(KERN_CONT " %s:%d", type, num); + pr_cont(" %s:%d", type, num); } /* @@ -85,6 +98,7 @@ static void cmci_discover(int banks, int boot) int i; spin_lock_irqsave(&cmci_discover_lock, flags); + for (i = 0; i < banks; i++) { u64 val; @@ -95,7 +109,7 @@ static void cmci_discover(int banks, int boot) /* Already owned by someone else? */ if (val & CMCI_EN) { - if (test_and_clear_bit(i, owned) || boot) + if (test_and_clear_bit(i, owned) && !boot) print_update("SHD", &hdr, i); __clear_bit(i, __get_cpu_var(mce_poll_banks)); continue; @@ -107,16 +121,19 @@ static void cmci_discover(int banks, int boot) /* Did the enable bit stick? -- the bank supports CMCI */ if (val & CMCI_EN) { - if (!test_and_set_bit(i, owned) || boot) + if (!test_and_set_bit(i, owned) && !boot) print_update("CMCI", &hdr, i); __clear_bit(i, __get_cpu_var(mce_poll_banks)); } else { WARN_ON(!test_bit(i, __get_cpu_var(mce_poll_banks))); } } - spin_unlock_irqrestore(&cmci_discover_lock, flags); if (hdr) - printk(KERN_CONT "\n"); + pr_cont("\n"); + if (boot || hdr) + print_banks_map(banks); + + spin_unlock_irqrestore(&cmci_discover_lock, flags); } /* -- 1.6.5.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/