Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/boot: Rework reserve_real_mode() to allow multiple tries

If reserve_real_mode() fails, panicing immediately means we're
doomed. Make it safe to try more than once to allocate the
trampoline:

- Degrade a failure from panic() to pr_info(). (If we make it to
setup_real_mode() without reserving the trampoline, we'll panic
them.)

- Factor out helpers so that platform code can supply a specific
address to try.

- Warn if reserve_real_mode() is called after we're done with the
memblock allocator. If that were to happen, we would behave
unpredictably.

Signed-off-by: Andy Lutomirski <luto@kernel.org>
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/876e383038f3e9971aa72fd20a4f5da05f9d193d.1470821230.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Andy Lutomirski and committed by
Ingo Molnar
5ff3e2c3 d0de0f68

+33 -11
+9
arch/x86/include/asm/realmode.h
··· 58 58 extern unsigned char secondary_startup_64[]; 59 59 #endif 60 60 61 + static inline size_t real_mode_size_needed(void) 62 + { 63 + if (real_mode_header) 64 + return 0; /* already allocated. */ 65 + 66 + return ALIGN(real_mode_blob_end - real_mode_blob, PAGE_SIZE); 67 + } 68 + 69 + void set_real_mode_mem(phys_addr_t mem, size_t size); 61 70 void reserve_real_mode(void); 62 71 63 72 #endif /* _ARCH_X86_REALMODE_H */
+24 -11
arch/x86/realmode/init.c
··· 1 1 #include <linux/io.h> 2 + #include <linux/slab.h> 2 3 #include <linux/memblock.h> 3 4 4 5 #include <asm/cacheflush.h> ··· 13 12 /* Hold the pgd entry used on booting additional CPUs */ 14 13 pgd_t trampoline_pgd_entry; 15 14 16 - void __init reserve_real_mode(void) 15 + void __init set_real_mode_mem(phys_addr_t mem, size_t size) 17 16 { 18 - phys_addr_t mem; 19 - unsigned char *base; 20 - size_t size = PAGE_ALIGN(real_mode_blob_end - real_mode_blob); 17 + void *base = __va(mem); 21 18 22 - /* Has to be under 1M so we can execute real-mode AP code. */ 23 - mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE); 24 - if (!mem) 25 - panic("Cannot allocate trampoline\n"); 26 - 27 - base = __va(mem); 28 - memblock_reserve(mem, size); 29 19 real_mode_header = (struct real_mode_header *) base; 30 20 printk(KERN_DEBUG "Base memory trampoline at [%p] %llx size %zu\n", 31 21 base, (unsigned long long)mem, size); 22 + } 23 + 24 + void __init reserve_real_mode(void) 25 + { 26 + phys_addr_t mem; 27 + size_t size = real_mode_size_needed(); 28 + 29 + if (!size) 30 + return; 31 + 32 + WARN_ON(slab_is_available()); 33 + 34 + /* Has to be under 1M so we can execute real-mode AP code. */ 35 + mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE); 36 + if (!mem) { 37 + pr_info("No sub-1M memory is available for the trampoline\n"); 38 + return; 39 + } 40 + 41 + memblock_reserve(mem, size); 42 + set_real_mode_mem(mem, size); 32 43 } 33 44 34 45 static void __init setup_real_mode(void)