mirror of
https://abf.rosa.ru/djam/kernel-xen.git
synced 2025-02-23 07:42:46 +00:00
91 lines
3.3 KiB
Diff
91 lines
3.3 KiB
Diff
|
From: Mike Travis <travis@sgi.com>
|
||
|
|
Subject: x86: Limit the number of processor bootup messages
|
||
|
|
References: bnc#564618, FATE#306952
|
||
|
|
Patch-mainline: 2.6.33-rc1
|
||
|
|
Git-commit: 2eaad1fddd7450a48ad464229775f97fbfe8af36
|
||
|
|
|
||
|
|
When there are a large number of processors in a system, there
|
||
|
|
is an excessive amount of messages sent to the system console.
|
||
|
|
It's estimated that with 4096 processors in a system, and the
|
||
|
|
console baudrate set to 56K, the startup messages will take
|
||
|
|
about 84 minutes to clear the serial port.
|
||
|
|
|
||
|
|
This set of patches limits the number of repetitious messages
|
||
|
|
which contain no additional information. Much of this information
|
||
|
|
is obtainable from the /proc and /sysfs. Some of the messages
|
||
|
|
are also sent to the kernel log buffer as KERN_DEBUG messages so
|
||
|
|
dmesg can be used to examine more closely any details specific to
|
||
|
|
a problem.
|
||
|
|
|
||
|
|
The new cpu bootup sequence for system_state == SYSTEM_BOOTING:
|
||
|
|
|
||
|
|
Booting Node 0, Processors #1 #2 #3 #4 #5 #6 #7 Ok.
|
||
|
|
Booting Node 1, Processors #8 #9 #10 #11 #12 #13 #14 #15 Ok.
|
||
|
|
...
|
||
|
|
Booting Node 3, Processors #56 #57 #58 #59 #60 #61 #62 #63 Ok.
|
||
|
|
Brought up 64 CPUs
|
||
|
|
|
||
|
|
After the system is running, a single line boot message is displayed
|
||
|
|
when CPU's are hotplugged on:
|
||
|
|
|
||
|
|
Booting Node %d Processor %d APIC 0x%x
|
||
|
|
|
||
|
|
Status of the following lines:
|
||
|
|
|
||
|
|
CPU: Physical Processor ID: printed once (for boot cpu)
|
||
|
|
CPU: Processor Core ID: printed once (for boot cpu)
|
||
|
|
CPU: Hyper-Threading is disabled printed once (for boot cpu)
|
||
|
|
CPU: Thermal monitoring enabled printed once (for boot cpu)
|
||
|
|
CPU %d/0x%x -> Node %d: removed
|
||
|
|
CPU %d is now offline: only if system_state == RUNNING
|
||
|
|
Initializing CPU#%d: KERN_DEBUG
|
||
|
|
|
||
|
|
Signed-off-by: Mike Travis <travis@sgi.com>
|
||
|
|
LKML-Reference: <4B219E28.8080601@sgi.com>
|
||
|
|
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
|
||
|
|
Signed-off-by: Rafael J. Wysocki <rjw@suse.de>
|
||
|
|
Automatically created from "patches.arch/x86-Limit-the-number-of-processor-bootup-messages.patch" by xen-port-patches.py
|
||
|
|
|
||
|
|
--- head-2010-01-18.orig/arch/x86/kernel/cpu/common-xen.c 2010-01-18 17:05:23.000000000 +0100
|
||
|
|
+++ head-2010-01-18/arch/x86/kernel/cpu/common-xen.c 2010-01-18 17:05:30.000000000 +0100
|
||
|
|
@@ -455,6 +455,7 @@ void __cpuinit detect_ht(struct cpuinfo_
|
||
|
|
#ifdef CONFIG_X86_HT
|
||
|
|
u32 eax, ebx, ecx, edx;
|
||
|
|
int index_msb, core_bits;
|
||
|
|
+ static bool printed;
|
||
|
|
|
||
|
|
if (!cpu_has(c, X86_FEATURE_HT))
|
||
|
|
return;
|
||
|
|
@@ -470,7 +471,7 @@ void __cpuinit detect_ht(struct cpuinfo_
|
||
|
|
smp_num_siblings = (ebx & 0xff0000) >> 16;
|
||
|
|
|
||
|
|
if (smp_num_siblings == 1) {
|
||
|
|
- printk(KERN_INFO "CPU: Hyper-Threading is disabled\n");
|
||
|
|
+ printk_once(KERN_INFO "CPU0: Hyper-Threading is disabled\n");
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -497,11 +498,12 @@ void __cpuinit detect_ht(struct cpuinfo_
|
||
|
|
((1 << core_bits) - 1);
|
||
|
|
|
||
|
|
out:
|
||
|
|
- if ((c->x86_max_cores * smp_num_siblings) > 1) {
|
||
|
|
+ if (!printed && (c->x86_max_cores * smp_num_siblings) > 1) {
|
||
|
|
printk(KERN_INFO "CPU: Physical Processor ID: %d\n",
|
||
|
|
c->phys_proc_id);
|
||
|
|
printk(KERN_INFO "CPU: Processor Core ID: %d\n",
|
||
|
|
c->cpu_core_id);
|
||
|
|
+ printed = 1;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
@@ -1172,7 +1174,7 @@ void __cpuinit cpu_init(void)
|
||
|
|
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask))
|
||
|
|
panic("CPU#%d already initialized!\n", cpu);
|
||
|
|
|
||
|
|
- printk(KERN_INFO "Initializing CPU#%d\n", cpu);
|
||
|
|
+ pr_debug("Initializing CPU#%d\n", cpu);
|
||
|
|
|
||
|
|
clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
|
||
|
|
|