debug

Author: softwarecki

src/audio/module_adapter/module/generic.c

@@ -419,7 +419,7 @@ __attribute__((optimize("-O0")))
 const void *z_vrfy_mod_fast_get(struct processing_module *mod, const void * const dram_ptr,
 				size_t size)
 {
-	volatile int i = 1;
+	volatile int i = 0;
 	while (i);
 	struct module_resources *res = &mod->priv.resources;
 
@@ -436,7 +436,7 @@ __attribute__((optimize("-O0")))
 void *z_vrfy_mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t size,
 			   size_t alignment)
 {
-	volatile int i = 1;
+	volatile int i = 0;
 	while (i);
 	struct module_resources *res = &mod->priv.resources;
 
@@ -450,7 +450,7 @@ void *z_vrfy_mod_alloc_ext(struct processing_module *mod, uint32_t flags, size_t
 __attribute__((optimize("-O0")))
 int z_vrfy_mod_free(struct processing_module *mod, const void *ptr)
 {
-	volatile int i = 1;
+	volatile int i = 0;
 	while (i);
 	struct module_resources *res = &mod->priv.resources;
 

zephyr/include/rtos/userspace_helper.h

@@ -21,7 +21,7 @@
 #include <zephyr/cache.h>
 #include <zephyr/app_memory/app_memdomain.h>
 
-#define USER_MOD_HEAP_SIZE	ALIGN_UP(CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE, \
+#define USER_MOD_HEAP_SIZE	ALIGN_UP(CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE + 2048, \
 					 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/fast-get.c

@@ -19,9 +19,6 @@
 #ifdef __ZEPHYR__
 #include <zephyr/logging/log.h>
 #else
-#define LOG_DBG(...) do {} while (0)
-#define LOG_INF(...) do {} while (0)
-#define LOG_WRN(...) do {} while (0)
 #define LOG_ERR(...) do {} while (0)
 #endif
 
@@ -125,7 +122,7 @@ static int fast_get_access_grant(k_tid_t thread, void *addr, size_t size)
 		.attr = K_MEM_PARTITION_P_RO_U_RO | XTENSA_MMU_CACHED_WB,
 	};
 
-	LOG_DBG("add %#zx @ %p", part.size, addr);
+	LOG_ERR("add %#zx @ %p", part.size, addr);
 	return k_mem_domain_add_partition(thread->mem_domain_info.mem_domain, &part);
 }
 #endif /* CONFIG_USERSPACE */
@@ -171,7 +168,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 	} while (!entry);
 
 #if CONFIG_USERSPACE
-	LOG_DBG("userspace %u part %#zx bytes alloc %p entry %p DRAM %p",
+	LOG_ERR("userspace %u part %#zx bytes alloc %p entry %p DRAM %p",
 		k_current_get()->mem_domain_info.mem_domain->num_partitions, size,
 		alloc_ptr, entry->sram_ptr, dram_ptr);
 #endif
@@ -193,7 +190,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 			if (k_current_get() != entry->thread &&
 			    !fast_get_domain_exists(k_current_get(), ret,
 						    ALIGN_UP(size, CONFIG_MM_DRV_PAGE_SIZE))) {
-				LOG_DBG("grant access to thread %p first was %p", k_current_get(),
+				LOG_ERR("grant access to thread %p first was %p", k_current_get(),
 					entry->thread);
 				int err = fast_get_access_grant(k_current_get(), ret, size);
 
@@ -209,7 +206,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 				dcache_invalidate_region((__sparse_force void __sparse_cache *)ret,
 							 size);
 			} else {
-				LOG_WRN("Repeated access request by thread");
+				LOG_ERR("Repeated access request by thread");
 			}
 		}
 #endif
@@ -250,7 +247,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 	entry->refcount = 1;
 out:
 	k_spin_unlock(&data->lock, key);
-	LOG_DBG("get %p, %p, size %u, refcnt %u", dram_ptr, ret, size, entry ? entry->refcount : 0);
+	LOG_ERR("get %p, %p, size %u, refcnt %u", dram_ptr, ret, size, entry ? entry->refcount : 0);
 
 	return ret;
 }
@@ -304,7 +301,7 @@ void fast_put(struct k_heap *heap, const void *sram_ptr)
 			int err = k_mem_domain_remove_partition(domain, &part);
 
 			if (err < 0)
-				LOG_WRN("partition removal failed err=%d", err);
+				LOG_ERR("partition removal failed err=%d", err);
 
 		} else
 #endif /* CONFIG_USERSPACE */
@@ -316,7 +313,7 @@ void fast_put(struct k_heap *heap, const void *sram_ptr)
 		memset(entry, 0, sizeof(*entry));
 	}
 out:
-	LOG_DBG("put %p, DRAM %p size %u refcnt %u", sram_ptr, entry ? entry->dram_ptr : 0,
+	LOG_ERR("put %p, DRAM %p size %u refcnt %u", sram_ptr, entry ? entry->dram_ptr : 0,
 		entry ? entry->size : 0, entry ? entry->refcount : 0);
 	k_spin_unlock(&data->lock, key);
 }