llext_manager: map detached sections for mmu

This patch will set permissions for detached sections
if MMU is enabled

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>

Author: abonislawski

src/library_manager/llext_manager.c

@@ -30,6 +30,7 @@
 #include <zephyr/llext/llext.h>
 #include <zephyr/logging/log_ctrl.h>
 #include <zephyr/llext/inspect.h>
+#include <kernel_arch_interface.h>
 
 #include <rimage/sof/user/manifest.h>
 #include <module/module/api_ver.h>
@@ -71,6 +72,32 @@ static int llext_manager_align_unmap(void __sparse_cache *vma, size_t size)
 	return sys_mm_drv_unmap_region(aligned_vma, ALIGN_UP(pre_pad_size + size, PAGE_SZ));
 }
 
+static void llext_manager_detached_map(void __sparse_cache *vma, size_t size, uint32_t flags)
+{
+#ifdef CONFIG_MMU
+	size_t pre_pad_size = (uintptr_t)vma & (PAGE_SZ - 1);
+	void *aligned_vma = (__sparse_force uint8_t *)vma - pre_pad_size;
+
+	/* Use cached virtual address */
+	uintptr_t va = POINTER_TO_UINT(sys_cache_cached_ptr_get(aligned_vma));
+
+	arch_mem_map(aligned_vma, va, ALIGN_UP(pre_pad_size + size, PAGE_SZ), flags);
+#endif
+}
+
+static void llext_manager_detached_unmap(void __sparse_cache *vma, size_t size)
+{
+#ifdef CONFIG_MMU
+	size_t pre_pad_size = (uintptr_t)vma & (PAGE_SZ - 1);
+	void *aligned_vma = (__sparse_force uint8_t *)vma - pre_pad_size;
+
+	/* Use cached virtual address */
+	void *va = sys_cache_cached_ptr_get(aligned_vma);
+
+	arch_mem_unmap(va, ALIGN_UP(pre_pad_size + size, PAGE_SZ));
+#endif
+}
+
 /*
  * Map the memory range covered by 'vma' and 'size' as writable, copy all
  * sections that belong to the specified 'region' and are contained in the
@@ -107,8 +134,16 @@ static int llext_manager_load_data_from_storage(const struct llext_loader *ldr,
 
 		/* skip detached sections (will be outside requested VMA area) */
 		if ((uintptr_t)shdr->sh_addr < (uintptr_t)vma ||
-		    (uintptr_t)shdr->sh_addr >= (uintptr_t)vma + size)
+		    (uintptr_t)shdr->sh_addr >= (uintptr_t)vma + size) {
+			llext_manager_detached_map((__sparse_force void *)
+						   ((uint8_t *)region_addr + s_offset),
+						   shdr->sh_size, flags);
+			if (flags & SYS_MM_MEM_PERM_EXEC)
+				icache_invalidate_region((__sparse_force void *)
+							 ((uint8_t *)region_addr + s_offset),
+							 shdr->sh_size);
 			continue;
+		}
 
 		ret = memcpy_s((__sparse_force void *)shdr->sh_addr, size - s_offset,
 			       (const uint8_t *)region_addr + s_offset, shdr->sh_size);
@@ -129,6 +164,39 @@ static int llext_manager_load_data_from_storage(const struct llext_loader *ldr,
 	return ret;
 }
 
+static void llext_manager_unmap_detached_sections(const struct llext_loader *ldr,
+						  const struct llext *ext,
+						  enum llext_mem region,
+						  void __sparse_cache *vma,
+						  size_t size)
+{
+#ifdef CONFIG_MMU
+	unsigned int i;
+	const void *region_addr;
+
+	llext_get_region_info(ldr, ext, region, NULL, &region_addr, NULL);
+
+	for (i = 0; i < llext_section_count(ext); i++) {
+		const elf_shdr_t *shdr;
+		enum llext_mem s_region = LLEXT_MEM_COUNT;
+		size_t s_offset = 0;
+
+		llext_get_section_info(ldr, ext, i, &shdr, &s_region, &s_offset);
+
+		/* skip sections not in the requested region */
+		if (s_region != region)
+			continue;
+
+		/* unmap detached sections (will be outside requested VMA area) */
+		if ((uintptr_t)shdr->sh_addr < (uintptr_t)vma ||
+		    (uintptr_t)shdr->sh_addr >= (uintptr_t)vma + size)
+			llext_manager_detached_unmap((__sparse_force void *)
+						     ((uint8_t *)region_addr + s_offset),
+						     shdr->sh_size);
+	}
+#endif
+}
+
 static int llext_manager_load_module(struct lib_manager_module *mctx)
 {
 	/* Executable code (.text) */
@@ -216,6 +284,9 @@ static int llext_manager_load_module(struct lib_manager_module *mctx)
 
 static int llext_manager_unload_module(struct lib_manager_module *mctx)
 {
+	const struct llext_loader *ldr = &mctx->ebl->loader;
+	const struct llext *ext = mctx->llext;
+
 	/* Executable code (.text) */
 	void __sparse_cache *va_base_text = (void __sparse_cache *)
 		mctx->segment[LIB_MANAGER_TEXT].addr;
@@ -232,14 +303,20 @@ static int llext_manager_unload_module(struct lib_manager_module *mctx)
 	size_t data_size = mctx->segment[LIB_MANAGER_DATA].size;
 	int err = 0, ret;
 
+	llext_manager_unmap_detached_sections(ldr, ext, LLEXT_MEM_TEXT,
+					      va_base_text, text_size);
 	ret = llext_manager_align_unmap(va_base_text, text_size);
 	if (ret < 0)
 		err = ret;
 
+	llext_manager_unmap_detached_sections(ldr, ext, LLEXT_MEM_DATA,
+					      va_base_data, data_size);
 	ret = llext_manager_align_unmap(va_base_data, data_size);
 	if (ret < 0 && !err)
 		err = ret;
 
+	llext_manager_unmap_detached_sections(ldr, ext, LLEXT_MEM_RODATA,
+					      va_base_rodata, rodata_size);
 	ret = llext_manager_align_unmap(va_base_rodata, rodata_size);
 	if (ret < 0 && !err)
 		err = ret;

zephyr/CMakeLists.txt

@@ -163,9 +163,9 @@ zephyr_library_named(modules_sof)
 # Zephyr C++ code requires 14 or newer standard
 set_property(TARGET modules_sof PROPERTY CXX_STANDARD 17)
 
-zephyr_include_directories(
-	include
-)
+zephyr_include_directories(include)
+zephyr_include_directories(${ZEPHYR_BASE}/kernel/include)
+zephyr_include_directories(${ZEPHYR_BASE}/arch/${ARCH}/include)
 
 # SOC level sources
 # Files that are commented may not be needed.