Revert "module: generic: add mutex to protect module_resources"

This reverts commit 7bb70f5.

Author: kv2019i

src/audio/module_adapter/module/generic.c

@@ -12,7 +12,6 @@
  */
 
 #include <rtos/symbol.h>
-#include <rtos/mutex.h>
 #include <sof/compiler_attributes.h>
 #include <sof/objpool.h>
 #include <sof/audio/module_adapter/module/generic.h>
@@ -89,7 +88,6 @@ void mod_resource_init(struct processing_module *mod)
 	struct module_resources *res = &mod->priv.resources;
 
 	/* Init memory list */
-	k_mutex_init(&res->lock);
 	list_init(&res->objpool.list);
 	res->objpool.heap = res->alloc->heap;
 	res->objpool.vreg = res->alloc->vreg;
@@ -194,18 +192,13 @@ void *z_impl_mod_balloc_align(struct processing_module *mod, size_t size, size_t
 
 	MEM_API_CHECK_THREAD(res);
 
-	k_mutex_lock(&res->lock, K_FOREVER);
-
 	container = container_get(mod);
-	if (!container) {
-		k_mutex_unlock(&res->lock);
+	if (!container)
 		return NULL;
-	}
 
 	if (!size) {
 		comp_err(mod->dev, "requested allocation of 0 bytes.");
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 
@@ -217,7 +210,6 @@ void *z_impl_mod_balloc_align(struct processing_module *mod, size_t size, size_t
 		comp_err(mod->dev, "Failed to alloc %zu bytes %zu alignment for comp %#x.",
 			 size, alignment, dev_comp_id(mod->dev));
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 	/* Store reference to allocated memory */
@@ -229,7 +221,6 @@ void *z_impl_mod_balloc_align(struct processing_module *mod, size_t size, size_t
 	if (res->heap_usage > res->heap_high_water_mark)
 		res->heap_high_water_mark = res->heap_usage;
 
-	k_mutex_unlock(&res->lock);
 	return ptr;
 }
 EXPORT_SYMBOL(z_impl_mod_balloc_align);
@@ -252,18 +243,13 @@ void *z_impl_mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t
 
 	MEM_API_CHECK_THREAD(res);
 
-	k_mutex_lock(&res->lock, K_FOREVER);
-
 	container = container_get(mod);
-	if (!container) {
-		k_mutex_unlock(&res->lock);
+	if (!container)
 		return NULL;
-	}
 
 	if (!size) {
 		comp_err(mod->dev, "requested allocation of 0 bytes.");
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 
@@ -274,7 +260,6 @@ void *z_impl_mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t
 		comp_err(mod->dev, "Failed to alloc %zu bytes %zu alignment for comp %#x.",
 			 size, alignment, dev_comp_id(mod->dev));
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 	/* Store reference to allocated memory */
@@ -286,7 +271,6 @@ void *z_impl_mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t
 	if (res->heap_usage > res->heap_high_water_mark)
 		res->heap_high_water_mark = res->heap_usage;
 
-	k_mutex_unlock(&res->lock);
 	return ptr;
 }
 EXPORT_SYMBOL(z_impl_mod_alloc_ext);
@@ -301,32 +285,26 @@ EXPORT_SYMBOL(z_impl_mod_alloc_ext);
 #if CONFIG_COMP_BLOB
 struct comp_data_blob_handler *z_impl_mod_data_blob_handler_new(struct processing_module *mod)
 {
-	struct module_resources *res = &mod->priv.resources;
+	struct module_resources * __maybe_unused res = &mod->priv.resources;
 	struct comp_data_blob_handler *bhp;
 	struct module_resource *container;
 
 	MEM_API_CHECK_THREAD(res);
 
-	k_mutex_lock(&res->lock, K_FOREVER);
-
 	container = container_get(mod);
-	if (!container) {
-		k_mutex_unlock(&res->lock);
+	if (!container)
 		return NULL;
-	}
 
 	bhp = comp_data_blob_handler_new_ext(mod->dev, false, NULL, NULL);
 	if (!bhp) {
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 
 	container->bhp = bhp;
 	container->size = 0;
 	container->type = MOD_RES_BLOB_HANDLER;
 
-	k_mutex_unlock(&res->lock);
 	return bhp;
 }
 EXPORT_SYMBOL(z_impl_mod_data_blob_handler_new);
@@ -349,26 +327,20 @@ const void *z_impl_mod_fast_get(struct processing_module *mod, const void * cons
 
 	MEM_API_CHECK_THREAD(res);
 
-	k_mutex_lock(&res->lock, K_FOREVER);
-
 	container = container_get(mod);
-	if (!container) {
-		k_mutex_unlock(&res->lock);
+	if (!container)
 		return NULL;
-	}
 
 	ptr = fast_get(res->alloc, dram_ptr, size);
 	if (!ptr) {
 		container_put(mod, container);
-		k_mutex_unlock(&res->lock);
 		return NULL;
 	}
 
 	container->sram_ptr = ptr;
 	container->size = 0;
 	container->type = MOD_RES_FAST_GET;
 
-	k_mutex_unlock(&res->lock);
 	return ptr;
 }
 EXPORT_SYMBOL(z_impl_mod_fast_get);
@@ -446,12 +418,8 @@ int z_impl_mod_free(struct processing_module *mod, const void *ptr)
 
 	/* Find which container holds this memory */
 	struct mod_res_cb_arg cb_arg = {mod, ptr};
-
-	k_mutex_lock(&res->lock, K_FOREVER);
 	int ret = objpool_iterate(&res->objpool, mod_res_free, &cb_arg);
 
-	k_mutex_unlock(&res->lock);
-
 	if (ret < 0)
 		comp_err(mod->dev, "error: could not find memory pointed by %p", ptr);
 
@@ -765,10 +733,8 @@ void mod_free_all(struct processing_module *mod)
 	/* Free all contents found in used containers */
 	struct mod_res_cb_arg cb_arg = {mod, NULL};
 
-	k_mutex_lock(&res->lock, K_FOREVER);
 	objpool_iterate(&res->objpool, mod_res_free, &cb_arg);
 	objpool_prune(&res->objpool);
-	k_mutex_unlock(&res->lock);
 
 	/* Make sure resource lists and accounting are reset */
 	mod_resource_init(mod);

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

@@ -13,7 +13,6 @@
 #ifndef __SOF_AUDIO_MODULE_GENERIC__
 #define __SOF_AUDIO_MODULE_GENERIC__
 
-#include <rtos/mutex.h>
 #include <sof/objpool.h>
 #include <sof/ut.h>
 #include <sof/audio/component.h>
@@ -130,7 +129,6 @@ struct module_param {
  * when the module unloads.
  */
 struct module_resources {
-	struct k_mutex lock;
 	struct objpool_head objpool;
 	size_t heap_usage;
 	size_t heap_high_water_mark;