From: Mike Travis <travis@sgi.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>, Len Brown <len.brown@intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Jack Steiner <steiner@sgi.com>, Robin Holt <holt@sgi.com>,
Lori Gilbertson <loriann@sgi.com>,
x86@kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] x86: Minimize SRAT messages
Date: Fri, 21 Jan 2011 14:25:07 -0600 [thread overview]
Message-ID: <20110121202504.354385643@gulag1.americas.sgi.com> (raw)
In-Reply-To: <20110121202502.090169599@gulag1.americas.sgi.com>
[-- Attachment #1: minimize-srat-msgs --]
[-- Type: text/plain, Size: 2100 bytes --]
Condense the SRAT: messages to show all APIC id's for the
node on a single line.
v1: Added pertinent __init & __initdata specifiers.
Signed-off-by: Mike Travis <travis@sgi.com>
Reviewed-by: Jack Steiner <steiner@sgi.com>
Reviewed-by: Robin Holt <holt@sgi.com>
---
arch/x86/mm/srat_64.c | 16 ++++++++++++----
drivers/acpi/numa.c | 3 +++
2 files changed, 15 insertions(+), 4 deletions(-)
--- linux-2.6.32.orig/arch/x86/mm/srat_64.c
+++ linux-2.6.32/arch/x86/mm/srat_64.c
@@ -115,6 +115,7 @@ acpi_numa_x2apic_affinity_init(struct ac
{
int pxm, node;
int apic_id;
+ static int __initdata last_node = -1, last_pxm = -1;
if (srat_disabled())
return;
@@ -136,8 +137,16 @@ acpi_numa_x2apic_affinity_init(struct ac
apicid_to_node[apic_id] = node;
node_set(node, cpu_nodes_parsed);
acpi_numa = 1;
- printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
- pxm, apic_id, node);
+ if (node != last_node) {
+ pr_info("SRAT: Node %u: PXM:APIC %u:%u",
+ node, pxm, apic_id);
+ last_node = node;
+ last_pxm = pxm;
+ } else if (pxm != last_pxm) {
+ pr_cont(" %u:%u", pxm, apic_id);
+ last_pxm = pxm;
+ } else
+ pr_cont(" :%u", apic_id);
}
/* Callback for Proximity Domain -> LAPIC mapping */
@@ -294,8 +303,7 @@ acpi_numa_memory_affinity_init(struct ac
nd->end = end;
}
- printk(KERN_INFO "SRAT: Node %u PXM %u %lx-%lx\n", node, pxm,
- start, end);
+ pr_info("SRAT: Node %u PXM %u %lx+%lx\n", node, pxm, start, end-start);
e820_register_active_regions(node, start >> PAGE_SHIFT,
end >> PAGE_SHIFT);
--- linux-2.6.32.orig/drivers/acpi/numa.c
+++ linux-2.6.32/drivers/acpi/numa.c
@@ -290,6 +290,9 @@ int __init acpi_numa_init(void)
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY,
acpi_parse_x2apic_affinity, NR_CPUS);
+ /* insure trailing newline is output */
+ pr_cont("\n");
+
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
acpi_parse_processor_affinity, NR_CPUS);
acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
--
next prev parent reply other threads:[~2011-01-21 20:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-21 20:25 [PATCH 0/6] init: Shrink early messages to prevent overflowing the kernel log buffer Mike Travis
2011-01-21 20:25 ` [PATCH 1/6] printk: Allocate kernel log buffer earlier v1 Mike Travis
2011-01-21 20:25 ` [PATCH 2/6] ACPI: Minimize X2APIC initial messages Mike Travis
2011-01-21 20:25 ` [PATCH 3/6] x86: Minimize initial Bootmem messages Mike Travis
2011-01-21 20:25 ` [PATCH 4/6] x86: Minimize initial e820 messages Mike Travis
2011-01-21 20:25 ` Mike Travis [this message]
2011-01-21 20:25 ` [PATCH 6/6] printk: Minimize time zero output Mike Travis
-- strict thread matches above, loose matches on Subject: below --
2011-01-19 23:01 [PATCH 0/6] init: Shrink early messages to prevent overflowing the kernel log buffer Mike Travis
2011-01-19 23:01 ` [PATCH 5/6] x86: Minimize SRAT messages Mike Travis
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=20110121202504.354385643@gulag1.americas.sgi.com \
--to=travis@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=holt@sgi.com \
--cc=hpa@zytor.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=loriann@sgi.com \
--cc=mingo@elte.hu \
--cc=steiner@sgi.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®