reszta helper (user_remove_memory add_user_memory)

Author: softwarecki

zephyr/include/rtos/userspace_helper.h

@@ -12,10 +12,19 @@
 #ifndef __ZEPHYR_LIB_USERSPACE_HELPER_H__
 #define __ZEPHYR_LIB_USERSPACE_HELPER_H__
 
-#ifdef CONFIG_USERSPACE
+#include <zephyr/sys/sys_heap.h>
+#include <zephyr/sys/sem.h>
+#include <zephyr/app_memory/app_memdomain.h>
+
+#ifndef CONFIG_USERSPACE
+#define APP_TASK_DATA
+#else
 #define DRV_HEAP_SIZE	ALIGN_UP(CONFIG_SOF_ZEPHYR_USERSPACE_MODULE_HEAP_SIZE, \
 				 CONFIG_MM_DRV_PAGE_SIZE)
 
+#define APP_TASK_BSS	K_APP_BMEM(common_partition)
+#define APP_TASK_DATA	K_APP_DMEM(common_partition)
+
 struct processing_module;
 struct userspace_context;
 
@@ -33,6 +42,40 @@ struct userspace_context;
  */
 struct sys_heap *drv_heap_init(void);
 
+void *drv_heap_alloc(struct sys_heap *drv_heap, size_t bytes);
+
+/**
+ * Add memory region to non-privileged module memory domain.
+ * @param domain - pointer to the modules memory domain.
+ * @param addr   - pointer to memory region start
+ * @param size   - size of the memory region
+ * @param attr   - memory region access attributes
+ *
+ * @return 0 for success, error otherwise.
+ *
+ * @note
+ * Function used only when CONFIG_USERSPACE is set.
+ * Function adds page aligned region to the memory domain.
+ * Caller should take care to not expose other data than these
+ * intended to be shared with the module.
+ */
+int user_add_memory(struct k_mem_domain *domain, uintptr_t addr, size_t size, uint32_t attr);
+
+/**
+ * Remove memory region from non-privileged module memory domain.
+ * @param domain - pointer to the modules memory domain.
+ * @param addr   - pointer to memory region start
+ * @param size   - size of the memory region
+ *
+ * @return 0 for success, error otherwise.
+ *
+ * @note
+ * Function used only when CONFIG_USERSPACE is set.
+ * Function removes previously added page aligned region
+ * from the memory domain.
+ */
+int user_remove_memory(struct k_mem_domain *domain, uintptr_t addr, size_t size);
+
 /**
  * Add DP scheduler created thread to module memory domain.
  * @param thread_id - id of thread to be added to memory domain.

zephyr/lib/userspace_helper.c

@@ -148,6 +148,47 @@ int user_stack_free(void *p_stack)
 	return k_thread_stack_free((__sparse_force void *)p_stack);
 }
 
+int user_add_memory(struct k_mem_domain *domain, uintptr_t addr, size_t size, uint32_t attr)
+{
+	uintptr_t addr_aligned;
+	size_t size_aligned;
+	int ret;
+
+	k_mem_region_align(&addr_aligned, &size_aligned, (uintptr_t)addr, size, HOST_PAGE_SIZE);
+	/* Define parameters for partition */
+	struct k_mem_partition part;
+	part.start = addr_aligned;
+	part.size = size_aligned;
+	part.attr = attr;
+	ret = k_mem_domain_add_partition(domain, &part);
+	/* -EINVAL means that given page is already in the domain */
+	/* Not an error case for us. */
+	if (ret == -EINVAL)
+		return 0;
+
+	return ret;
+}
+
+int user_remove_memory(struct k_mem_domain *domain, uintptr_t addr, size_t size)
+{
+	uintptr_t addr_aligned;
+	size_t size_aligned;
+	int ret;
+
+	/* Define parameters for user_partition */
+	k_mem_region_align(&addr_aligned, &size_aligned, (uintptr_t)addr, size, HOST_PAGE_SIZE);
+	struct k_mem_partition part;
+	part.start = addr_aligned;
+	part.size = size_aligned;
+	ret = k_mem_domain_remove_partition(domain, &part);
+	/* -ENOENT means that given partition is already removed */
+	/* Not an error case for us. */
+	if (ret == -ENOENT)
+		return 0;
+
+	return ret;
+}
+
 int user_memory_init_shared(k_tid_t thread_id, struct processing_module *mod)
 {
 	struct k_mem_domain *comp_dom = mod->user_ctx->comp_dom;