Skip to content

audio: module_adapter: use system user heap for allocs #10843

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
+30 −16
Open

audio: module_adapter: use system user heap for allocs #10843

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
46 changes: 30 additions & 16 deletions src/audio/module_adapter/module_adapter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,12 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
}
mod_heap = NULL;
Copy link
Copy Markdown
Collaborator Author

@kv2019i kv2019i Jun 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is valid, but the USERSPACE_LL build doesn't yet support the DP usage, so this is not the only problem that would be faced. So I think better to leave it like now and not add steps to DP support (that we know already now are incomplete).

} else {
#ifdef CONFIG_SOF_USERSPACE_LL
mod_heap = sof_sys_user_heap_get();
comp_cl_dbg(drv, "using ll user heap for module");
#else
mod_heap = drv->user_heap;
#endif
heap_size = 0;
mod_vreg = NULL;
}
Expand All @@ -118,7 +123,7 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
goto emod;
}

struct mod_alloc_ctx *alloc = rmalloc(flags, sizeof(*alloc));
struct mod_alloc_ctx *alloc = sof_heap_alloc(mod_heap, flags, sizeof(*alloc), 0);

if (!alloc)
goto ealloc;
Expand Down Expand Up @@ -154,7 +159,7 @@ static struct processing_module *module_adapter_mem_alloc(const struct comp_driv
return mod;

edev:
rfree(alloc);
sof_heap_free(mod_heap, alloc);
ealloc:
if (mod_vreg)
vregion_free(mod_vreg, mod);
Expand Down Expand Up @@ -184,11 +189,11 @@ static void module_adapter_mem_free(struct processing_module *mod)
vregion_free(mod_vreg, mod->dev);
vregion_free(mod_vreg, mod);
if (!vregion_put(mod_vreg))
rfree(alloc);
sof_heap_free(alloc->heap, alloc);
} else {
sof_heap_free(mod_heap, mod->dev);
sof_heap_free(mod_heap, mod);
rfree(alloc);
sof_heap_free(mod_heap, alloc);
}
}

Expand Down Expand Up @@ -527,24 +532,28 @@ int module_adapter_prepare(struct comp_dev *dev)
/* allocate memory for input buffers */
if (mod->max_sources) {
mod->input_buffers =
rzalloc(memory_flags, sizeof(*mod->input_buffers) * mod->max_sources);
sof_heap_alloc(sof_sys_user_heap_get(), memory_flags,
sizeof(*mod->input_buffers) * mod->max_sources, 0);
if (!mod->input_buffers) {
comp_err(dev, "failed to allocate input buffers");
return -ENOMEM;
}
memset(mod->input_buffers, 0, sizeof(*mod->input_buffers) * mod->max_sources);
} else {
mod->input_buffers = NULL;
}

/* allocate memory for output buffers */
if (mod->max_sinks) {
mod->output_buffers =
rzalloc(memory_flags, sizeof(*mod->output_buffers) * mod->max_sinks);
sof_heap_alloc(sof_sys_user_heap_get(), memory_flags,
sizeof(*mod->output_buffers) * mod->max_sinks, 0);
if (!mod->output_buffers) {
comp_err(dev, "failed to allocate output buffers");
ret = -ENOMEM;
goto in_out_free;
}
memset(mod->output_buffers, 0, sizeof(*mod->output_buffers) * mod->max_sinks);
} else {
mod->output_buffers = NULL;
}
Expand Down Expand Up @@ -605,7 +614,8 @@ int module_adapter_prepare(struct comp_dev *dev)
size_t size = MAX(mod->deep_buff_bytes, mod->period_bytes);

list_for_item(blist, &dev->bsource_list) {
mod->input_buffers[i].data = rballoc(memory_flags, size);
mod->input_buffers[i].data = sof_heap_alloc(sof_sys_user_heap_get(),
memory_flags, size, 0);
if (!mod->input_buffers[i].data) {
comp_err(mod->dev, "Failed to alloc input buffer data");
ret = -ENOMEM;
Expand All @@ -617,7 +627,9 @@ int module_adapter_prepare(struct comp_dev *dev)
/* allocate memory for output buffer data */
i = 0;
list_for_item(blist, &dev->bsink_list) {
mod->output_buffers[i].data = rballoc(memory_flags, md->mpd.out_buff_size);
mod->output_buffers[i].data = sof_heap_alloc(sof_sys_user_heap_get(),
memory_flags,
md->mpd.out_buff_size, 0);
if (!mod->output_buffers[i].data) {
comp_err(mod->dev, "Failed to alloc output buffer data");
ret = -ENOMEM;
Expand Down Expand Up @@ -686,16 +698,16 @@ int module_adapter_prepare(struct comp_dev *dev)

out_data_free:
for (i = 0; i < mod->num_of_sinks; i++)
rfree(mod->output_buffers[i].data);
sof_heap_free(sof_sys_user_heap_get(), mod->output_buffers[i].data);

in_data_free:
for (i = 0; i < mod->num_of_sources; i++)
rfree(mod->input_buffers[i].data);
sof_heap_free(sof_sys_user_heap_get(), mod->input_buffers[i].data);

in_out_free:
rfree(mod->output_buffers);
sof_heap_free(sof_sys_user_heap_get(), mod->output_buffers);
mod->output_buffers = NULL;
rfree(mod->input_buffers);
sof_heap_free(sof_sys_user_heap_get(), mod->input_buffers);
mod->input_buffers = NULL;
return ret;
}
Expand Down Expand Up @@ -1407,14 +1419,16 @@ int module_adapter_reset(struct comp_dev *dev)

if (IS_PROCESSING_MODE_RAW_DATA(mod)) {
for (i = 0; i < mod->num_of_sinks; i++)
rfree((__sparse_force void *)mod->output_buffers[i].data);
sof_heap_free(sof_sys_user_heap_get(),
(__sparse_force void *)mod->output_buffers[i].data);
for (i = 0; i < mod->num_of_sources; i++)
rfree((__sparse_force void *)mod->input_buffers[i].data);
sof_heap_free(sof_sys_user_heap_get(),
(__sparse_force void *)mod->input_buffers[i].data);
}

if (IS_PROCESSING_MODE_RAW_DATA(mod) || IS_PROCESSING_MODE_AUDIO_STREAM(mod)) {
rfree(mod->output_buffers);
rfree(mod->input_buffers);
sof_heap_free(sof_sys_user_heap_get(), mod->output_buffers);
sof_heap_free(sof_sys_user_heap_get(), mod->input_buffers);

mod->num_of_sources = 0;
mod->num_of_sinks = 0;
Expand Down
Loading