userspace: helper: Add helper to derive partition attribute from pointer

Add function user_get_partition_attr() that returns the appropriate memory
partition attribute based on the address. The function returns attribute
XTENSA_MMU_CACHED_WB for cacheable addresses so that user space and kernel
space threads access memory in a consistent way.

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

Author: softwarecki

src/audio/module_adapter/library/userspace_proxy.c

@@ -61,7 +61,9 @@ static int userspace_proxy_memory_init(struct userspace_context *user_ctx,
 #if !defined(CONFIG_XTENSA_MMU_DOUBLE_MAP) && defined(CONFIG_SOF_ZEPHYR_HEAP_CACHED)
 #define HEAP_PART_CACHED
 	/* Add cached module private heap to memory partitions */
-	struct k_mem_partition heap_cached_part = { .attr = K_MEM_PARTITION_P_RW_U_RW };
+	struct k_mem_partition heap_cached_part = {
+		.attr = K_MEM_PARTITION_P_RW_U_RW | XTENSA_MMU_CACHED_WB
+	};
 
 	k_mem_region_align(&heap_cached_part.start, &heap_cached_part.size,
 			   POINTER_TO_UINT(sys_cache_cached_ptr_get(heap->init_mem)),
@@ -102,6 +104,7 @@ static int userspace_proxy_add_sections(struct userspace_context *user_ctx, uint
 
 		mem_partition.start = mod->segment[idx].v_base_addr;
 		mem_partition.size = mod->segment[idx].flags.r.length * CONFIG_MM_DRV_PAGE_SIZE;
+		mem_partition.attr |= user_get_partition_attr(mem_partition.start);
 
 		ret = k_mem_domain_add_partition(user_ctx->comp_dom, &mem_partition);
 
@@ -115,7 +118,8 @@ static int userspace_proxy_add_sections(struct userspace_context *user_ctx, uint
 
 	lib_manager_get_instance_bss_address(instance_id, mod, &va_base, &mem_partition.size);
 	mem_partition.start = POINTER_TO_UINT(va_base);
-	mem_partition.attr = K_MEM_PARTITION_P_RW_U_RW;
+	mem_partition.attr = user_get_partition_attr(mem_partition.start) |
+		K_MEM_PARTITION_P_RW_U_RW;
 	ret = k_mem_domain_add_partition(user_ctx->comp_dom, &mem_partition);
 
 	tr_dbg(&userspace_proxy_tr, "Add bss partition %p + %zx, attr = %u, ret = %d",

zephyr/include/rtos/userspace_helper.h

@@ -16,7 +16,7 @@
 #define APP_TASK_BSS
 #define APP_TASK_DATA
 #else
-
+#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, \
@@ -113,6 +113,17 @@ void module_driver_heap_remove(struct k_heap *mod_drv_heap);
  */
 int user_access_to_mailbox(struct k_mem_domain *domain, k_tid_t thread_id);
 
+/**
+ * Derive partition attribute from the pointer. If the address is cacheable, sets the cacheable
+ * attribute.
+ *
+ * @param ptr Address of the partition start
+ */
+static inline uint32_t user_get_partition_attr(uintptr_t ptr)
+{
+	return sys_cache_is_ptr_cached(UINT_TO_POINTER(ptr)) ? XTENSA_MMU_CACHED_WB : 0;
+}
+
 #else
 
 static inline int user_access_to_mailbox(struct k_mem_domain *domain, k_tid_t thread_id)