userspace: proxy: Add support for llext modules

Add support for userspace llext loadable modules to the userspace proxy.
Call lib_manager_start_agent unconditionally, even when the system agent
is not used, as this function is responsible for creating the userspace
module proxy.

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

Author: softwarecki

src/audio/module_adapter/library/userspace_proxy.c

@@ -26,6 +26,7 @@
 #include <stdint.h>
 
 #include <sof/lib_manager.h>
+#include <sof/llext_manager.h>
 #include <sof/audio/component.h>
 #include <sof/schedule/dp_schedule.h>
 #include <rtos/userspace_helper.h>
@@ -163,6 +164,7 @@ static int user_work_item_init(struct userspace_context *user_ctx, struct k_heap
 	work_item->event = &worker.event;
 #endif
 	work_item->params.context = user_ctx;
+	work_item->params.mod = NULL;
 	user_ctx->work_item = work_item;
 
 	return 0;
@@ -382,7 +384,7 @@ static int userspace_proxy_start_agent(struct userspace_context *user_ctx,
 }
 
 int userspace_proxy_create(struct userspace_context **user_ctx, const struct comp_driver *drv,
-			   const struct sof_man_module *manifest, system_agent_start_fn start_fn,
+			   const struct sof_man_module *manifest, system_agent_start_fn agent_fn,
 			   const struct system_agent_params *agent_params,
 			   const void **agent_interface, const struct module_interface **ops)
 {
@@ -410,15 +412,20 @@ int userspace_proxy_create(struct userspace_context **user_ctx, const struct com
 	if (ret)
 		goto error_dom;
 
-	ret = userspace_proxy_add_sections(context, agent_params->instance_id, manifest);
+	if (agent_fn)
+		ret = userspace_proxy_add_sections(context, agent_params->instance_id, manifest);
+	else
+		/* llext modules do not use the system agent. */
+		ret = llext_manager_add_domain(agent_params->module_id, domain);
+
 	if (ret)
 		goto error_dom;
 
 	ret = user_work_item_init(context, drv->user_heap);
 	if (ret)
 		goto error_dom;
 
-	ret = userspace_proxy_start_agent(context, start_fn, agent_params, agent_interface);
+	ret = userspace_proxy_start_agent(context, agent_fn, agent_params, agent_interface);
 	if (ret) {
 		tr_err(&userspace_proxy_tr, "System agent failed with error %d.", ret);
 		goto error_work_item;

src/library_manager/lib_manager.c

@@ -543,12 +543,14 @@ static int lib_manager_start_agent(const struct comp_driver *drv,
 		return ret;
 	}
 #endif /* CONFIG_SOF_USERSPACE_PROXY */
+	if (agent) {
+		ret = agent(&agent_params, agent_interface);
+		if (ret)
+			tr_err(&lib_manager_tr, "System agent start failed %d!", ret);
+		return ret;
+	}
 
-	ret = agent(&agent_params, agent_interface);
-	if (ret)
-		tr_err(&lib_manager_tr, "System agent start failed %d!", ret);
-
-	return ret;
+	return 0;
 }
 
 enum buildinfo_mod_type { MOD_TYPE_INVALID, MOD_TYPE_IADK, MOD_TYPE_LMDK, MOD_TYPE_LLEXT };
@@ -654,6 +656,7 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
 	case MOD_TYPE_LLEXT:
 		agent = NULL;
 		ops = (const struct module_interface *)module_entry_point;
+		agent_iface = NULL;
 		break;
 	case MOD_TYPE_LMDK:
 		agent = &native_system_agent_start;
@@ -671,12 +674,10 @@ static struct comp_dev *lib_manager_module_create(const struct comp_driver *drv,
 	}
 
 	/* At this point module resources are allocated and it is moved to L2 memory. */
-	if (agent) {
-		ret = lib_manager_start_agent(drv, config, mod, args, module_entry_point, agent,
-					      agent_iface, &userspace, &ops);
-		if (ret)
-			goto err;
-	}
+	ret = lib_manager_start_agent(drv, config, mod, args, module_entry_point, agent,
+					agent_iface, &userspace, &ops);
+	if (ret)
+		goto err;
 
 	if (comp_set_adapter_ops(drv, ops) < 0)
 		goto err;