x86/smpboot: fix cpu bootup message
PATCH 1/1 x86/smpboot: fix cpu bootup message
When CPU0 and CPU1 aren't in same package, we got message like this:
[ 0.995698] x86: Booting SMP configuration: [ 0.999858] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7 #8 [ 1.201584] .... node #1, CPUs: #9 #10 #11 #12 #13 #14 #15 #16 [ 1.402525] .... node #2, CPUs: #17 #18 #19 #20 #21 #22 #23 #24 [ 1.603620] .... node #3, CPUs: #25 #26 #27 #28 #29 #30 #31 #32 [ 1.804226] .... node #4, CPUs: #33 #34 #35 #36 #37 #38 #39 [ 1.914040] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47 [ 2.115568] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55 [ 2.316541] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63 [ 2.517030] x86: Booted up 8 nodes, 64 CPUs
My box's configuration as below:
xiexiuqi@localhost:~> lscpu
[...]
NUMA node0 CPU(s): 1-8 NUMA node1 CPU(s): 9-16 NUMA node2 CPU(s): 17-24 NUMA node3 CPU(s): 25-32 NUMA node4 CPU(s): 0,33-39 NUMA node5 CPU(s): 40-47 NUMA node6 CPU(s): 48-55 NUMA node7 CPU(s): 56-63
With this patch, we'll get message like this:
[ 0.995698] x86: Booting SMP configuration: [ 0.999858] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7 #8 [ 1.201584] .... node #1, CPUs: #9 #10 #11 #12 #13 #14 #15 #16 [ 1.402525] .... node #2, CPUs: #17 #18 #19 #20 #21 #22 #23 #24 [ 1.603620] .... node #3, CPUs: #25 #26 #27 #28 #29 #30 #31 #32 [ 1.804226] .... node #4, CPUs: #33 #34 #35 #36 #37 #38 #39 [ 1.914040] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47 [ 2.115568] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55 [ 2.316541] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63 [ 2.517030] x86: Booted up 8 nodes, 64 CPUs
Signed-off-by Xie XiuQi <[email protected]>
--- arch/x86/kernel/smpboot.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/x86/kernel/smpboot.c +7 -5
@@ -639,7 +639,7 @@ static void announce_cpu(int cpu, int apicid) {static int current_node =-1 ;int node =early_cpu_to_node (cpu); -static int width, node_width; +static int width, node_width, padding;if (!width) width =num_digits (num_possible_cpus ()) +1 ;/* + '#' sign */
@@ -658,11 +658,13 @@ static void announce_cpu(int cpu, int apicid)printk (KERN_INFO ".... node %*s#%d, CPUs: " , node_width -num_digits (node)," " , node); - } -/* Add padding for the BSP */ -if (cpu ==1 ) -pr_cont ("%*s" , width +1 ," " ); +/* Add padding for the BSP */ +if (!padding && (early_cpu_to_node (0 ) == current_node)) { +pr_cont ("%*s" , width +1 ," " ); + boot_padding =1 ; + } + }pr_cont ("%*s#%d" , width -num_digits (cpu)," " , cpu);
Signature · 1 line
1.8.2.2
Sorry, this patch has a typo, please ignore it. I'll send a new version soon.
Quoted 75 lines · Xie XiuQi
When CPU0 and CPU1 aren't in same package, we got message like this:
[ 0.995698] x86: Booting SMP configuration: [ 0.999858] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7 #8 [ 1.201584] .... node #1, CPUs: #9 #10 #11 #12 #13 #14 #15 #16 [ 1.402525] .... node #2, CPUs: #17 #18 #19 #20 #21 #22 #23 #24 [ 1.603620] .... node #3, CPUs: #25 #26 #27 #28 #29 #30 #31 #32 [ 1.804226] .... node #4, CPUs: #33 #34 #35 #36 #37 #38 #39 [ 1.914040] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47 [ 2.115568] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55 [ 2.316541] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63 [ 2.517030] x86: Booted up 8 nodes, 64 CPUsMy box's configuration as below:
xiexiuqi@localhost:~> lscpu
[...]NUMA node0 CPU(s): 1-8 NUMA node1 CPU(s): 9-16 NUMA node2 CPU(s): 17-24 NUMA node3 CPU(s): 25-32 NUMA node4 CPU(s): 0,33-39 NUMA node5 CPU(s): 40-47 NUMA node6 CPU(s): 48-55 NUMA node7 CPU(s): 56-63With this patch, we'll get message like this:
[ 0.995698] x86: Booting SMP configuration: [ 0.999858] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7 #8 [ 1.201584] .... node #1, CPUs: #9 #10 #11 #12 #13 #14 #15 #16 [ 1.402525] .... node #2, CPUs: #17 #18 #19 #20 #21 #22 #23 #24 [ 1.603620] .... node #3, CPUs: #25 #26 #27 #28 #29 #30 #31 #32 [ 1.804226] .... node #4, CPUs: #33 #34 #35 #36 #37 #38 #39 [ 1.914040] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47 [ 2.115568] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55 [ 2.316541] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63 [ 2.517030] x86: Booted up 8 nodes, 64 CPUsSigned-off-by Xie XiuQi <[email protected]>--- arch/x86/kernel/smpboot.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)arch/x86/kernel/smpboot.c +7
-5@@ -639,7 +639,7 @@ static void announce_cpu(int cpu, int apicid) {static int current_node =-1 ;int node =early_cpu_to_node (cpu); -static int width, node_width; +static int width, node_width, padding;if (!width) width =num_digits (num_possible_cpus ()) +1 ;/* + '#' sign */ @@ -658,11 +658,13 @@ static void announce_cpu(int cpu, int apicid)printk (KERN_INFO ".... node %*s#%d, CPUs: " , node_width -num_digits (node)," " , node); - } -/* Add padding for the BSP */ -if (cpu ==1 ) -pr_cont ("%*s" , width +1 ," " ); +/* Add padding for the BSP */ +if (!padding && (early_cpu_to_node (0 ) == current_node)) { +pr_cont ("%*s" , width +1 ," " ); + boot_padding =1 ; + } + }pr_cont ("%*s#%d" , width -num_digits (cpu)," " , cpu);