diff options
| author | Andy Lutomirski <luto@kernel.org> | 2016-08-10 05:29:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-11 07:53:07 -0400 |
| commit | 5bc653b7318217c54244a14f248f1f07abe0a865 (patch) | |
| tree | 2d736ed2f7519619f426348f880a36188440b74e /arch/x86/platform/efi/quirks.c | |
| parent | 5ff3e2c3c3eebe13967d81ad1f23b9468fefea81 (diff) | |
x86/efi: Allocate a trampoline if needed in efi_free_boot_services()
On my Dell XPS 13 9350 with firmware 1.4.4 and SGX on, if I boot
Fedora 24's grub2-efi off a hard disk, my first 1MB of RAM looks
like:
efi: mem00: [Runtime Data |RUN| | | | | | | |WB|WT|WC|UC] range=[0x0000000000000000-0x0000000000000fff] (0MB)
efi: mem01: [Boot Data | | | | | | | | |WB|WT|WC|UC] range=[0x0000000000001000-0x0000000000027fff] (0MB)
efi: mem02: [Loader Data | | | | | | | | |WB|WT|WC|UC] range=[0x0000000000028000-0x0000000000029fff] (0MB)
efi: mem03: [Reserved | | | | | | | | |WB|WT|WC|UC] range=[0x000000000002a000-0x000000000002bfff] (0MB)
efi: mem04: [Runtime Data |RUN| | | | | | | |WB|WT|WC|UC] range=[0x000000000002c000-0x000000000002cfff] (0MB)
efi: mem05: [Loader Data | | | | | | | | |WB|WT|WC|UC] range=[0x000000000002d000-0x000000000002dfff] (0MB)
efi: mem06: [Conventional Memory| | | | | | | | |WB|WT|WC|UC] range=[0x000000000002e000-0x0000000000057fff] (0MB)
efi: mem07: [Reserved | | | | | | | | |WB|WT|WC|UC] range=[0x0000000000058000-0x0000000000058fff] (0MB)
efi: mem08: [Conventional Memory| | | | | | | | |WB|WT|WC|UC] range=[0x0000000000059000-0x000000000009ffff] (0MB)
My EBDA is at 0x2c000, which blocks off everything from 0x2c000 and
up, and my trampoline is 0x6000 bytes (6 pages), so it doesn't fit
in the loader data range at 0x28000.
Without this patch, it panics due to a failure to allocate the
trampoline. With this patch, it works:
[ +0.001744] Base memory trampoline at [ffff880000001000] 1000 size 24576
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mario Limonciello <mario_limonciello@dell.com>
Cc: Matt Fleming <mfleming@suse.de>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/998c77b3bf709f3dfed85cb30701ed1a5d8a438b.1470821230.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform/efi/quirks.c')
| -rw-r--r-- | arch/x86/platform/efi/quirks.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 4480c06cade7..89d1146f5a6f 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c | |||
| @@ -254,6 +254,7 @@ void __init efi_free_boot_services(void) | |||
| 254 | for_each_efi_memory_desc(md) { | 254 | for_each_efi_memory_desc(md) { |
| 255 | unsigned long long start = md->phys_addr; | 255 | unsigned long long start = md->phys_addr; |
| 256 | unsigned long long size = md->num_pages << EFI_PAGE_SHIFT; | 256 | unsigned long long size = md->num_pages << EFI_PAGE_SHIFT; |
| 257 | size_t rm_size; | ||
| 257 | 258 | ||
| 258 | if (md->type != EFI_BOOT_SERVICES_CODE && | 259 | if (md->type != EFI_BOOT_SERVICES_CODE && |
| 259 | md->type != EFI_BOOT_SERVICES_DATA) | 260 | md->type != EFI_BOOT_SERVICES_DATA) |
| @@ -263,6 +264,26 @@ void __init efi_free_boot_services(void) | |||
| 263 | if (md->attribute & EFI_MEMORY_RUNTIME) | 264 | if (md->attribute & EFI_MEMORY_RUNTIME) |
| 264 | continue; | 265 | continue; |
| 265 | 266 | ||
| 267 | /* | ||
| 268 | * Nasty quirk: if all sub-1MB memory is used for boot | ||
| 269 | * services, we can get here without having allocated the | ||
| 270 | * real mode trampoline. It's too late to hand boot services | ||
| 271 | * memory back to the memblock allocator, so instead | ||
| 272 | * try to manually allocate the trampoline if needed. | ||
| 273 | * | ||
| 274 | * I've seen this on a Dell XPS 13 9350 with firmware | ||
| 275 | * 1.4.4 with SGX enabled booting Linux via Fedora 24's | ||
| 276 | * grub2-efi on a hard disk. (And no, I don't know why | ||
| 277 | * this happened, but Linux should still try to boot rather | ||
| 278 | * panicing early.) | ||
| 279 | */ | ||
| 280 | rm_size = real_mode_size_needed(); | ||
| 281 | if (rm_size && (start + rm_size) < (1<<20) && size >= rm_size) { | ||
| 282 | set_real_mode_mem(start, rm_size); | ||
| 283 | start += rm_size; | ||
| 284 | size -= rm_size; | ||
| 285 | } | ||
| 286 | |||
| 266 | free_bootmem_late(start, size); | 287 | free_bootmem_late(start, size); |
| 267 | } | 288 | } |
| 268 | 289 | ||