From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: hpa@zytor.com, linux-kernel@vger.kernel.org,
huawei.libin@huawei.com, wangyijing@huawei.com,
fenghua.yu@intel.com, tglx@linutronix.de, guohanjun@huawei.com,
paul.gortmaker@windriver.com, linux-tip-commits@vger.kernel.org
Subject: Re: [PATCH -v1.1] x86, boot: Further compress CPUs bootup message
Date: Sat, 28 Sep 2013 21:15:00 +0200 [thread overview]
Message-ID: <20130928191500.GG5956@pd.tnic> (raw)
In-Reply-To: <20130928181236.GA4999@gmail.com>
On Sat, Sep 28, 2013 at 08:12:36PM +0200, Ingo Molnar wrote:
>
> * Borislav Petkov <bp@alien8.de> wrote:
>
> > - pr_info("Booting Node %3d, Processors:", node);
> > + printk(KERN_INFO ".... node #%3d, CPUs: ", node);
>
> I think this should use %*s# and num_digits(node) as well?
How's that:
[ 0.073380] x86: Booting SMP configuration:
[ 0.074005] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7
[ 0.603005] .... node #1, CPUs: #8 #9 #10 #11 #12 #13 #14 #15
[ 1.200005] .... node #2, CPUs: #16 #17 #18 #19 #20 #21 #22 #23
[ 1.796005] .... node #3, CPUs: #24 #25 #26 #27 #28 #29 #30 #31
[ 2.393005] .... node #4, CPUs: #32 #33 #34 #35 #36 #37 #38 #39
[ 2.996005] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47
[ 3.600005] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55
[ 4.202005] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63
[ 4.811005] .... node #8, CPUs: #64 #65 #66 #67 #68 #69 #70 #71
[ 5.421006] .... node #9, CPUs: #72 #73 #74 #75 #76 #77 #78 #79
[ 6.032005] .... node #10, CPUs: #80 #81 #82 #83 #84 #85 #86 #87
[ 6.648006] .... node #11, CPUs: #88 #89 #90 #91 #92 #93 #94 #95
[ 7.262005] .... node #12, CPUs: #96 #97 #98 #99 #100 #101 #102 #103
[ 7.865005] .... node #13, CPUs: #104 #105 #106 #107 #108 #109 #110 #111
[ 8.466005] .... node #14, CPUs: #112 #113 #114 #115 #116 #117 #118 #119
[ 9.073006] .... node #15, CPUs: #120 #121 #122 #123 #124 #125 #126 #127
[ 9.679901] x86: Booted up 16 nodes, 128 CPUs
?
Btw, num_digits() needed to handle the val==0 case :)
---
From: Borislav Petkov <bp@suse.de>
Date: Sat, 28 Sep 2013 19:37:18 +0200
Subject: [PATCH -v1.2] x86, boot: Further compress CPUs bootup message
Turn it into (for example):
[ 0.073380] x86: Booting SMP configuration:
[ 0.074005] .... node #0, CPUs: #1 #2 #3 #4 #5 #6 #7
[ 0.603005] .... node #1, CPUs: #8 #9 #10 #11 #12 #13 #14 #15
[ 1.200005] .... node #2, CPUs: #16 #17 #18 #19 #20 #21 #22 #23
[ 1.796005] .... node #3, CPUs: #24 #25 #26 #27 #28 #29 #30 #31
[ 2.393005] .... node #4, CPUs: #32 #33 #34 #35 #36 #37 #38 #39
[ 2.996005] .... node #5, CPUs: #40 #41 #42 #43 #44 #45 #46 #47
[ 3.600005] .... node #6, CPUs: #48 #49 #50 #51 #52 #53 #54 #55
[ 4.202005] .... node #7, CPUs: #56 #57 #58 #59 #60 #61 #62 #63
[ 4.811005] .... node #8, CPUs: #64 #65 #66 #67 #68 #69 #70 #71
[ 5.421006] .... node #9, CPUs: #72 #73 #74 #75 #76 #77 #78 #79
[ 6.032005] .... node #10, CPUs: #80 #81 #82 #83 #84 #85 #86 #87
[ 6.648006] .... node #11, CPUs: #88 #89 #90 #91 #92 #93 #94 #95
[ 7.262005] .... node #12, CPUs: #96 #97 #98 #99 #100 #101 #102 #103
[ 7.865005] .... node #13, CPUs: #104 #105 #106 #107 #108 #109 #110 #111
[ 8.466005] .... node #14, CPUs: #112 #113 #114 #115 #116 #117 #118 #119
[ 9.073006] .... node #15, CPUs: #120 #121 #122 #123 #124 #125 #126 #127
[ 9.679901] x86: Booted up 16 nodes, 128 CPUs
and drop useless elements.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/smpboot.c | 24 +++++++++++++++++++-----
arch/x86/lib/misc.c | 4 ++++
kernel/smp.c | 7 ++++++-
3 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index d41f3ba26ced..2a165580fa16 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -647,22 +647,38 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
return (send_status | accept_status);
}
+void smp_announce(void)
+{
+ int num_nodes = num_online_nodes();
+
+ printk(KERN_INFO "x86: Booted up %d node%s, %d CPUs\n",
+ num_nodes, (num_nodes > 1 ? "s" : ""), num_online_cpus());
+}
+
/* reduce the number of lines printed when booting a large cpu count system */
static void announce_cpu(int cpu, int apicid)
{
static int current_node = -1;
int node = early_cpu_to_node(cpu);
- static int width;
+ static int width, node_width;
if (!width)
width = num_digits(num_possible_cpus()) + 1; /* + '#' sign */
+ if (!node_width)
+ node_width = num_digits(num_possible_nodes()) + 1; /* + '#' */
+
+ if (cpu == 1)
+ printk(KERN_INFO "x86: Booting SMP configuration:\n");
+
if (system_state == SYSTEM_BOOTING) {
if (node != current_node) {
if (current_node > (-1))
- pr_cont(" OK\n");
+ pr_cont("\n");
current_node = node;
- pr_info("Booting Node %3d, Processors:", node);
+
+ printk(KERN_INFO ".... node %*s#%d, CPUs: ",
+ node_width - num_digits(node), " ", node);
}
/* Add padding for the BSP */
@@ -671,8 +687,6 @@ static void announce_cpu(int cpu, int apicid)
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/misc.c b/arch/x86/lib/misc.c
index bc35cde9769f..0325603c6fd5 100644
--- a/arch/x86/lib/misc.c
+++ b/arch/x86/lib/misc.c
@@ -2,6 +2,10 @@ int num_digits(int val)
{
int digits = 0;
+ /* Handle special case */
+ if (!val)
+ return 1;
+
while (val) {
val /= 10;
digits++;
diff --git a/kernel/smp.c b/kernel/smp.c
index 0564571dcdf7..f5768b0c816a 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -524,6 +524,11 @@ void __init setup_nr_cpu_ids(void)
nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
}
+void __weak smp_announce(void)
+{
+ printk(KERN_INFO "Brought up %d CPUs\n", num_online_cpus());
+}
+
/* Called by boot processor to activate the rest. */
void __init smp_init(void)
{
@@ -540,7 +545,7 @@ void __init smp_init(void)
}
/* Any cleanup work */
- printk(KERN_INFO "Brought up %ld CPUs\n", (long)num_online_cpus());
+ smp_announce();
smp_cpus_done(setup_max_cpus);
}
--
1.8.4
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
next prev parent reply other threads:[~2013-09-28 19:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 10:57 [PATCH] x86, smpboot: fix announce_cpu() to print the last OK Libin
2013-09-05 17:52 ` [tip:x86/urgent] x86/smpboot: Fix announce_cpu() to printk() the last "OK" properly tip-bot for Libin
2013-09-25 10:07 ` Borislav Petkov
2013-09-25 18:29 ` Ingo Molnar
2013-09-26 23:15 ` Borislav Petkov
2013-09-27 6:51 ` Ingo Molnar
2013-09-27 10:38 ` Borislav Petkov
2013-09-27 14:32 ` Borislav Petkov
2013-09-27 14:34 ` [PATCH 1/2] x86, alternatives: Drop ancient lockdep fixup message Borislav Petkov
2013-09-28 8:28 ` [tip:core/locking] lockdep, x86/alternatives: " tip-bot for Borislav Petkov
2013-09-27 14:35 ` [PATCH 2/2] x86: Cleanup boot CPUs table Borislav Petkov
2013-09-28 8:25 ` Ingo Molnar
2013-09-28 10:23 ` Borislav Petkov
2013-09-28 13:44 ` Ingo Molnar
2013-09-28 17:47 ` [PATCH] x86, boot: Further compress CPUs bootup message Borislav Petkov
2013-09-28 17:54 ` Ingo Molnar
2013-09-28 18:04 ` [PATCH -v1.1] " Borislav Petkov
2013-09-28 18:12 ` Ingo Molnar
2013-09-28 19:15 ` Borislav Petkov [this message]
2013-09-28 19:25 ` Ingo Molnar
2013-09-28 19:36 ` [PATCH -v1.3] " Borislav Petkov
2013-09-28 19:42 ` [PATCH -v1.1] " H. Peter Anvin
2013-09-28 19:49 ` Borislav Petkov
2013-09-28 19:54 ` Borislav Petkov
2013-09-28 19:58 ` Ingo Molnar
2013-09-28 20:08 ` Borislav Petkov
2013-09-28 23:13 ` H. Peter Anvin
2013-09-29 9:14 ` Borislav Petkov
2013-09-29 15:17 ` [PATCH -v1.4] " Borislav Petkov
2013-09-29 15:44 ` [PATCH -v1.1] " H. Peter Anvin
2013-09-30 6:28 ` Ingo Molnar
2013-09-30 9:56 ` Borislav Petkov
2013-10-01 8:53 ` Ingo Molnar
2013-10-01 9:10 ` [tip:x86/boot] x86/boot: " tip-bot for Borislav Petkov
2013-10-02 11:52 ` Peter Zijlstra
2013-10-02 12:18 ` Ingo Molnar
2013-10-02 12:20 ` Peter Zijlstra
2013-10-02 13:55 ` Borislav Petkov
2013-09-28 19:58 ` [PATCH -v1.1] x86, boot: " Ingo Molnar
2013-09-28 20:10 ` Borislav Petkov
2013-09-29 5:10 ` H. Peter Anvin
2013-09-29 2:55 ` [PATCH 2/2] x86: Cleanup boot CPUs table Mike Galbraith
2013-09-28 8:28 ` [tip:x86/boot] x86: Improve the printout of the SMP bootup CPU table tip-bot for Borislav Petkov
2013-09-29 4:25 ` Yinghai Lu
2013-09-27 12:48 ` [tip:x86/urgent] x86/smpboot: Fix announce_cpu() to printk() the last "OK" properly Borislav Petkov
2013-09-27 13:33 ` Ingo Molnar
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=20130928191500.GG5956@pd.tnic \
--to=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=guohanjun@huawei.com \
--cc=hpa@zytor.com \
--cc=huawei.libin@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tglx@linutronix.de \
--cc=wangyijing@huawei.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.