David Rientjes wrote:
On Fri, 18 Feb 2011, Mike Travis wrote:
Minimize X2APIC messages by printing 8 per line and dropping
the "enabled" flag since that's assumed. It will still print
"disabled" if necessary.
v2: updated to apply to x86-tip
For each patch in this series, it would be tremendously helpful to show
what format the current output is in and what the format is after the
patch is applied.
Will do. I actually did think about this, as seeing a huge amount
of console output is a relatively rare occurrence... ;-)
Signed-off-by: Mike Travis <travis@xxxxxxx>
Reviewed-by: Jack Steiner <steiner@xxxxxxx>
Reviewed-by: Robin Holt <holt@xxxxxxx>
---
arch/x86/kernel/acpi/boot.c | 3 +++
drivers/acpi/tables.c | 16 +++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
--- linux.orig/arch/x86/kernel/acpi/boot.c
+++ linux/arch/x86/kernel/acpi/boot.c
@@ -903,6 +903,9 @@ static int __init acpi_parse_madt_lapic_
if (!count) {
x2count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_X2APIC,
acpi_parse_x2apic, MAX_LOCAL_APIC);
+ /* insure trailing newline is output */
s/insure/ensure/
Oops. ;-)
+ pr_cont("\n");
I know that this is the only code that passes ACPI_MADT_TYPE_LOCAL_X2APIC.
That said, this line really has no place in the caller.
x2apic is probably the only type of system that can grow so large as to
need worrying about overflowing the log buffer. That said, there is
logic in printk() to add a missing '\n'. Should I just rely on that
and leave this out?
+
count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC,
acpi_parse_lapic, MAX_LOCAL_APIC);
}
--- linux.orig/drivers/acpi/tables.c
+++ linux/drivers/acpi/tables.c
@@ -66,11 +66,17 @@ void acpi_table_print_madt_entry(struct
{
struct acpi_madt_local_x2apic *p =
(struct acpi_madt_local_x2apic *)header;
- printk(KERN_INFO PREFIX
- "X2APIC (apic_id[0x%02x] uid[0x%02x] %s)\n",
- p->local_apic_id, p->uid,
- (p->lapic_flags & ACPI_MADT_ENABLED) ?
- "enabled" : "disabled");
+
+ if ((p->uid & 7) == 0)
+ pr_info(PREFIX "X2APIC apic_id=uid:");
+
+ pr_cont(" %02x=%02x%s%s",
+ p->local_apic_id, p->uid,
+ /* assume "enabled" unless "disabled" */
+ (p->lapic_flags & ACPI_MADT_ENABLED) ?
+ "" : " disabled",
Because you're printing only " disabled" when ACPI_MADT_ENABLED is not
set, this seems like the format of the line would be ambiguous with regard
to which entry it applies to. I could imagine a line such as
X2APIC apic_id=uid: 01=01 disabled 02=02
and then we're left wondering which entry is actually disabled. I'd
prefer "01=01(disabled) 02=02" instead.
Yes, thanks. That does make more sense.
Also, why did you drop the "0x" prefixes from the current format?
With 4096 cores that removes 8k bytes from the log buffer. Do we really
need the 0x everywhere? At what point does the context imply hex?
+ /* nl every 8th item */
+ (p->uid & 7) == 7 ? "\n" : "");
}
break;
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
