audio: module_adapter: make data_blob compatible with user-space

Use user-space friendy sof_heap_alloc() for dynamic allocations
in data_blob handler.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/audio/data_blob.c

@@ -29,6 +29,7 @@ struct comp_data_blob_handler {
 	uint32_t single_blob:1; /**< Allocate only one blob. Module can not
 				  *  be active while reconfguring.
 				  */
+	struct k_heap *heap;		/**< heap for user-safe alloc, or NULL */
 	void *(*alloc)(size_t size);	/**< alternate allocator, maybe null */
 	void (*free)(void *buf);	/**< alternate free(), maybe null */
 
@@ -632,23 +633,52 @@ static void default_free(void *buf)
 	rfree(buf);
 }
 
+static void *default_heap_alloc(size_t size)
+{
+	return sof_heap_alloc(sof_sys_user_heap_get(),
+			      SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
+			      size, 0);
+}
+
+static void default_heap_free(void *buf)
+{
+	sof_heap_free(sof_sys_user_heap_get(), buf);
+}
+
 struct comp_data_blob_handler *
 comp_data_blob_handler_new_ext(struct comp_dev *dev, bool single_blob,
 			       void *(*alloc)(size_t size),
-			       void (*free)(void *buf))
+			       void (*free)(void *buf),
+			       struct k_heap *heap)
 {
 	struct comp_data_blob_handler *handler;
 
 	comp_dbg(dev, "entry");
 
-	handler = rzalloc(SOF_MEM_FLAG_USER,
-			  sizeof(struct comp_data_blob_handler));
+	if (heap)
+		handler = sof_heap_alloc(heap,
+					SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
+					sizeof(struct comp_data_blob_handler), 0);
+	else
+		handler = rzalloc(SOF_MEM_FLAG_USER,
+				  sizeof(struct comp_data_blob_handler));
 
 	if (handler) {
+		if (heap)
+			memset(handler, 0, sizeof(*handler));
 		handler->dev = dev;
 		handler->single_blob = single_blob;
-		handler->alloc = alloc ? alloc : default_alloc;
-		handler->free = free ? free : default_free;
+		handler->heap = heap;
+		if (alloc) {
+			handler->alloc = alloc;
+			handler->free = free ? free : default_free;
+		} else if (heap) {
+			handler->alloc = default_heap_alloc;
+			handler->free = default_heap_free;
+		} else {
+			handler->alloc = default_alloc;
+			handler->free = free ? free : default_free;
+		}
 	}
 
 	return handler;
@@ -662,6 +692,9 @@ void comp_data_blob_handler_free(struct comp_data_blob_handler *blob_handler)
 
 	comp_free_data_blob(blob_handler);
 
-	rfree(blob_handler);
+	if (blob_handler->heap)
+		sof_heap_free(blob_handler->heap, blob_handler);
+	else
+		rfree(blob_handler);
 }
 EXPORT_SYMBOL(comp_data_blob_handler_free);

src/audio/module_adapter/module/generic.c

@@ -283,7 +283,7 @@ EXPORT_SYMBOL(z_impl_mod_alloc_ext);
 #if CONFIG_COMP_BLOB
 struct comp_data_blob_handler *mod_data_blob_handler_new(struct processing_module *mod)
 {
-	struct module_resources * __maybe_unused res = &mod->priv.resources;
+	struct module_resources *res = &mod->priv.resources;
 	struct comp_data_blob_handler *bhp;
 	struct module_resource *container;
 
@@ -293,7 +293,7 @@ struct comp_data_blob_handler *mod_data_blob_handler_new(struct processing_modul
 	if (!container)
 		return NULL;
 
-	bhp = comp_data_blob_handler_new_ext(mod->dev, false, NULL, NULL);
+	bhp = comp_data_blob_handler_new_ext(mod->dev, false, NULL, NULL, res->heap);
 	if (!bhp) {
 		container_put(mod, container);
 		return NULL;

src/include/sof/audio/data_blob.h

@@ -12,6 +12,7 @@
 #include <rtos/sof.h>
 
 struct comp_dev;
+struct k_heap;
 
 struct comp_data_blob_handler;
 
@@ -113,11 +114,13 @@ int comp_data_blob_get_cmd(struct comp_data_blob_handler *blob_handler,
  * @param single_blob Set true for single configuration blob operation
  * @param alloc Optional blob memory allocator function pointer
  * @param free Optional blob memory free function pointer
+ * @param heap Optional heap for user-safe allocation, or NULL for default
  */
 struct comp_data_blob_handler *
 comp_data_blob_handler_new_ext(struct comp_dev *dev, bool single_blob,
 			       void *(*alloc)(size_t size),
-			       void (*free)(void *buf));
+			       void (*free)(void *buf),
+			       struct k_heap *heap);
 
 /**
  * Returns new data blob handler.
@@ -130,7 +133,7 @@ comp_data_blob_handler_new_ext(struct comp_dev *dev, bool single_blob,
 static inline
 struct comp_data_blob_handler *comp_data_blob_handler_new(struct comp_dev *dev)
 {
-	return comp_data_blob_handler_new_ext(dev, false, NULL, NULL);
+	return comp_data_blob_handler_new_ext(dev, false, NULL, NULL, NULL);
 }
 
 /**