x86-32, mm: Add an initial page table for core bootstrapping
Subsystems (4)
Borislav Petkov
maintainerPATCH RESEND 1/1 x86-32, mm: Add an initial page table for core bootstrapping
This patch adds an initial page table with low mappings used exclusively for booting APs/resuming after ACPI suspend/machine restart. After this, there's no need to add low mappings to swapper_pg_dir and zap them later or create own swsusp PGD page solely for ACPI sleep needs - we have the initial page table for that.
[ v1.1 Fix suspend-to-ram ]
Signed-off-by Borislav Petkov <[email protected]>
---
Ok, I've been running this on a 32-bit Atom machine for a while now and everything looks fine, all suspend modes work so this could be right time to put it into the -tip mix for a wider audience :)
arch/x86/include/asm/pgtable_32.h | 2 +- arch/x86/include/asm/tlbflush.h | 2 - arch/x86/include/asm/trampoline.h | 3 -- arch/x86/kernel/acpi/sleep.c | 7 ++++- arch/x86/kernel/head32.c | 1 + arch/x86/kernel/head_32.S | 55 +++++++++++++++++-------------------- arch/x86/kernel/reboot.c | 10 +----- arch/x86/kernel/setup.c | 18 +++++++++++- arch/x86/kernel/smpboot.c | 19 ++++--------- arch/x86/kernel/trampoline.c | 16 ----------- arch/x86/mm/init_32.c | 45 ------------------------------ 11 files changed, 58 insertions(+), 120 deletions(-)
arch/x86/include/asm/pgtable_32.h +1 -1
@@ -26,7 +26,7 @@ struct mm_struct;struct vm_area_struct ;extern pgd_t swapper_pg_dir[1024 ]; -extern pgd_t trampoline_pg_dir[1024 ]; +extern pgd_t initial_page_table[1024 ];static inline void pgtable_cache_init (void ) { }static inline void check_pgt_cache (void ) { }
arch/x86/include/asm/tlbflush.h +0 -2
@@ -172,6 +172,4 @@ static inline void flush_tlb_kernel_range(unsigned long start, flush_tlb_all(); } -extern void zap_low_mappings (bool early); -#endif /* _ASM_X86_TLBFLUSH_H */
arch/x86/include/asm/trampoline.h +0 -3
@@ -13,16 +13,13 @@ extern unsigned char *trampoline_base;extern unsigned long init_rsp;extern unsigned long initial_code; -extern unsigned long initial_page_table;extern unsigned long initial_gs;#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)extern unsigned long setup_trampoline (void ); -extern void __init setup_trampoline_page_table (void );extern void __init reserve_trampoline_memory (void );#else -static inline void setup_trampoline_page_table (void ) {}static inline void reserve_trampoline_memory (void ) {}#endif /* CONFIG_X86_TRAMPOLINE */
arch/x86/kernel/acpi/sleep.c +6 -1
@@ -12,6 +12,11 @@#include <asm/segment.h> #include <asm/desc.h> +#ifdef CONFIG_X86_32 +#include <asm/pgtable.h> +#include <asm/pgtable_32.h> +#endif +#include "realmode/wakeup.h" #include "sleep.h"
@@ -90,7 +95,7 @@ int acpi_save_state_mem(void)#ifndef CONFIG_64BIT header->pmode_entry = (u32)&wakeup_pmode_return; - header->pmode_cr3 = (u32)(swsusp_pg_dir - __PAGE_OFFSET); + header->pmode_cr3 = (u32 )__pa (&initial_page_table); saved_magic =0x12345678 ;#else /* CONFIG_64BIT */ header->trampoline_segment =setup_trampoline () >>4 ;
arch/x86/kernel/head32.c +1 -0
@@ -17,6 +17,7 @@#include <asm/apic.h> #include <asm/io_apic.h> #include <asm/bios_ebda.h> +#include <asm/tlbflush.h> static void __init i386_default_early_setup (void ) {
arch/x86/kernel/head_32.S +25 -30
122 lines not on this page · raw message
arch/x86/kernel/reboot.c +2 -8
@@ -371,16 +371,10 @@ void machine_real_restart(const unsigned char *code, int length)CMOS_WRITE (0x00 ,0x8f );spin_unlock (&rtc_lock); -/* Remap the kernel at virtual address zero, as well as offset zero -from the kernel segment. This assumes the kernel segment starts at -virtual address PAGE_OFFSET. */ -memcpy (swapper_pg_dir, swapper_pg_dir +KERNEL_PGD_BOUNDARY , -sizeof (swapper_pg_dir [0 ]) *KERNEL_PGD_PTRS ); -/* -* Use `swapper_pg_dir' as our page directory. +* Switch back to the initial page table. */ -load_cr3 (swapper_pg_dir); +load_cr3 (initial_page_table);/* Write 0x1234 to absolute memory location 0x472. The BIOS reads this on booting to tell it to "Bypass memory test (also warm
arch/x86/kernel/setup.c +17 -1
@@ -730,6 +730,17 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_32 memcpy (&boot_cpu_data, &new_cpu_data,sizeof (new_cpu_data));visws_early_detect (); + +/* +* copy kernel address range established so far and switch +* to the proper swapper page table +*/ +clone_pgd_range (swapper_pg_dir +KERNEL_PGD_BOUNDARY , + initial_page_table +KERNEL_PGD_BOUNDARY , +KERNEL_PGD_PTRS ); + +load_cr3 (swapper_pg_dir); +__flush_tlb_all ();#else printk (KERN_INFO "Command line: %s\n" , boot_command_line);#endif
@@ -1014,7 +1025,12 @@ void __init setup_arch(char **cmdline_p)paging_init (); x86_init.paging.pagetable_setup_done (swapper_pg_dir); -setup_trampoline_page_table (); +#ifdef CONFIG_X86_32 +/* sync back kernel address range */ +clone_pgd_range (initial_page_table +KERNEL_PGD_BOUNDARY , + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +KERNEL_PGD_PTRS ); +#endif tboot_probe ();
arch/x86/kernel/smpboot.c +6 -13
@@ -300,22 +300,17 @@ notrace static void __cpuinit start_secondary(void *unused)* most necessary things. */ -#ifdef CONFIG_X86_32 -/* -* Switch away from the trampoline page-table -* -* Do this before cpu_init() because it needs to access per-cpu -* data which may not be mapped in the trampoline page-table. -*/ -load_cr3 (swapper_pg_dir); -__flush_tlb_all (); -#endif -vmi_bringup ();cpu_init ();preempt_disable ();smp_callin (); +#ifdef CONFIG_X86_32 +/* switch away from the initial page table */ +load_cr3 (swapper_pg_dir); +__flush_tlb_all (); +#endif +/* otherwise gcc will move up smp_processor_id before the cpu_init */ barrier ();/*
@@ -774,7 +769,6 @@ do_rest:#ifdef CONFIG_X86_32 /* Stack for startup_32 can be just as for start_secondary onwards */ irq_ctx_init (cpu); - initial_page_table =__pa (&trampoline_pg_dir);#else clear_tsk_thread_flag (c_idle.idle,TIF_FORK ); initial_gs =per_cpu_offset (cpu);
@@ -923,7 +917,6 @@ int __cpuinit native_cpu_up(unsigned int cpu)per_cpu (cpu_state, cpu) =CPU_UP_PREPARE ; err =do_boot_cpu (apicid, cpu); -if (err) {pr_debug ("do_boot_cpu failed %d\n" , err);return -EIO ;
arch/x86/kernel/trampoline.c +0 -16
@@ -38,19 +38,3 @@ unsigned long __trampinit setup_trampoline(void)memcpy (trampoline_base, trampoline_data,TRAMPOLINE_SIZE );return virt_to_phys (trampoline_base); } - -void __init setup_trampoline_page_table (void ) -{ -#ifdef CONFIG_X86_32 -/* Copy kernel address range */ -clone_pgd_range (trampoline_pg_dir +KERNEL_PGD_BOUNDARY , - swapper_pg_dir +KERNEL_PGD_BOUNDARY , -KERNEL_PGD_PTRS ); - -/* Initialize low mappings */ -clone_pgd_range (trampoline_pg_dir, - swapper_pg_dir +KERNEL_PGD_BOUNDARY , - min_t(unsigned long, KERNEL_PGD_PTRS, -KERNEL_PGD_BOUNDARY )); -#endif -}
arch/x86/mm/init_32.c +0 -45
57 lines not on this page · raw message
Signature · 6 lines
1.7.1
--
Regards/Gruss,
Boris.