Skip to content

audio: module-adapter: make generic code compatible with user-space #10950

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 3 commits into
base: main
Choose a base branch
from
+39 −17
Open

audio: module-adapter: make generic code compatible with user-space #10950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eb179b
zephyr: lib: alloc: fine-tune logic in z_impl_sof_heap_alloc()
kv2019i Jun 23, 2026
c984f39
audio: module_adapter: make data_blob compatible with user-space
kv2019i Apr 14, 2026
491edca
audio: module-adapter: make generic.c user-space compatible
kv2019i Apr 16, 2026
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
12 changes: 7 additions & 5 deletions src/audio/data_blob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,12 +624,13 @@ EXPORT_SYMBOL(comp_data_blob_get_cmd);

static void *default_alloc(size_t size)
{
return rballoc(SOF_MEM_FLAG_USER, size);
return sof_heap_alloc(sof_sys_user_heap_get(),
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_LARGE_BUFFER, size, 0);
}

static void default_free(void *buf)
{
rfree(buf);
sof_heap_free(sof_sys_user_heap_get(), buf);
}

struct comp_data_blob_handler *
Expand All @@ -641,10 +642,11 @@ comp_data_blob_handler_new_ext(struct comp_dev *dev, bool single_blob,

comp_dbg(dev, "entry");

handler = rzalloc(SOF_MEM_FLAG_USER,
sizeof(struct comp_data_blob_handler));
handler = sof_heap_alloc(sof_sys_user_heap_get(), SOF_MEM_FLAG_USER,
sizeof(struct comp_data_blob_handler), 0);

@lyakh lyakh Jun 23, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

could just use sof_sys_user_heap_get() directly as in other cases. But this one also adds COHERENT - that's on purpose, right? Maybe mention in the commit message

@kv2019i kv2019i Jun 23, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Ok, fixing both. Earlier version of the patch stored a heap instance, but no need for that. And COHERENT is a mistake, we should align flags. Will fix.

@kv2019i kv2019i Jun 23, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Solved in V3


if (handler) {
memset(handler, 0, sizeof(*handler));
handler->dev = dev;
handler->single_blob = single_blob;
handler->alloc = alloc ? alloc : default_alloc;
Expand All @@ -662,6 +664,6 @@ void comp_data_blob_handler_free(struct comp_data_blob_handler *blob_handler)

comp_free_data_blob(blob_handler);

rfree(blob_handler);
sof_heap_free(sof_sys_user_heap_get(), blob_handler);
}
EXPORT_SYMBOL(comp_data_blob_handler_free);
22 changes: 13 additions & 9 deletions src/audio/module_adapter/module/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)

if (!dst->data) {
/* No space for config available yet, allocate now */
dst->data = rballoc(SOF_MEM_FLAG_USER, size);
dst->data = sof_heap_alloc(sof_sys_user_heap_get(),
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_LARGE_BUFFER, size, 0);
} else if (dst->size != size) {
/* The size allocated for previous config doesn't match the new one.
* Free old container and allocate new one.
*/
rfree(dst->data);
dst->data = rballoc(SOF_MEM_FLAG_USER, size);
sof_heap_free(sof_sys_user_heap_get(), dst->data);
dst->data = sof_heap_alloc(sof_sys_user_heap_get(),
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_LARGE_BUFFER, size, 0);
}
if (!dst->data) {
comp_err(dev, "failed to allocate space for setup config.");
Expand Down Expand Up @@ -538,7 +540,7 @@ int module_prepare(struct processing_module *mod,
* as it has been applied during the procedure - it is safe to
* free it.
*/
rfree(md->cfg.data);
sof_heap_free(sof_sys_user_heap_get(), md->cfg.data);

md->cfg.avail = false;
md->cfg.data = NULL;
Expand Down Expand Up @@ -673,7 +675,7 @@ int module_reset(struct processing_module *mod)

md->cfg.avail = false;
md->cfg.size = 0;
rfree(md->cfg.data);
sof_heap_free(sof_sys_user_heap_get(), md->cfg.data);
md->cfg.data = NULL;

#if CONFIG_IPC_MAJOR_3
Expand Down Expand Up @@ -724,10 +726,10 @@ int module_free(struct processing_module *mod)
/* Free all memory shared by module_adapter & module */
md->cfg.avail = false;
md->cfg.size = 0;
rfree(md->cfg.data);
sof_heap_free(sof_sys_user_heap_get(), md->cfg.data);
md->cfg.data = NULL;
if (md->runtime_params) {
rfree(md->runtime_params);
sof_heap_free(sof_sys_user_heap_get(), md->runtime_params);
md->runtime_params = NULL;
}
#if CONFIG_IPC_MAJOR_3
Expand Down Expand Up @@ -794,7 +796,9 @@ int module_set_configuration(struct processing_module *mod,
}

/* Allocate buffer for new params */
md->runtime_params = rballoc(SOF_MEM_FLAG_USER, md->new_cfg_size);
md->runtime_params = sof_heap_alloc(sof_sys_user_heap_get(),
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_LARGE_BUFFER,
md->new_cfg_size, 0);
if (!md->runtime_params) {
comp_err(dev, "space allocation for new params failed");
return -ENOMEM;
Expand Down Expand Up @@ -835,7 +839,7 @@ int module_set_configuration(struct processing_module *mod,
md->new_cfg_size = 0;

if (md->runtime_params)
rfree(md->runtime_params);
sof_heap_free(sof_sys_user_heap_get(), md->runtime_params);
md->runtime_params = NULL;

return ret;
Expand Down
19 changes: 17 additions & 2 deletions zephyr/lib/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,11 +631,26 @@ EXPORT_SYMBOL(rfree);
void *z_impl_sof_heap_alloc(struct k_heap *heap, uint32_t flags, size_t bytes,
size_t alignment)
{
if (flags & (SOF_MEM_FLAG_LARGE_BUFFER | SOF_MEM_FLAG_USER_SHARED_BUFFER))
#if CONFIG_SOF_USERSPACE_USE_SHARED_HEAP
/*
* FLAG_USER_SHARED_BUFFER maps to a specific heap, so
* the passed 'heap' can be ignored
*/
if (flags & SOF_MEM_FLAG_USER_SHARED_BUFFER)
return rballoc_align(flags, bytes, alignment);
#endif

if (!heap) {
/*
* Ensure virtual heap is utilized for large buffers
* if no heap is explicitly passed. rballoc_align()
* has this logic.
*/
if (flags & SOF_MEM_FLAG_LARGE_BUFFER)
return rballoc_align(flags, bytes, alignment);

if (!heap)
heap = &sof_heap;
}

if (flags & SOF_MEM_FLAG_COHERENT)
return heap_alloc_aligned(heap, alignment, bytes);
Expand Down
3 changes: 2 additions & 1 deletion zephyr/syscall/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ static inline void *z_vrfy_sof_heap_alloc(struct k_heap *heap, uint32_t flags,
{
/* only allow flags that are safe for user-space heap isolation */
static const uint32_t allowed_flags =
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA;
SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT | SOF_MEM_FLAG_DMA |
SOF_MEM_FLAG_LARGE_BUFFER;

K_OOPS(flags & ~allowed_flags);

Expand Down
Loading