From: Sai Praneeth <[email protected]> efi_memmap_alloc(), as the name suggests, allocates memory for a new efi memory map and it does so depending on whether mm_init() has already been invoked or not. As we have introduced efi_memmap_free() to free the memory allocated by efi_memmap_alloc(), modify efi_memmap_alloc() to include "efi_memmap_type", so that the caller of efi_memmap_alloc() will know the type of allocation performed and later use the same to free the memory should remap fail. Without "efi_memmap_type" there would be no way for efi_memmap_free() to know the type of allocation performed by efi_memmap_alloc().
Also, "efi_memmap_type" will make sure that efi_memmap_alloc() and efi_memmap_free() are always binded properly i.e. a user could use efi_memmap_alloc() before slab_is_available() and use efi_memmap_free() on the same memory but after slab_is_available(). Without "efi_memmap_type", efi_memmap_free() would be using wrong free variant. With "efi_memmap_type", we make this relationship between efi_memmap_alloc() and efi_memmap_free() explicit to the user. Signed-off-by: Sai Praneeth Prakhya <[email protected]> Suggested-by: Ard Biesheuvel <[email protected]> Cc: Lee Chun-Yi <[email protected]> Cc: Dave Young <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Laszlo Ersek <[email protected]> Cc: Jan Kiszka <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Bhupesh Sharma <[email protected]> Cc: Nicolai Stange <[email protected]> Cc: Naresh Bhat <[email protected]> Cc: Ricardo Neri <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Taku Izumi <[email protected]> Cc: Ravi Shankar <[email protected]> Cc: Matt Fleming <[email protected]> Cc: Dan Williams <[email protected]> Cc: Ard Biesheuvel <[email protected]> --- arch/x86/platform/efi/quirks.c | 6 ++++-- drivers/firmware/efi/fake_mem.c | 3 ++- drivers/firmware/efi/memmap.c | 12 ++++++++++-- include/linux/efi.h | 3 ++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 36c1f8b9f7e0..84e8d077adf6 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -248,6 +248,7 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) efi_memory_desc_t md; int num_entries; void *new; + enum efi_memmap_type alloc_type; if (efi_mem_desc_lookup(addr, &md)) { pr_err("Failed to lookup EFI memory descriptor for %pa\n", &addr); @@ -276,7 +277,7 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) new_size = efi.memmap.desc_size * num_entries; - new_phys = efi_memmap_alloc(num_entries); + new_phys = efi_memmap_alloc(num_entries, &alloc_type); if (!new_phys) { pr_err("Could not allocate boot services memmap\n"); return; @@ -375,6 +376,7 @@ void __init efi_free_boot_services(void) efi_memory_desc_t *md; int num_entries = 0; void *new, *new_md; + enum efi_memmap_type alloc_type; for_each_efi_memory_desc(md) { unsigned long long start = md->phys_addr; @@ -420,7 +422,7 @@ void __init efi_free_boot_services(void) return; new_size = efi.memmap.desc_size * num_entries; - new_phys = efi_memmap_alloc(num_entries); + new_phys = efi_memmap_alloc(num_entries, &alloc_type); if (!new_phys) { pr_err("Failed to allocate new EFI memmap\n"); return; diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c index 6c7d60c239b5..955e690b8325 100644 --- a/drivers/firmware/efi/fake_mem.c +++ b/drivers/firmware/efi/fake_mem.c @@ -57,6 +57,7 @@ void __init efi_fake_memmap(void) phys_addr_t new_memmap_phy; void *new_memmap; int i; + enum efi_memmap_type alloc_type; if (!nr_fake_mem) return; @@ -71,7 +72,7 @@ void __init efi_fake_memmap(void) } /* allocate memory for new EFI memmap */ - new_memmap_phy = efi_memmap_alloc(new_nr_map); + new_memmap_phy = efi_memmap_alloc(new_nr_map, &alloc_type); if (!new_memmap_phy) return; diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c index 0686e063c644..69b81d355619 100644 --- a/drivers/firmware/efi/memmap.c +++ b/drivers/firmware/efi/memmap.c @@ -33,6 +33,7 @@ static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size) /** * efi_memmap_alloc - Allocate memory for the EFI memory map * @num_entries: Number of entries in the allocated map. + * @alloc_type: Type of allocation performed (memblock or normal)? * * Depending on whether mm_init() has already been invoked or not, * either memblock or "normal" page allocation is used. @@ -40,13 +41,20 @@ static phys_addr_t __init __efi_memmap_alloc_late(unsigned long size) * Returns the physical address of the allocated memory map on * success, zero on failure. */ -phys_addr_t __init efi_memmap_alloc(unsigned int num_entries) +phys_addr_t __init efi_memmap_alloc(unsigned int num_entries, + enum efi_memmap_type *alloc_type) { unsigned long size = num_entries * efi.memmap.desc_size; - if (slab_is_available()) + if (!alloc_type) + return 0; + + if (slab_is_available()) { + *alloc_type = BUDDY_ALLOCATOR; return __efi_memmap_alloc_late(size); + } + *alloc_type = MEMBLOCK; return __efi_memmap_alloc_early(size); } diff --git a/include/linux/efi.h b/include/linux/efi.h index 455875c01ed1..53495e854d2a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1013,7 +1013,8 @@ static inline efi_status_t efi_query_variable_store(u32 attributes, #endif extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr); -extern phys_addr_t __init efi_memmap_alloc(unsigned int num_entries); +extern phys_addr_t __init efi_memmap_alloc(unsigned int num_entries, + enum efi_memmap_type *alloc_type); extern int __init efi_memmap_init_early(struct efi_memory_map_data *data); extern int __init efi_memmap_init_late(phys_addr_t addr, unsigned long size); extern void __init efi_memmap_unmap(void); -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
