Skip to content

schedule: ll: moce sys_sem to static memory #11034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lyakh wants to merge 1 commit into from
Closed

schedule: ll: moce sys_sem to static memory #11034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions src/schedule/zephyr_ll.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,14 @@ struct zephyr_ll {
struct k_heap *heap;
};

/* sys_sem objects must be statically allocated and in kernel memory */
static struct sys_sem ll_sem[CONFIG_CORE_COUNT];

/* per-task scheduler data */
struct zephyr_ll_pdata {
bool run;
bool freeing;
struct sys_sem sem;
struct sys_sem *sem;
};
Comment on lines +41 to 49

#if CONFIG_SOF_USERSPACE_LL
Expand Down Expand Up @@ -132,12 +135,16 @@ static void zephyr_ll_task_done(struct zephyr_ll *sch,

task->state = SOF_TASK_STATE_FREE;

if (pdata->freeing)
if (pdata->freeing) {
/*
* zephyr_ll_task_free() is trying to free this task. Complete
* it and signal the semaphore to let the function proceed
*/
sys_sem_give(&pdata->sem);
int ret = sys_sem_give(pdata->sem);

if (ret < 0)
tr_err(&ll_tr, "sys_sem_give() err: %d", ret);
}

tr_info(&ll_tr, "task complete %p %pU", task, task->uid);
tr_info(&ll_tr, "num_tasks %d total_num_tasks %ld",
Expand Down Expand Up @@ -504,9 +511,13 @@ static int zephyr_ll_task_free(void *data, struct task *task)

zephyr_ll_unlock(sch, &flags);

if (must_wait)
if (must_wait) {
/* Wait for up to 100 periods */
sys_sem_take(&pdata->sem, K_USEC(LL_TIMER_PERIOD_US * 100));
int ret = sys_sem_take(pdata->sem, K_USEC(LL_TIMER_PERIOD_US * 100));

if (ret < 0)
tr_err(&ll_tr, "sys_sem_take() err: %d", ret);
}
Comment on lines +514 to +520

/* Protect against racing with schedule_task() */
zephyr_ll_lock(sch, &flags);
Expand Down Expand Up @@ -698,8 +709,9 @@ int zephyr_ll_task_init(struct task *task,
}

memset(pdata, 0, sizeof(*pdata));
pdata->sem = ll_sem + core;

sys_sem_init(&pdata->sem, 0, 1);
sys_sem_init(pdata->sem, 0, 1);

task->priv_data = pdata;

Expand Down
Loading