Skip to content

audio: pipeline-schedule: make pipeline_schedule_triggered() user safe #10993

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

Open
kv2019i wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

audio: pipeline-schedule: make pipeline_schedule_triggered() user safe #10993

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
18 changes: 17 additions & 1 deletion src/audio/pipeline/pipeline-schedule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,18 @@ void pipeline_schedule_triggered(struct pipeline_walk_context *ctx,
struct pipeline_data *ppl_data = ctx->comp_data;
struct list_item *tlist;
struct pipeline *p;

#ifdef CONFIG_SOF_USERSPACE_LL
/*
* In user-space irq_local_disable() is not available. Use the LL
* scheduler mutex to prevent the scheduler from processing tasks
* while pipeline state is being updated. The k_mutex is re-entrant
* so schedule_task() calls inside the critical section are safe.
*/
int sched_core = ppl_data->start->ipc_config.core;

user_ll_lock_sched(sched_core);
#else
Comment on lines +293 to +296
uint32_t flags;

#ifdef CONFIG_IPC_MAJOR_4
Expand All @@ -300,6 +312,7 @@ void pipeline_schedule_triggered(struct pipeline_walk_context *ctx,
* immediately before all pipelines achieved a consistent state.
*/
irq_local_disable(flags);
#endif

switch (cmd) {
case COMP_TRIGGER_PAUSE:
Expand Down Expand Up @@ -355,8 +368,11 @@ void pipeline_schedule_triggered(struct pipeline_walk_context *ctx,
p->xrun_bytes = 1;
}
}

#ifdef CONFIG_SOF_USERSPACE_LL
user_ll_unlock_sched(sched_core);
#else
irq_local_enable(flags);
#endif
}

int pipeline_comp_ll_task_init(struct pipeline *p)
Expand Down
Loading