x86/efi changes for v3.14
Subsystems (4)
Linus,
Please pull the latest x86-efi-kexec-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-efi-kexec-for-linus
# HEAD: ef0b8b9a521c65201bfca9747ee1bf374296133c Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
It consists of two main parts:
* New static EFI runtime services virtual mapping layout which is groundwork for kexec support on EFI. (Borislav Petkov)
* EFI kexec support itself. (Dave Young)
Thanks,
Ingo
------------------>
Borislav Petkov (11):
x86/efi: Simplify EFI_DEBUG
x86/mm/pageattr: Lookup address in an arbitrary PGD x86/mm/pageattr: Add a PGD pagetable populating function x86/mm/pageattr: Add a PUD pagetable populating function x86/mm/pageattr: Add a PMD pagetable populating function x86/mm/pageattr: Add a PTE pagetable populating function x86/mm/pageattr: Add a PUD error unwinding path x86/mm/pageattr: Add last levels of error path x86/mm/cpa: Map in an arbitrary pgd
x86/efi: Runtime services virtual mapping x86/efi: Check krealloc return value
Dave Young (12):
x86/efi: Remove unused variables in __map_region() x86/efi: Add a wrapper function efi_map_region_fixed() x86/efi: Fix off-by-one bug in EFI Boot Services reservation x86/efi: Cleanup efi_enter_virtual_mode() function
efi: Export more EFI table variables to sysfs
efi: Export EFI runtime memory mapping to sysfs x86/efi: Pass necessary EFI data for kexec via setup_data
x86: Add xloadflags bit for EFI runtime support on kexec
x86: Export x86 boot_params to sysfs
x86: Reserve setup_data ranges late after parsing memmap cmdline
x86: ksysfs.c build fix
x86/efi: parse_efi_setup() build fix
Matt Fleming (1):
x86/efi: Delete superfluous global variables
Documentation/ABI/testing/sysfs-firmware-efi | 20 + .../ABI/testing/sysfs-firmware-efi-runtime-map | 34 ++ Documentation/ABI/testing/sysfs-kernel-boot_params | 38 ++ Documentation/kernel-parameters.txt | 6 + Documentation/x86/boot.txt | 3 + Documentation/x86/x86_64/mm.txt | 7 + arch/x86/boot/header.S | 9 +- arch/x86/include/asm/efi.h | 78 +++- arch/x86/include/asm/pgtable_types.h | 3 +- arch/x86/include/uapi/asm/bootparam.h | 2 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/ksysfs.c | 340 +++++++++++++++ arch/x86/kernel/setup.c | 7 +- arch/x86/mm/pageattr.c | 461 ++++++++++++++++++++- arch/x86/platform/efi/efi.c | 355 ++++++++++++---- arch/x86/platform/efi/efi_32.c | 12 +- arch/x86/platform/efi/efi_64.c | 120 ++++++ arch/x86/platform/efi/efi_stub_64.S | 54 +++ drivers/firmware/efi/Kconfig | 11 + drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 45 +- drivers/firmware/efi/runtime-map.c | 181 ++++++++ include/linux/efi.h | 17 + 23 files changed, 1689 insertions(+), 116 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi-runtime-map create mode 100644 Documentation/ABI/testing/sysfs-kernel-boot_params create mode 100644 arch/x86/kernel/ksysfs.c create mode 100644 drivers/firmware/efi/runtime-map.c
Documentation/ABI/testing/sysfs-firmware-efi new file +20 -0
@@ -0,0 +1,20 @@ +What: /sys/firmware/efi/fw_vendor +Date: December 2013 +Contact: Dave Young <[email protected]> +Description: It shows the physical address of firmware vendor field in the + EFI system table. +Users: Kexec + +What: /sys/firmware/efi/runtime +Date: December 2013 +Contact: Dave Young <[email protected]> +Description: It shows the physical address of runtime service table entry in + the EFI system table. +Users: Kexec + +What: /sys/firmware/efi/config_table +Date: December 2013 +Contact: Dave Young <[email protected]> +Description: It shows the physical address of config table entry in the EFI + system table. +Users: Kexec
Documentation/ABI/testing/sysfs-firmware-efi-runtime-map new file +34 -0
@@ -0,0 +1,34 @@ +What: /sys/firmware/efi/runtime-map/ +Date: December 2013 +Contact: Dave Young <[email protected]> +Description: Switching efi runtime services to virtual mode requires + that all efi memory ranges which have the runtime attribute + bit set to be mapped to virtual addresses. + + The efi runtime services can only be switched to virtual + mode once without rebooting. The kexec kernel must maintain + the same physical to virtual address mappings as the first + kernel. The mappings are exported to sysfs so userspace tools + can reassemble them and pass them into the kexec kernel. + + /sys/firmware/efi/runtime-map/ is the directory the kernel + exports that information in. + + subdirectories are named with the number of the memory range: + + /sys/firmware/efi/runtime-map/0 + /sys/firmware/efi/runtime-map/1 + /sys/firmware/efi/runtime-map/2 + /sys/firmware/efi/runtime-map/3 + ... + + Each subdirectory contains five files: + + attribute : The attributes of the memory range. + num_pages : The size of the memory range in pages. + phys_addr : The physical address of the memory range. + type : The type of the memory range. + virt_addr : The virtual address of the memory range. + + Above values are all hexadecimal numbers with the '0x' prefix. +Users: Kexec
Documentation/ABI/testing/sysfs-kernel-boot_params new file +38 -0
@@ -0,0 +1,38 @@ +What: /sys/kernel/boot_params +Date: December 2013 +Contact: Dave Young <[email protected]> +Description: The /sys/kernel/boot_params directory contains two + files: "data" and "version" and one subdirectory "setup_data". + It is used to export the kernel boot parameters of an x86 + platform to userspace for kexec and debugging purpose. + + If there's no setup_data in boot_params the subdirectory will + not be created. + + "data" file is the binary representation of struct boot_params. + + "version" file is the string representation of boot + protocol version. + + "setup_data" subdirectory contains the setup_data data + structure in boot_params. setup_data is maintained in kernel + as a link list. In "setup_data" subdirectory there's one + subdirectory for each link list node named with the number + of the list nodes. The list node subdirectory contains two + files "type" and "data". "type" file is the string + representation of setup_data type. "data" file is the binary + representation of setup_data payload. + + The whole boot_params directory structure is like below: + /sys/kernel/boot_params + |__ data + |__ setup_data + | |__ 0 + | | |__ data + | | |__ type + | |__ 1 + | |__ data + | |__ type + |__ version + +Users: Kexec
Documentation/kernel-parameters.txt +6 -0
@@ -890,6 +890,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. edd= [EDD] Format: {"off" | "on" | "skip[mbr]"} + efi= [EFI] + Format: { "old_map" } + old_map [X86-64]: switch to the old ioremap-based EFI + runtime services mapping. 32-bit still uses this one by + default. + efi_no_storage_paranoia [EFI; X86] Using this parameter you can use more than 50% of your efi variable storage. Use this parameter only if
Documentation/x86/boot.txt +3 -0
@@ -608,6 +608,9 @@ Protocol: 2.12+ - If 1, the kernel supports the 64-bit EFI handoff entry point given at handover_offset + 0x200. + Bit 4 (read): XLF_EFI_KEXEC + - If 1, the kernel supports kexec EFI boot with EFI runtime support. + Field name: cmdline_size Type: read Offset/size: 0x238/4
Documentation/x86/x86_64/mm.txt +7 -0
@@ -28,4 +28,11 @@ reference. Current X86-64 implementations only support 40 bits of address space, but we support up to 46 bits. This expands into MBZ space in the page tables. +->trampoline_pgd: + +We map EFI runtime services in the aforementioned PGD in the virtual +range of 64Gb (arbitrarily set, can be raised if needed) + +0xffffffef00000000 - 0xffffffff00000000 + -Andi Kleen, Jul 2004
arch/x86/boot/header.S +8 -1
@@ -391,7 +391,14 @@ xloadflags: #else # define XLF23 0 #endif - .word XLF0 | XLF1 | XLF23 + +#if defined(CONFIG_X86_64) && defined(CONFIG_EFI) && defined(CONFIG_KEXEC) +# define XLF4 XLF_EFI_KEXEC +#else +# define XLF4 0 +#endif + + .word XLF0 | XLF1 | XLF23 | XLF4 cmdline_size: .long COMMAND_LINE_SIZE-1 #length of the command line, #added with boot protocol
arch/x86/include/asm/efi.h +60 -18
115 lines not on this page · raw message
arch/x86/include/asm/pgtable_types.h +2 -1
@@ -382,7 +382,8 @@ static inline void update_page_count(int level, unsigned long pages) { }*/ extern pte_t *lookup_address (unsigned long address,unsigned int *level);extern phys_addr_t slow_virt_to_phys (void *__address); - +extern int kernel_map_pages_in_pgd (pgd_t *pgd,u64 pfn,unsigned long address, +unsigned numpages,unsigned long page_flags);#endif /* !__ASSEMBLY__ */ #endif /* _ASM_X86_PGTABLE_DEFS_H */
arch/x86/include/uapi/asm/bootparam.h +2 -0
@@ -6,6 +6,7 @@#define SETUP_E820_EXT 1#define SETUP_DTB 2#define SETUP_PCI 3 +#define SETUP_EFI 4/* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF
@@ -23,6 +24,7 @@#define XLF_CAN_BE_LOADED_ABOVE_4G (1<<1)#define XLF_EFI_HANDOVER_32 (1<<2)#define XLF_EFI_HANDOVER_64 (1<<3) +#define XLF_EFI_KEXEC (1<<4)#ifndef __ASSEMBLY__
arch/x86/kernel/Makefile +1 -0
@@ -29,6 +29,7 @@ obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o obj-y += syscall_$(BITS).o obj-$(CONFIG_X86_64) += vsyscall_64.o obj-$(CONFIG_X86_64) += vsyscall_emu_64.o +obj-$(CONFIG_SYSFS) += ksysfs.o obj-y += bootflag.o e820.o obj-y += pci-dma.o quirks.o topology.o kdebugfs.o obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
arch/x86/kernel/ksysfs.c new file +340 -0
340 lines not on this page · raw message
arch/x86/kernel/setup.c +5 -2
@@ -447,6 +447,9 @@ static void __init parse_setup_data(void)case SETUP_DTB :add_dtb (pa_data);break ; +case SETUP_EFI : +parse_efi_setup (pa_data, data_len); +break ;default :break ; }
@@ -924,8 +927,6 @@ void __init setup_arch(char **cmdline_p) iomem_resource.end = (1ULL << boot_cpu_data.x86_phys_bits) -1 ;setup_memory_map ();parse_setup_data (); -/* update the e820_saved too */ -e820_reserve_setup_data ();copy_edd ();
@@ -987,6 +988,8 @@ void __init setup_arch(char **cmdline_p)early_dump_pci_devices ();#endif +/* update the e820_saved too */ +e820_reserve_setup_data ();finish_e820_parsing ();if (efi_enabled (EFI_BOOT ))
arch/x86/mm/pageattr.c +444 -17
556 lines not on this page · raw message
arch/x86/platform/efi/efi.c +280 -75
501 lines not on this page · raw message
arch/x86/platform/efi/efi_32.c +11 -1
@@ -37,9 +37,19 @@* claim EFI runtime service handler exclusively and to duplicate a memory in * low memory space say 0 - 3G. */ -static unsigned long efi_rt_eflags; +void efi_sync_low_kernel_mappings (void ) {} +void efi_setup_page_tables (void ) {} + +void __init efi_map_region (efi_memory_desc_t *md) +{ +old_map_region (md); +} + +void __init efi_map_region_fixed (efi_memory_desc_t *md) {} +void __init parse_efi_setup (u64 phys_addr,u32 data_len) {} +void efi_call_phys_prelog (void ) {struct desc_ptr gdt_descr;
arch/x86/platform/efi/efi_64.c +120 -0
151 lines not on this page · raw message
arch/x86/platform/efi/efi_stub_64.S +54 -0
107 lines not on this page · raw message
drivers/firmware/efi/Kconfig +11 -0
@@ -36,6 +36,17 @@ config EFI_VARS_PSTORE_DEFAULT_DISABLE backend for pstore by default. This setting can be overridden using the efivars module's pstore_disable parameter. +config EFI_RUNTIME_MAP + bool "Export efi runtime maps to sysfs" + depends on X86 && EFI && KEXEC + default y + help + Export efi runtime memory maps to /sys/firmware/efi/runtime-map. + That memory map is used for example by kexec to set up efi virtual + mapping the 2nd kernel, but can also be used for debugging purposes. + + See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map. + endmenu config UEFI_CPER
drivers/firmware/efi/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_EFI) += efi.o vars.o obj-$(CONFIG_EFI_VARS) += efivars.o obj-$(CONFIG_EFI_VARS_PSTORE) += efi-pstore.o obj-$(CONFIG_UEFI_CPER) += cper.o +obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o
drivers/firmware/efi/efi.c +44 -1
69 lines not on this page · raw message
drivers/firmware/efi/runtime-map.c new file +181 -0
181 lines not on this page · raw message
include/linux/efi.h +17 -0
@@ -556,6 +556,9 @@ extern struct efi {unsigned long hcdp;/* HCDP table */ unsigned long uga;/* UGA table */ unsigned long uv_systab;/* UV system table */ +unsigned long fw_vendor;/* fw_vendor */ +unsigned long runtime;/* runtime table */ +unsigned long config_table;/* config tables */ efi_get_time_t *get_time;efi_set_time_t *set_time;efi_get_wakeup_time_t *get_wakeup_time;
@@ -653,6 +656,7 @@ extern int __init efi_setup_pcdp_console(char *);#define EFI_RUNTIME_SERVICES 3/* Can we use runtime services? */ #define EFI_MEMMAP 4/* Can we use EFI memory map? */ #define EFI_64BIT 5/* Is the firmware 64-bit? */ +#define EFI_ARCH_1 6/* First arch-specific bit */ #ifdef CONFIG_EFI # ifdef CONFIG_X86
@@ -872,4 +876,17 @@ int efivars_sysfs_init(void);#endif /* CONFIG_EFI_VARS */ +#ifdef CONFIG_EFI_RUNTIME_MAP +int efi_runtime_map_init (struct kobject *); +void efi_runtime_map_setup (void *,int ,u32 ); +#else +static inline int efi_runtime_map_init (struct kobject *kobj) +{ +return 0 ; +} + +static inline void +efi_runtime_map_setup (void *map,int nr_entries,u32 desc_size) {} +#endif +#endif /* _LINUX_EFI_H */