scheduler: dp: fix memory leak / implicit freeing

Task memory was freed implicitly by one DP implementation and was
leaked by another one. Free it explicitly for both.

Reported-by: Jun Lai <jun.lai@dolby.com>
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/schedule/zephyr_dp_schedule.c

@@ -295,24 +295,12 @@ static int scheduler_dp_task_free(void *data, struct task *task)
 		pdata->thread_id = NULL;
 	}
 
-#ifdef CONFIG_USERSPACE
-#if CONFIG_SOF_USERSPACE_PROXY
-	if (pdata->event != &pdata->event_struct)
-		k_object_free(pdata->event);
-#else
-	k_object_free(pdata->sem);
-#endif
-	if (pdata->thread != &pdata->thread_struct)
-		k_object_free(pdata->thread);
-#endif
-
 	/* free task stack */
 	ret = user_stack_free(pdata->p_stack);
 	pdata->p_stack = NULL;
 
-	scheduler_dp_domain_free(pdata->mod);
+	scheduler_dp_internal_free(task);
 
-	/* all other memory has been allocated as a single malloc, will be freed later by caller */
 	return ret;
 }
 

src/schedule/zephyr_dp_schedule.h

@@ -58,8 +58,4 @@ void scheduler_dp_grant(k_tid_t thread_id, uint16_t core);
 int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
 			   const struct task_ops *ops, struct processing_module *mod,
 			   uint16_t core, size_t stack_size, uint32_t options);
-#if CONFIG_SOF_USERSPACE_APPLICATION
-void scheduler_dp_domain_free(struct processing_module *pmod);
-#else
-static inline void scheduler_dp_domain_free(struct processing_module *pmod) {}
-#endif
+void scheduler_dp_internal_free(struct task *task);

src/schedule/zephyr_dp_schedule_application.c

@@ -383,7 +383,7 @@ void dp_thread_fn(void *p1, void *p2, void *p3)
  * Safe to call with partial successful initialisation,
  * k_mem_domain_remove_partition() then just returns -ENOENT
  */
-void scheduler_dp_domain_free(struct processing_module *pmod)
+static void scheduler_dp_domain_free(struct processing_module *pmod)
 {
 	struct k_mem_domain *mdom = pmod->mdom;
 
@@ -398,19 +398,32 @@ void scheduler_dp_domain_free(struct processing_module *pmod)
 	objpool_free(&dp_mdom_head, mdom);
 }
 
+/* memory allocation helper structure */
+struct scheduler_dp_task_memory {
+	struct task task;
+	struct task_dp_pdata pdata;
+	struct comp_driver drv;
+	struct ipc4_flat flat;
+};
+
+void scheduler_dp_internal_free(struct task *task)
+{
+	struct task_dp_pdata *pdata = task->priv_data;
+
+	k_object_free(pdata->sem);
+	k_object_free(pdata->thread);
+	mod_free(pdata->mod, container_of(task, struct scheduler_dp_task_memory, task));
+
+	scheduler_dp_domain_free(pdata->mod);
+}
+
 /* Called only in IPC context */
 int scheduler_dp_task_init(struct task **task, const struct sof_uuid_entry *uid,
 			   const struct task_ops *ops, struct processing_module *mod,
 			   uint16_t core, size_t stack_size, uint32_t options)
 {
 	k_thread_stack_t *p_stack;
-	/* memory allocation helper structure */
-	struct {
-		struct task task;
-		struct task_dp_pdata pdata;
-		struct comp_driver drv;
-		struct ipc4_flat flat;
-	} *task_memory;
+	struct scheduler_dp_task_memory *task_memory;
 
 	int ret;
 

src/schedule/zephyr_dp_schedule_thread.c

@@ -187,7 +187,7 @@ int scheduler_dp_task_init(struct task **task,
 
 	/* memory allocation helper structure */
 	struct {
-		struct task task;
+		struct task task;		/* keep first, used for freeing below */
 		struct task_dp_pdata pdata;
 	} *task_memory;
 
@@ -308,3 +308,18 @@ int scheduler_dp_task_init(struct task **task,
 	sof_heap_free(user_heap, task_memory);
 	return ret;
 }
+
+void scheduler_dp_internal_free(struct task *task)
+{
+	struct task_dp_pdata *pdata = task->priv_data;
+
+#ifdef CONFIG_USERSPACE
+	if (pdata->event != &pdata->event_struct)
+		k_object_free(pdata->event);
+	if (pdata->thread != &pdata->thread_struct)
+		k_object_free(pdata->thread);
+#endif
+
+	/* task is the first member in task_memory above */
+	sof_heap_free(pdata->mod->dev->drv->user_heap, task);
+}