Commit-ID: 646e29a1789a3a936871008c15199c50367bf291
Gitweb: http://git.kernel.org/tip/646e29a1789a3a936871008c15199c50367bf291
Author: Borislav Petkov
AuthorDate: Fri, 27 Sep 2013 16:35:54 +0200
Committer: Ingo Molnar
CommitDate: Sat, 28 Sep 2013 10:10:26 +0200
x86: Improve the printout of the SMP bootup CPU table
As the new x86 CPU bootup printout format code maintainer, I am
taking immediate action to improve and clean (and thus indulge
my OCD) the reporting of the cores when coming up online.
Fix padding to a right-hand alignment, cleanup code and bind
reporting width to the max number of supported CPUs on the
system, like this:
[0.074509] smpboot: Booting Node 0, Processors: #1 #2 #3 #4 #5
#6 #7 OK
[0.644008] smpboot: Booting Node 1, Processors: #8 #9 #10 #11 #12 #13
#14 #15 OK
[1.245006] smpboot: Booting Node 2, Processors: #16 #17 #18 #19 #20 #21
#22 #23 OK
[1.864005] smpboot: Booting Node 3, Processors: #24 #25 #26 #27 #28 #29
#30 #31 OK
[2.489005] smpboot: Booting Node 4, Processors: #32 #33 #34 #35 #36 #37
#38 #39 OK
[3.093005] smpboot: Booting Node 5, Processors: #40 #41 #42 #43 #44 #45
#46 #47 OK
[3.698005] smpboot: Booting Node 6, Processors: #48 #49 #50 #51 #52 #53
#54 #55 OK
[4.304005] smpboot: Booting Node 7, Processors: #56 #57 #58 #59 #60 #61
#62 #63 OK
[4.961413] Brought up 64 CPUs
and this:
[0.072367] smpboot: Booting Node 0, Processors:#1 #2 #3 #4 #5 #6 #7
OK
[0.686329] Brought up 8 CPUs
Signed-off-by: Borislav Petkov
Cc: Libin
Cc: wangyij...@huawei.com
Cc: fenghua...@intel.com
Cc: guohan...@huawei.com
Cc: paul.gortma...@windriver.com
Link: http://lkml.kernel.org/r/20130927143554.gf4...@pd.tnic
Signed-off-by: Ingo Molnar
---
arch/x86/include/asm/misc.h | 6 ++
arch/x86/kernel/smpboot.c | 21 +++--
arch/x86/lib/Makefile | 2 +-
arch/x86/lib/misc.c | 11 +++
4 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/misc.h b/arch/x86/include/asm/misc.h
new file mode 100644
index 000..475f5bb
--- /dev/null
+++ b/arch/x86/include/asm/misc.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_X86_MISC_H
+#define _ASM_X86_MISC_H
+
+int num_digits(int val);
+
+#endif /* _ASM_X86_MISC_H */
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 6cacab6..d41f3ba 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -73,11 +73,10 @@
#include
#include
#include
-
#include
#include
-
#include
+#include
/* State of each CPU */
DEFINE_PER_CPU(int, cpu_state) = { 0 };
@@ -653,17 +652,27 @@ static void announce_cpu(int cpu, int apicid)
{
static int current_node = -1;
int node = early_cpu_to_node(cpu);
- int max_cpu_present = find_last_bit(cpumask_bits(cpu_present_mask),
NR_CPUS);
+ static int width;
+
+ if (!width)
+ width = num_digits(num_possible_cpus()) + 1; /* + '#' sign */
if (system_state == SYSTEM_BOOTING) {
if (node != current_node) {
if (current_node > (-1))
pr_cont(" OK\n");
current_node = node;
- pr_info("Booting Node %3d, Processors ", node);
+ pr_info("Booting Node %3d, Processors:", node);
}
- pr_cont(" #%4d%s", cpu, cpu == max_cpu_present ? " OK\n" : "");
- return;
+
+ /* Add padding for the BSP */
+ if (cpu == 1)
+ pr_cont("%*s", width + 1, " ");
+
+ pr_cont("%*s#%d", width - num_digits(cpu), " ", cpu);
+
+ if (cpu == num_present_cpus() - 1)
+ pr_cont(" OK\n");
} else
pr_info("Booting Node %d Processor %d APIC 0x%x\n",
node, cpu, apicid);
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 96b2c66..992d63b 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -16,7 +16,7 @@ clean-files := inat-tables.c
obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o
-lib-y := delay.o
+lib-y := delay.o misc.o
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
diff --git a/arch/x86/lib/misc.c b/arch/x86/lib/misc.c
new file mode 100644
index 000..bc35cde
--- /dev/null
+++ b/arch/x86/lib/misc.c
@@ -0,0 +1,11 @@
+int num_digits(int val)
+{
+ int digits = 0;
+
+ while (val) {
+ val /= 10;
+ digits++;
+ }
+
+ return digits;
+}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
