diff options
author | Jesse Barnes <jesse.barnes@intel.com> | 2008-01-30 07:33:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:18 -0500 |
commit | 99fc8d424bc5d803fe92cad56c068fe64e73747a (patch) | |
tree | 983f615ed69b98c614f38b7240c343c9d7f9418d /arch/x86/kernel/cpu/mtrr/if.c | |
parent | 03252919b79891063cf99145612360efbdf9500b (diff) |
x86, 32-bit: trim memory not covered by wb mtrrs
On some machines, buggy BIOSes don't properly setup WB MTRRs to cover all
available RAM, meaning the last few megs (or even gigs) of memory will be
marked uncached. Since Linux tends to allocate from high memory addresses
first, this causes the machine to be unusably slow as soon as the kernel
starts really using memory (i.e. right around init time).
This patch works around the problem by scanning the MTRRs at boot and
figuring out whether the current end_pfn value (setup by early e820 code)
goes beyond the highest WB MTRR range, and if so, trimming it to match. A
fairly obnoxious KERN_WARNING is printed too, letting the user know that
not all of their memory is available due to a likely BIOS bug.
Something similar could be done on i386 if needed, but the boot ordering
would be slightly different, since the MTRR code on i386 depends on the
boot_cpu_data structure being setup.
This patch fixes a bug in the last patch that caused the code to run on
non-Intel machines (AMD machines apparently don't need it and it's untested
on other non-Intel machines, so best keep it off).
Further enhancements and fixes from:
Yinghai Lu <Yinghai.Lu@Sun.COM>
Andi Kleen <ak@suse.de>
Signed-off-by: Jesse Barnes <jesse.barnes@intel.com>
Tested-by: Justin Piszcz <jpiszcz@lucidpixels.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/if.c')
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/if.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c index 14535686c099..91e150acb46c 100644 --- a/arch/x86/kernel/cpu/mtrr/if.c +++ b/arch/x86/kernel/cpu/mtrr/if.c | |||
@@ -11,10 +11,6 @@ | |||
11 | #include <asm/mtrr.h> | 11 | #include <asm/mtrr.h> |
12 | #include "mtrr.h" | 12 | #include "mtrr.h" |
13 | 13 | ||
14 | /* RED-PEN: this is accessed without any locking */ | ||
15 | extern unsigned int *usage_table; | ||
16 | |||
17 | |||
18 | #define FILE_FCOUNT(f) (((struct seq_file *)((f)->private_data))->private) | 14 | #define FILE_FCOUNT(f) (((struct seq_file *)((f)->private_data))->private) |
19 | 15 | ||
20 | static const char *const mtrr_strings[MTRR_NUM_TYPES] = | 16 | static const char *const mtrr_strings[MTRR_NUM_TYPES] = |
@@ -397,7 +393,7 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset) | |||
397 | for (i = 0; i < max; i++) { | 393 | for (i = 0; i < max; i++) { |
398 | mtrr_if->get(i, &base, &size, &type); | 394 | mtrr_if->get(i, &base, &size, &type); |
399 | if (size == 0) | 395 | if (size == 0) |
400 | usage_table[i] = 0; | 396 | mtrr_usage_table[i] = 0; |
401 | else { | 397 | else { |
402 | if (size < (0x100000 >> PAGE_SHIFT)) { | 398 | if (size < (0x100000 >> PAGE_SHIFT)) { |
403 | /* less than 1MB */ | 399 | /* less than 1MB */ |
@@ -411,7 +407,7 @@ static int mtrr_seq_show(struct seq_file *seq, void *offset) | |||
411 | len += seq_printf(seq, | 407 | len += seq_printf(seq, |
412 | "reg%02i: base=0x%05lx000 (%4luMB), size=%4lu%cB: %s, count=%d\n", | 408 | "reg%02i: base=0x%05lx000 (%4luMB), size=%4lu%cB: %s, count=%d\n", |
413 | i, base, base >> (20 - PAGE_SHIFT), size, factor, | 409 | i, base, base >> (20 - PAGE_SHIFT), size, factor, |
414 | mtrr_attrib_to_str(type), usage_table[i]); | 410 | mtrr_attrib_to_str(type), mtrr_usage_table[i]); |
415 | } | 411 | } |
416 | } | 412 | } |
417 | return 0; | 413 | return 0; |