malloc: efi_malloc: refactor to use the efi malloc with tlsf malloc

Author: anischali

arch/arm/configs/efi_v8_defconfig

@@ -264,5 +264,4 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_DIGEST_SHA1_ARM64_CE=y
 CONFIG_DIGEST_SHA256_ARM64_CE=y
 CONFIG_MALLOC_EFI=y
-# CONFIG_MALLOC_TLSF is not set
 # CONFIG_MISSING_FIRMWARE_ERROR is not set

common/Kconfig

@@ -317,20 +317,20 @@ config EXPERIMENTAL
 	bool
 	prompt "Prompt for experimental code"
 
+config MALLOC_EFI
+	bool "efi malloc"
+	depends on EFI_PAYLOAD 
+	help
+	  select this option to use a efi malloc implementation. With this
+	  This is suitable for efi payload.
+
 choice
 	prompt "malloc implementation"
 	default MALLOC_TLSF
 
 config MALLOC_TLSF
 	bool "tlsf"
 
-config MALLOC_EFI
-	bool "efi malloc"
-	depends on EFI_PAYLOAD
-	help
-	  select this option to use a efi malloc implementation. With this
-	  This is suitable for efi payload.
-
 config MALLOC_DUMMY
 	bool "dummy malloc"
 	depends on SHELL_NONE

common/Makefile

@@ -53,6 +53,7 @@ obj-$(CONFIG_KALLSYMS)		+= kallsyms.o
 obj-$(CONFIG_MALLOC_TLSF)	+= tlsf_malloc.o tlsf.o calloc.o
 KASAN_SANITIZE_tlsf.o := n
 obj-$(CONFIG_MALLOC_DUMMY)	+= dummy_malloc.o calloc.o
+obj-$(CONFIG_MALLOC_EFI)  	+= efi_malloc.o
 obj-y				+= malloc.o
 obj-$(CONFIG_MEMINFO)		+= meminfo.o
 obj-$(CONFIG_MENU)		+= menu.o

common/efi_malloc.c

@@ -12,135 +12,69 @@
 
 struct alloc_header {
 	size_t size;     /* requested size */
-	int from_efi;    /* 0 = memalign, 1 = EFI pages */
 };
 
-void malloc_stats(void)
-{
-	/* optional: implement stats if needed */
-}
-
-static void *efi_malloc(size_t size) {
+void *efi_malloc(size_t size) {
 	efi_status_t efiret;
 	efi_physical_addr_t mem;
-	size_t pages = DIV_ROUND_UP(size, EFI_PAGE_SIZE);
+	struct alloc_header *hdr;
+	size_t pages;
+	
+	if (!size)
+		return ZERO_SIZE_PTR;
 
+	pages= DIV_ROUND_UP(size, EFI_PAGE_SIZE);
 	efiret = BS->allocate_pages(EFI_ALLOCATE_ANY_PAGES,
 				    EFI_LOADER_DATA, pages, &mem);
 	if (EFI_ERROR(efiret)) {
 		errno = efi_errno(efiret);
 		return NULL;
 	}
 
-	return efi_phys_to_virt(mem);
-}
-
-static void efi_free(void *ptr, size_t size) {
-	efi_physical_addr_t phys = efi_virt_to_phys(ptr);
-	size_t pages = DIV_ROUND_UP(size, EFI_PAGE_SIZE);
-	BS->free_pages(phys, pages);
-}
-
-void *memalign(size_t alignment, size_t bytes)
-{
-	void *mem = NULL;
-
-	if (!bytes)
-		return ZERO_SIZE_PTR;
-
-	if (alignment <= MALLOC_MAX_SIZE && bytes <= MALLOC_MAX_SIZE)
-		mem = sbrk(bytes + alignment);
-	if (!mem) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	return PTR_ALIGN(mem, alignment);
-}
-
-void *malloc(size_t size)
-{
-	struct alloc_header *hdr;
-	void *mem;
-
-	if (!size)
-		return ZERO_SIZE_PTR;
-
-	/* if asked size is bigger than 1MB allocate from efi*/
-	if (size >= SZ_1M)
-		goto efi_alloc;
-
-	/* try memalign first, to use boot service memory */
-	mem = memalign(CONFIG_MALLOC_ALIGNMENT, size + sizeof(*hdr));
-	if (mem && !errno) {
-		hdr = (struct alloc_header *)mem;
-		hdr->from_efi = 0;
-		goto return_ptr;
-	}
-
-efi_alloc:
-	/* if no memory left from boot services fallback here*/
-	mem = efi_malloc(size + sizeof(*hdr));
-	if (!mem)
-		return NULL;
-
-	hdr = (struct alloc_header *)mem;
-	hdr->from_efi = 1;
-		
-return_ptr:
+	hdr = (struct alloc_header *)efi_phys_to_virt(mem);
 	hdr->size = size;
 	return (void *)(hdr + 1);
 }
 
-void free(void *ptr)
-{
+void efi_free(void *ptr) {
+	efi_physical_addr_t phys;
 	struct alloc_header *hdr;
 
 	if (!ptr)
 		return;
-
+	
 	hdr = (struct alloc_header *)ptr - 1;
+	phys = efi_virt_to_phys(hdr);
 
-	if (hdr->from_efi)
-		efi_free(hdr, hdr->size + sizeof(*hdr));
-}
-
-size_t malloc_usable_size(void *mem)
-{
-	struct alloc_header *hdr;
-
-	if (!mem)
-		return 0;
-
-	hdr = (struct alloc_header *)mem - 1;
-	return hdr->size;
+	size_t pages = DIV_ROUND_UP(hdr->size, EFI_PAGE_SIZE);
+	BS->free_pages(phys, pages);
 }
 
-void *realloc(void *ptr, size_t size)
+void *efi_realloc(void *ptr, size_t size)
 {
 	struct alloc_header *hdr;
 	void *n_mem;
 	size_t old_sz;
 
 	if (!ptr)
-		return malloc(size);
+		return efi_malloc(size);
 
 	if (!size) {
-		free(ptr);
+		efi_free(ptr);
 		return NULL;
 	}
 
 	hdr = (struct alloc_header *)ptr - 1;
 	old_sz = hdr->size;
 
-	n_mem = malloc(size);
+	n_mem = efi_malloc(size);
 	if (!n_mem) {
 		errno = ENOMEM;
 		return NULL;
 	}
 
 	memcpy(n_mem, ptr, (old_sz < size) ? old_sz : size);
-	free(ptr);
+	efi_free(ptr);
 
 	return n_mem;
 }

common/tlsf_malloc.c

@@ -6,6 +6,8 @@
  */
 
 #include <malloc.h>
+#include <efi.h>
+#include <memory.h>
 #include <string.h>
 
 #include <stdio.h>
@@ -29,15 +31,28 @@ void *malloc(size_t bytes)
 	void *mem;
 
 	mem = tlsf_malloc(tlsf_mem_pool, bytes);
-	if (!mem)
+	if (!mem) {
+		if (IS_ENABLED(CONFIG_MALLOC_EFI)) {
+			return efi_malloc(bytes);
+		}
+
 		errno = ENOMEM;
+	}
 
 	return mem;
 }
 EXPORT_SYMBOL(malloc);
 
 void free(void *mem)
 {
+	if (IS_ENABLED(CONFIG_MALLOC_EFI)) {
+		if (efi_virt_to_phys(mem) < mem_malloc_start() &&
+			efi_virt_to_phys(mem) > mem_malloc_end()) {
+			efi_free(mem);
+			return;
+		}
+	}
+
 	tlsf_free(tlsf_mem_pool, mem);
 }
 EXPORT_SYMBOL(free);
@@ -51,8 +66,12 @@ EXPORT_SYMBOL(malloc_usable_size);
 void *realloc(void *oldmem, size_t bytes)
 {
 	void *mem = tlsf_realloc(tlsf_mem_pool, oldmem, bytes);
-	if (!mem)
+	if (!mem) {
+	 	if (IS_ENABLED(CONFIG_MALLOC_EFI)) {
+			return efi_realloc(oldmem, bytes);
+		}
 		errno = ENOMEM;
+	}
 
 	return mem;
 }

include/malloc.h

@@ -24,6 +24,15 @@
 #ifdef CONFIG_MALLOC_TLSF
 void *malloc_add_pool(void *mem, size_t bytes);
 #endif
+void *efi_malloc(size_t size);
+void efi_free(void *ptr);
+void *efi_realloc(void *ptr, size_t size);
+#ifdef MALLOC_EFI
+static inline void *efi_malloc(size_t size) { return ERR_PTR(-ENOMEM); }
+static inline void efi_free(void *ptr) {}
+static inline void *efi_realloc(void *ptr, size_t size) { return ERR_PTR(-ENOMEM); }
+#else
+#endif
 
 #if IN_PROPER
 void *malloc(size_t) __alloc_size(1);