EFI fixes
Linus,
Please pull the latest efi-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git efi-urgent-for-linus
# HEAD: cbf2f8a99a2337894c3592c9ac2170e8c1f8f73f Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into efi/urgent
It contains a Xen fix, an arm64 fix and a race condition / robustization set of fixes related to ExitBootServices() usage and boundary conditions.
Thanks,
Ingo
------------------>
Andrzej Hajda (1):
efi: Fix handling error value in fdt_find_uefi_params
Jan Beulich (1):
efi: Make for_each_efi_memory_desc_in_map() cope with running on Xen
Jeffrey Hugo (4):
efi/libstub: Allocate headspace in efi_get_memory_map() efi/libstub: Introduce ExitBootServices helper efi/libstub: Use efi_exit_boot_services() in FDT x86/efi: Use efi_exit_boot_services()
arch/x86/boot/compressed/eboot.c | 134 ++++++++++---------- drivers/firmware/efi/efi.c | 7 +- drivers/firmware/efi/libstub/efi-stub-helper.c | 169 ++++++++++++++++++++----- drivers/firmware/efi/libstub/fdt.c | 54 +++++--- drivers/firmware/efi/libstub/random.c | 12 +- include/linux/efi.h | 27 +++- 6 files changed, 283 insertions(+), 120 deletions(-)
arch/x86/boot/compressed/eboot.c +69 -65
@@ -1004,79 +1004,87 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext,return status; } -static efi_status_t exit_boot (struct boot_params *boot_params, -void *handle,bool is64) -{ -struct efi_info *efi = &boot_params->efi_info; -unsigned long map_sz, key, desc_size; -efi_memory_desc_t *mem_map; +struct exit_boot_struct { +struct boot_params *boot_params; +struct efi_info *efi;struct setup_data *e820ext; -const char *signature;__u32 e820ext_size; -__u32 nr_desc, prev_nr_desc; -efi_status_t status; -__u32 desc_version; -bool called_exit = false; -u8 nr_entries; -int i; - - nr_desc =0 ; - e820ext =NULL ; - e820ext_size =0 ; - -get_map: - status =efi_get_memory_map (sys_table, &mem_map, &map_sz, &desc_size, - &desc_version, &key); - -if (status !=EFI_SUCCESS ) -return status; - - prev_nr_desc = nr_desc; - nr_desc = map_sz / desc_size; -if (nr_desc > prev_nr_desc && - nr_desc >ARRAY_SIZE (boot_params->e820_map)) { -u32 nr_e820ext = nr_desc -ARRAY_SIZE (boot_params->e820_map); - - status =alloc_e820ext (nr_e820ext, &e820ext, &e820ext_size); -if (status !=EFI_SUCCESS ) - goto free_mem_map; +bool is64; +}; -efi_call_early (free_pool, mem_map); - goto get_map;/* Allocated memory, get map again */ +static efi_status_t exit_boot_func (efi_system_table_t *sys_table_arg, +struct efi_boot_memmap *map, +void *priv) +{ +static bool first = true; +const char *signature; +__u32 nr_desc; +efi_status_t status; +struct exit_boot_struct *p = priv; + +if (first) { + nr_desc = *map->buff_size / *map->desc_size; +if (nr_desc >ARRAY_SIZE (p->boot_params->e820_map)) { +u32 nr_e820ext = nr_desc - +ARRAY_SIZE (p->boot_params->e820_map); + + status =alloc_e820ext (nr_e820ext, &p->e820ext, + &p->e820ext_size); +if (status !=EFI_SUCCESS ) +return status; + } + first = false; } - signature = is64 ?EFI64_LOADER_SIGNATURE :EFI32_LOADER_SIGNATURE ; -memcpy (&efi->efi_loader_signature, signature,sizeof (__u32)); + signature = p->is64 ?EFI64_LOADER_SIGNATURE :EFI32_LOADER_SIGNATURE ; +memcpy (&p->efi->efi_loader_signature, signature,sizeof (__u32)); - efi->efi_systab = (unsigned long )sys_table; - efi->efi_memdesc_size = desc_size; - efi->efi_memdesc_version = desc_version; - efi->efi_memmap = (unsigned long )mem_map; - efi->efi_memmap_size = map_sz; + p->efi->efi_systab = (unsigned long )sys_table_arg; + p->efi->efi_memdesc_size = *map->desc_size; + p->efi->efi_memdesc_version = *map->desc_ver; + p->efi->efi_memmap = (unsigned long )*map->map; + p->efi->efi_memmap_size = *map->map_size;#ifdef CONFIG_X86_64 - efi->efi_systab_hi = (unsigned long )sys_table >>32 ; - efi->efi_memmap_hi = (unsigned long )mem_map >>32 ; + p->efi->efi_systab_hi = (unsigned long )sys_table_arg >>32 ; + p->efi->efi_memmap_hi = (unsigned long )*map->map >>32 ;#endif +return EFI_SUCCESS ; +} + +static efi_status_t exit_boot (struct boot_params *boot_params, +void *handle,bool is64) +{ +unsigned long map_sz, key, desc_size, buff_size; +efi_memory_desc_t *mem_map; +struct setup_data *e820ext; +__u32 e820ext_size; +efi_status_t status; +__u32 desc_version; +struct efi_boot_memmap map; +struct exit_boot_struct priv; + + map.map = &mem_map; + map.map_size = &map_sz; + map.desc_size = &desc_size; + map.desc_ver = &desc_version; + map.key_ptr = &key; + map.buff_size = &buff_size; + priv.boot_params = boot_params; + priv.efi = &boot_params->efi_info; + priv.e820ext =NULL ; + priv.e820ext_size =0 ; + priv.is64 = is64; +/* Might as well exit boot services now */ - status =efi_call_early (exit_boot_services, handle, key); -if (status !=EFI_SUCCESS ) { -/* -* ExitBootServices() will fail if any of the event -* handlers change the memory map. In which case, we -* must be prepared to retry, but only once so that -* we're guaranteed to exit on repeated failures instead -* of spinning forever. -*/ -if (called_exit) - goto free_mem_map; - - called_exit = true; -efi_call_early (free_pool, mem_map); - goto get_map; - } + status =efi_exit_boot_services (sys_table, handle, &map, &priv, + exit_boot_func); +if (status !=EFI_SUCCESS ) +return status; + e820ext = priv.e820ext; + e820ext_size = priv.e820ext_size;/* Historic? */ boot_params->alt_mem_k =32 *1024 ;
@@ -1085,10 +1093,6 @@ static efi_status_t exit_boot(struct boot_params *boot_params,return status;return EFI_SUCCESS ; - -free_mem_map: -efi_call_early (free_pool, mem_map); -return status; }/*
drivers/firmware/efi/efi.c +5 -2
@@ -657,9 +657,12 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, }if (subnode) { - node =of_get_flat_dt_subnode_by_name (node, subnode); -if (node <0 ) +int err =of_get_flat_dt_subnode_by_name (node, subnode); + +if (err <0 )return 0 ; + + node = err; }return __find_uefi_params (node, info, dt_params[i].params);
drivers/firmware/efi/libstub/efi-stub-helper.c +139 -30
239 lines not on this page · raw message
drivers/firmware/efi/libstub/fdt.c +39 -15
96 lines not on this page · raw message
drivers/firmware/efi/libstub/random.c +10 -2
@@ -73,12 +73,20 @@ efi_status_t efi_random_alloc(efi_system_table_t *sys_table_arg, unsigned long random_seed) {unsigned long map_size, desc_size, total_slots =0 , target_slot; +unsigned long buff_size;efi_status_t status;efi_memory_desc_t *memory_map;int map_offset; +struct efi_boot_memmap map; - status =efi_get_memory_map (sys_table_arg, &memory_map, &map_size, - &desc_size,NULL ,NULL ); + map.map = &memory_map; + map.map_size = &map_size; + map.desc_size = &desc_size; + map.desc_ver =NULL ; + map.key_ptr =NULL ; + map.buff_size = &buff_size; + + status =efi_get_memory_map (sys_table_arg, &map);if (status !=EFI_SUCCESS )return status;
include/linux/efi.h +21 -6
@@ -118,6 +118,15 @@ typedef struct {u32 imagesize; } efi_capsule_header_t; +struct efi_boot_memmap { +efi_memory_desc_t **map; +unsigned long *map_size; +unsigned long *desc_size; +u32 *desc_ver; +unsigned long *key_ptr; +unsigned long *buff_size; +}; +/* * EFI capsule flags */
@@ -946,7 +955,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,/* Iterate through an efi_memory_map */ #define for_each_efi_memory_desc_in_map (m, md) \ for ((md) = (m)->map; \ - ((void *)(md) + (m)->desc_size) <= (m)->map_end; \ + (md) && ((void *)(md) + (m)->desc_size) <= (m)->map_end; \ (md) = (void *)(md) + (m)->desc_size)/**
@@ -1371,11 +1380,7 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, efi_loaded_image_t *image, int *cmd_line_len);efi_status_t efi_get_memory_map (efi_system_table_t *sys_table_arg, -efi_memory_desc_t **map, -unsigned long *map_size, -unsigned long *desc_size, -u32 *desc_ver, -unsigned long *key_ptr); +struct efi_boot_memmap *map); efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, unsigned long size, unsigned long align,
@@ -1457,4 +1462,14 @@ extern void efi_call_virt_check_flags(unsigned long flags, const char *call);arch_efi_call_virt_teardown (); \ }) +typedef efi_status_t (*efi_exit_boot_map_processing )( +efi_system_table_t *sys_table_arg, +struct efi_boot_memmap *map, +void *priv); + +efi_status_t efi_exit_boot_services (efi_system_table_t *sys_table, +void *handle, +struct efi_boot_memmap *map, +void *priv, +efi_exit_boot_map_processing priv_func);#endif /* _LINUX_EFI_H */