module-adapter: allocate control objects on an own heap

We want to be able to serve all module memory allocations from a
private heap. This commit creates such a heap and moved struct
comp_dev and struct processing_module to it.

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

Author: lyakh

src/audio/module_adapter/module_adapter.c

@@ -74,28 +74,47 @@ struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
 		return NULL;
 	}
 
-	dev = comp_alloc(drv, sizeof(*dev));
-	if (!dev) {
-		comp_cl_err(drv, "module_adapter_new(), failed to allocate memory for comp_dev");
+#define HEAP_SIZE (8 * 1024)
+	int flags = config->proc_domain == COMP_PROCESSING_DOMAIN_DP ?
+			     SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT : SOF_MEM_FLAG_USER;
+	uint8_t *mod_heap_mem = rballoc_align(flags, HEAP_SIZE, 4096);
+
+	if (!mod_heap_mem)
 		return NULL;
-	}
-	dev->ipc_config = *config;
+
+	struct k_heap *mod_heap = (struct k_heap *)mod_heap_mem;
+	const size_t heap_pref_size = ALIGN_UP(sizeof(*mod_heap), 16);
+	void *mod_heap_buf = mod_heap_mem + heap_pref_size;
+
+	k_heap_init(mod_heap, mod_heap_buf, HEAP_SIZE - heap_pref_size);
 
 	/* allocate module information.
 	 * for DP shared modules this struct must be accessible from all cores
 	 * Unfortunately at this point there's no information of components the module
 	 * will be bound to. So we need to allocate shared memory for each DP module
 	 * To be removed when pipeline 2.0 is ready
 	 */
-	int flags = config->proc_domain == COMP_PROCESSING_DOMAIN_DP ?
-			     SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT : SOF_MEM_FLAG_USER;
 
-	mod = rzalloc(flags, sizeof(*mod));
+	mod = k_heap_alloc(mod_heap, sizeof(*mod), K_NO_WAIT);
 	if (!mod) {
-		comp_err(dev, "module_adapter_new(), failed to allocate memory for module");
+		comp_cl_err(drv, "module_adapter_new(), failed to allocate memory for module");
+		goto emod;
+	}
+
+	memset(mod, 0, sizeof(*mod));
+	mod->priv.resources.heap = mod_heap;
+	mod->priv.resources.heap_mem = mod_heap_mem;
+
+	dev = k_heap_alloc(mod_heap, sizeof(*dev), K_NO_WAIT);
+	if (!dev) {
+		comp_cl_err(drv, "module_adapter_new(), failed to allocate memory for comp_dev");
 		goto err;
 	}
 
+	memset(dev, 0, sizeof(*dev));
+	comp_init(drv, dev, sizeof(*dev));
+	dev->ipc_config = *config;
+
 	dst = &mod->priv.cfg;
 
 	module_set_private_data(mod, mod_priv);
@@ -159,13 +178,17 @@ struct comp_dev *module_adapter_new_ext(const struct comp_driver *drv,
 
 	comp_dbg(dev, "module_adapter_new() done");
 	return dev;
+
 err:
 #if CONFIG_IPC_MAJOR_4
 	if (mod)
 		rfree(mod->priv.cfg.input_pins);
 #endif
-	rfree(mod);
-	rfree(dev);
+	k_heap_free(mod_heap, dev);
+	k_heap_free(mod_heap, mod);
+emod:
+	rfree(mod_heap_mem);
+
 	return NULL;
 }
 EXPORT_SYMBOL(module_adapter_new);
@@ -1284,8 +1307,12 @@ void module_adapter_free(struct comp_dev *dev)
 	rfree(mod->priv.cfg.input_pins);
 #endif
 
-	rfree(mod);
-	rfree(dev);
+	struct k_heap *mod_heap = mod->priv.resources.heap;
+	void *mem = mod->priv.resources.heap_mem;
+
+	k_heap_free(mod_heap, mod);
+	k_heap_free(mod_heap, dev);
+	rfree(mem);
 }
 EXPORT_SYMBOL(module_adapter_free);
 

src/include/sof/audio/module_adapter/module/generic.h

@@ -132,6 +132,8 @@ struct module_resources {
 	struct list_item cont_chunk_list;	/**< Memory container chunks */
 	size_t heap_usage;
 	size_t heap_high_water_mark;
+	struct k_heap *heap;
+	void *heap_mem;
 #if CONFIG_MODULE_MEMORY_API_DEBUG && defined(__ZEPHYR__)
 	k_tid_t rsrc_mngr;
 #endif