[PATCH] [arch-x86] Allow SRAT integrity check to be skipped

Peter P Waskiewicz Jr
2010-09-01T21:26:37Z

On certain BIOSes, SRAT enumeration isn't exported correctly.
This leads to NUMA node enumeration failure, and causes the kernel
to fall back onto a single node treated as flat memory. This
can happen on large, multi-socket systems (4 or more sockets), and
becomes problematic for performance.

This patch adds a boot parameter to allow a kernel to be booted
with the option to skip the SRAT check. There are BIOSes in
production that have these failures, so this will allow people
in the field to work around these BIOS issues.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
---

Documentation/x86/x86_64/boot-options.txt | 4 ++++
arch/x86/mm/srat_64.c | 20 +++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 7fbbaf8..7863d9c 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -316,3 +316,7 @@ Miscellaneous
Do not use GB pages for kernel direct mappings.
gbpages
Use GB pages for kernel direct mappings.
+ sratbypassbios
+ If specified, will skip an SRAT check for PXM coverage
+ from BIOS enumeration. Only to be used on systems with
+ buggy BIOSes that munge the SRAT enumeration.
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index f9897f7..8719472 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -351,6 +351,15 @@ int __init acpi_get_nodes(struct bootnode *physnodes)
return ret;
}

+int srat_bypass_bios = 0;
+
+static int __init srat_bypass_bios_setup(char *str)
+{
+ srat_bypass_bios = 1;
+ return 0;
+}
+early_param("sratbypassbios", srat_bypass_bios_setup);
+
/* Use the information discovered above to actually set up the nodes. */
int __init acpi_scan_nodes(unsigned long start, unsigned long end)
{
@@ -425,9 +434,14 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
nodes[i].end >> PAGE_SHIFT);
/* for out of order entries in SRAT */
sort_node_map();
- if (!nodes_cover_memory(nodes)) {
- bad_srat();
- return -1;
+ if (!srat_bypass_bios) {
+ if (!nodes_cover_memory(nodes)) {
+ bad_srat();
+ return -1;
+ }
+ } else {
+ printk(KERN_INFO
+ "SRAT: Bypassing NUMA sanity check...bad BIOS...\n");
}

/* Account for nodes with cpus and no memory */