llext: call llext_unload() internally

Currently lib_manager_module_free() first checks, if an LLEXT module
is being freed. If so, it first calls llext_unload() and then - if
the use-count is reported as zero, calls llext_manager_free_module().
Simplify this process by just calling llext_manager_free_module() and
letting it handle llext_unload() internally.

Signed-off-by: Guennadi Liakhovetski <[email protected]>

Author: lyakh

src/library_manager/lib_manager.c

@@ -556,18 +556,15 @@ static void lib_manager_module_free(struct comp_dev *dev)
 	struct processing_module *mod = comp_mod(dev);
 	const struct comp_ipc_config *const config = &mod->dev->ipc_config;
 	const uint32_t module_id = config->id;
-	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(module_id);
 	int ret;
 
 	/* This call invalidates dev, mod and config pointers! */
 	module_adapter_free(dev);
 
-	if (!ctx->llext || !llext_unload(&ctx->llext)) {
-		/* Free module resources allocated in L2 memory. */
-		ret = lib_manager_free_module(module_id);
-		if (ret < 0)
-			comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
-	}
+	/* Free module resources allocated in L2 memory. */
+	ret = lib_manager_free_module(module_id);
+	if (ret < 0)
+		comp_err(dev, "modules_free(), lib_manager_free_module() failed!");
 }
 
 static void lib_manager_prepare_module_adapter(struct comp_driver *drv, const struct sof_uuid *uuid)

src/library_manager/llext_manager.c

@@ -352,9 +352,19 @@ int llext_manager_free_module(const uint32_t component_id)
 	const uint32_t module_id = IPC4_MOD_ID(component_id);
 	const unsigned int base_module_id = LIB_MANAGER_GET_LIB_ID(module_id) <<
 		LIB_MANAGER_LIB_ID_SHIFT;
+	struct lib_manager_mod_ctx *ctx = lib_manager_get_mod_ctx(base_module_id);
 
 	tr_dbg(&lib_manager_tr, "mod_id: %#x", component_id);
 
+	if (!ctx->llext) {
+		tr_err(&lib_manager_tr, "NULL llext: ID %#x ctx %p", component_id, ctx);
+		return -ENOENT;
+	}
+
+	if (llext_unload(&ctx->llext))
+		/* More users are active */
+		return 0;
+
 	mod = lib_manager_get_module_manifest(base_module_id);
 
 	return llext_manager_unload_module(base_module_id, mod);