userspace: Add option to toggle driver heap for userspace modules

Introduce a configuration option to control heap sharing between userspace
module instances. When enabled, instances of the same module type share
a private heap allocated for the module driver. When disabled, each
instance maintains its own independent heap.

Rename DRV_HEAP_SIZE to more meaningful name USER_MOD_HEAP_SIZE.

This allows fine-grained control over memory isolation and resource sharing
in userspace modules.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>

Author: softwarecki

src/include/sof/audio/component.h

@@ -1214,7 +1214,7 @@ bool comp_update_performance_data(struct comp_dev *dev, uint32_t cycles_used);
 
 static inline int user_get_buffer_memory_region(const struct comp_driver *drv)
 {
-#if CONFIG_USERSPACE
+#if CONFIG_SOF_USERSPACE_USE_DRIVER_HEAP
 	return drv->user_heap ? SOF_MEM_FLAG_USER_SHARED_BUFFER : SOF_MEM_FLAG_USER;
 #else
 	return SOF_MEM_FLAG_USER;

zephyr/Kconfig

@@ -67,6 +67,14 @@ config SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE
 	help
 	  This config defines size of virtual heap region shared between all cores
 
+config SOF_USERSPACE_USE_DRIVER_HEAP
+	bool "Use driver heap for SOF userspace modules"
+	depends on USERSPACE
+	help
+	  When selected, multiple instances of the same userspace module will share
+	  a private heap created for that module's driver. Otherwise, each module
+	  instance will have its own independent private heap.
+
 config SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE
 	hex "Size of the private heap created for each userspace module"
 	default 0x1000

zephyr/include/rtos/userspace_helper.h

@@ -19,8 +19,8 @@
 
 #include <zephyr/app_memory/app_memdomain.h>
 
-#define DRV_HEAP_SIZE	ALIGN_UP(CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE, \
-				 CONFIG_MM_DRV_PAGE_SIZE)
+#define USER_MOD_HEAP_SIZE	ALIGN_UP(CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE, \
+					 CONFIG_MM_DRV_PAGE_SIZE)
 #define APP_TASK_BSS	K_APP_BMEM(common_partition)
 #define APP_TASK_DATA	K_APP_DMEM(common_partition)
 

zephyr/lib/userspace_helper.c

@@ -36,16 +36,16 @@ struct sys_heap *module_driver_heap_init(void)
 	if (!mod_drv_heap)
 		return NULL;
 
-	void *mem = rballoc_align(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, DRV_HEAP_SIZE,
+	void *mem = rballoc_align(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT, USER_MOD_HEAP_SIZE,
 				  CONFIG_MM_DRV_PAGE_SIZE);
 	if (!mem) {
 		rfree(mod_drv_heap);
 		return NULL;
 	}
 
-	sys_heap_init(mod_drv_heap, mem, DRV_HEAP_SIZE);
+	sys_heap_init(mod_drv_heap, mem, USER_MOD_HEAP_SIZE);
 	mod_drv_heap->init_mem = mem;
-	mod_drv_heap->init_bytes = DRV_HEAP_SIZE;
+	mod_drv_heap->init_bytes = USER_MOD_HEAP_SIZE;
 
 	return mod_drv_heap;
 }