From: Xie XiuQi <xiexiuqi@huawei.com>
To: Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@suse.de>,
Ingo Molnar <mingo@elte.hu>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Li Bin <huawei.libin@huawei.com>
Subject: [PATCH v2][TRIVIAL] x86/smpboot: fix cpu bootup message
Date: Mon, 23 Dec 2013 16:33:00 +0800 [thread overview]
Message-ID: <52B7F53C.5020001@huawei.com> (raw)
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
v2:
- fix a typo
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
---
arch/x86/kernel/smpboot.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 85dc05a..9e82c1e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -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, " ");
+ padding = 1;
+ }
+ }
pr_cont("%*s#%d", width - num_digits(cpu), " ", cpu);
--
1.8.2.2
next reply other threads:[~2013-12-23 8:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-23 8:33 Xie XiuQi [this message]
2013-12-23 13:34 ` [PATCH v2][TRIVIAL] x86/smpboot: fix cpu bootup message Borislav Petkov
2013-12-24 1:09 ` Xie XiuQi
2013-12-24 1:34 ` Yinghai Lu
2013-12-24 3:52 ` Xie XiuQi
2013-12-24 6:09 ` Yinghai Lu
2013-12-24 10:35 ` Borislav Petkov
2013-12-24 18:30 ` Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52B7F53C.5020001@huawei.com \
--to=xiexiuqi@huawei.com \
--cc=bp@suse.de \
--cc=huawei.libin@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.