module-adapter: move mod_alloc() allocations to the module heap

Move mod_alloc() allocations, including the container pool, to the
module local heap.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

posix/include/rtos/alloc.h

@@ -54,6 +54,8 @@
 #define SOF_MEM_FLAG_USER		BIT(8)
 /** \brief Indicates that if we should return shared user memory address. */
 #define SOF_MEM_FLAG_USER_SHARED_BUFFER	BIT(9)
+/** \brief Use allocation method for large buffers. */
+#define SOF_MEM_FLAG_LARGE_BUFFER	BIT(10)
 
 /** @} */
 

src/audio/module_adapter/module/generic.c

@@ -137,17 +137,20 @@ struct container_chunk {
 static struct module_resource *container_get(struct processing_module *mod)
 {
 	struct module_resources *res = &mod->priv.resources;
+	struct k_heap *mod_heap = res->heap;
 	struct module_resource *container;
 
 	if (list_is_empty(&res->free_cont_list)) {
-		struct container_chunk *chunk = rzalloc(SOF_MEM_FLAG_USER, sizeof(*chunk));
+		struct container_chunk *chunk = sof_heap_alloc(mod_heap, 0, sizeof(*chunk), 0);
 		int i;
 
 		if (!chunk) {
 			comp_err(mod->dev, "allocating more containers failed");
 			return NULL;
 		}
 
+		memset(chunk, 0, sizeof(*chunk));
+
 		list_item_append(&chunk->chunk_list, &res->cont_chunk_list);
 		for (i = 0; i < ARRAY_SIZE(chunk->containers); i++)
 			list_item_append(&chunk->containers[i].list, &res->free_cont_list);
@@ -180,7 +183,6 @@ void *mod_balloc_align(struct processing_module *mod, size_t size, size_t alignm
 {
 	struct module_resources *res = &mod->priv.resources;
 	struct module_resource *container;
-	void *ptr;
 
 	MEM_API_CHECK_THREAD(res);
 
@@ -195,7 +197,8 @@ void *mod_balloc_align(struct processing_module *mod, size_t size, size_t alignm
 	}
 
 	/* Allocate buffer memory for module */
-	ptr = rballoc_align(SOF_MEM_FLAG_USER, size, alignment);
+	void *ptr = sof_heap_alloc(res->heap, SOF_MEM_FLAG_USER | SOF_MEM_FLAG_LARGE_BUFFER,
+				   size, alignment);
 
 	if (!ptr) {
 		comp_err(mod->dev, "Failed to alloc %zu bytes %zu alignment for comp %#x.",
@@ -231,7 +234,6 @@ void *mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t size,
 {
 	struct module_resources *res = &mod->priv.resources;
 	struct module_resource *container;
-	void *ptr;
 
 	MEM_API_CHECK_THREAD(res);
 
@@ -246,7 +248,7 @@ void *mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t size,
 	}
 
 	/* Allocate memory for module */
-	ptr = rmalloc_align(flags, size, alignment);
+	void *ptr = sof_heap_alloc(res->heap, flags, size, alignment);
 
 	if (!ptr) {
 		comp_err(mod->dev, "Failed to alloc %zu bytes %zu alignment for comp %#x.",
@@ -276,8 +278,7 @@ EXPORT_SYMBOL(mod_alloc_ext);
  * Like comp_data_blob_handler_new() but the handler is automatically freed.
  */
 #if CONFIG_COMP_BLOB
-struct comp_data_blob_handler *
-mod_data_blob_handler_new(struct processing_module *mod)
+struct comp_data_blob_handler *mod_data_blob_handler_new(struct processing_module *mod)
 {
 	struct module_resources *res = &mod->priv.resources;
 	struct comp_data_blob_handler *bhp;
@@ -347,7 +348,7 @@ static int free_contents(struct processing_module *mod, struct module_resource *
 
 	switch (container->type) {
 	case MOD_RES_HEAP:
-		rfree(container->ptr);
+		sof_heap_free(res->heap, container->ptr);
 		res->heap_usage -= container->size;
 		return 0;
 #if CONFIG_COMP_BLOB
@@ -588,6 +589,7 @@ int module_reset(struct processing_module *mod)
 void mod_free_all(struct processing_module *mod)
 {
 	struct module_resources *res = &mod->priv.resources;
+	struct k_heap *mod_heap = res->heap;
 	struct list_item *list;
 	struct list_item *_list;
 
@@ -611,7 +613,7 @@ void mod_free_all(struct processing_module *mod)
 			container_of(list, struct container_chunk, chunk_list);
 
 		list_item_del(&chunk->chunk_list);
-		rfree(chunk);
+		sof_heap_free(mod_heap, chunk);
 	}
 
 	/* Make sure resource lists and accounting are reset */

zephyr/include/rtos/alloc.h

@@ -45,6 +45,8 @@
 #define SOF_MEM_FLAG_USER		BIT(8)
 /** \brief Indicates that if we should return shared user memory address. */
 #define SOF_MEM_FLAG_USER_SHARED_BUFFER	BIT(9)
+/** \brief Use allocation method for large buffers. */
+#define SOF_MEM_FLAG_LARGE_BUFFER	BIT(10)
 
 /** @} */
 

zephyr/lib/alloc.c

@@ -183,6 +183,11 @@ size_t get_shared_buffer_heap_size(void)
 {
 	return ROUND_DOWN(SHARED_BUFFER_HEAP_MEM_SIZE, HOST_PAGE_SIZE);
 }
+#else
+static bool is_shared_buffer_heap_pointer(void *ptr)
+{
+	return false;
+}
 #endif /* CONFIG_SOF_USERSPACE_USE_SHARED_HEAP */
 
 #if CONFIG_L3_HEAP
@@ -375,6 +380,11 @@ static int virtual_heap_init(void)
 
 SYS_INIT(virtual_heap_init, POST_KERNEL, 1);
 
+#else
+static bool is_virtual_heap_pointer(void *ptr)
+{
+	return false;
+}
 #endif /* CONFIG_VIRTUAL_HEAP */
 
 static void *heap_alloc_aligned(struct k_heap *h, size_t min_align, size_t bytes)
@@ -618,6 +628,9 @@ EXPORT_SYMBOL(rfree);
 void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 		     size_t alignment)
 {
+	if (flags & SOF_MEM_FLAG_LARGE_BUFFER)
+		return rballoc_align(flags, bytes, alignment);
+
 	if (!heap)
 		heap = &sof_heap;
 
@@ -629,6 +642,11 @@ void *sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
 
 void sof_heap_free(struct k_heap *heap, void *addr)
 {
+	if (is_virtual_heap_pointer(addr) || is_shared_buffer_heap_pointer(addr)) {
+		rfree(addr);
+		return;
+	}
+
 	if (!heap)
 		heap = &sof_heap;