Re: [PATCH] x86/efi: Free allocated memory if remap fails

[Sai Praneeth Prakhya]

> > It's a fact that memremap() and early_memremap() might never fail and
> > this code might never get a chance to run but to maintain good kernel
> > programming semantics, we might need this patch.
> > 
> > Signed-off-by: Sai Praneeth Prakhya <sai.praneeth.prakhya@xxxxxxxxx>
> > Reviewed-by: Ricardo Neri <ricardo.neri-calderon@xxxxxxxxxxxxxxx>
> Please don't include tags for reviews that did not happen on-list.
> 

Sure! Thanks for letting me know.

> > @@ -450,10 +451,11 @@ void __init efi_free_boot_services(void)
> > 
> > ÂÂÂÂÂÂÂÂmemunmap(new);
> > 
> > -ÂÂÂÂÂÂÂif (efi_memmap_install(new_phys, num_entries)) {
> > +ÂÂÂÂÂÂÂif (efi_memmap_install(new_phys, num_entries))
> > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂpr_err("Could not install new EFI memmap\n");
> > -ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂreturn;
> > -ÂÂÂÂÂÂÂ}
> > +
> > +free_mem:
> > +ÂÂÂÂÂÂÂefi_memmap_free(new_phys, num_entries);
> Doesn't this free the memory map that you just installed?
> 

That's true! It's a bug. I will fix it.

> > 
> > Â}
> >Â
> > Â/**
> > + * efi_memmap_free - Free memory allocated by efi_memmap_alloc()
> > + * @mem: Physical address allocated by efi_memmap_alloc()
> > + * @num_entries: Number of entries in the allocated map.
> > + *
> > + * efi_memmap_alloc() allocates memory depending on whether mm_init()
> > + * has already been invoked or not. It uses either memblock or "normal"
> > + * page allocation. Use this function to free the memory allocated by
> > + * efi_memmap_alloc(). Since the allocation is done in two different
> > + * ways, similarly, we free it in two different ways.
> > + *
> > + */
> > +void __init efi_memmap_free(phys_addr_t mem, unsigned int num_entries)
> > +{
> > +ÂÂÂÂÂÂÂunsigned long size = num_entries * efi.memmap.desc_size;
> > +ÂÂÂÂÂÂÂunsigned int order = get_order(size);
> > +ÂÂÂÂÂÂÂphys_addr_t end = mem + size - 1;
> > +
> > +ÂÂÂÂÂÂÂif (slab_is_available()) {
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ__free_pages(pfn_to_page(PHYS_PFN(mem)), order);
> How do you know that the memory you are freeing was allocated when
> slab_is_available() was already true?
> 

efi_memmap_free() should be used *only* in conjunction
withÂefi_memmap_alloc()(As I explicitly didn't mention this, maybe it might
have confused you).

When allocating memory efi_memmap_alloc() does similar check
forÂslab_is_available() and if so, it allocates memory using alloc_pages().
So, to free pages allocated using alloc_pages(), efi_memmap_free()
usesÂ__free_pages().

> > 
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂreturn;
> > +ÂÂÂÂÂÂÂ}
> > +
> > +ÂÂÂÂÂÂÂif (memblock_free(mem, size))
> > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂpr_err("Failed to free mem from %pa to %pa\n", &mem,
> > &end);
> > +}
> > +

Regards,
Sai