[DNM] Only heap size attribute#10842
Open
jsarha wants to merge 4 commits into
Open
Conversation
added 4 commits
June 3, 2026 18:40
…build Remove need to include rtos/alloc.h in !CONFIG_SOF_VREGIONS build. We do not need the dummy vregion objects for anything, so get rid of them. From now on creating a vregion object when CONFIG_SOF_VREGIONS is not defined will fail. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Simplify the IPC4 memory data structs by replacing separate interim_heap_bytes, lifetime_heap_bytes, and shared_bytes fields with a single heap_bytes field, matching the Linux driver side changes. Affects both ipc4_module_init_ext_obj_dp_data and ipc4_pipeline_ext_obj_mem_data structs, and their corresponding log messages. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
jsarha
requested review from
abonislawski,
dbaluta,
iuliana-prodan,
kv2019i,
lbetlej,
lgirdwood,
lyakh,
mmaka1,
pblaszko,
plbossart,
ranj063 and
tmleman
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
This PR consolidates module allocation helpers into the RTOS allocation headers and simplifies IPC4 DP/pipeline “memory requirement” attributes to a single heap size field, aiming to prevent interim/lifetime/shared attribute proliferation ahead of the next SOF release (and in preparation for follow-up vregion work referenced in the PR description).
Changes:
- Move
mod_alloc_ctx+sof_ctx_{alloc,zalloc,free}()API intortos/alloc.h(Zephyr + POSIX) and deletesrc/include/sof/ctx_alloc.h. - Simplify IPC4 DP/pipeline memory requirement structs to use only
heap_bytesand update related decode logging. - Adjust
vregion.hstubs for!CONFIG_SOF_VREGIONSto no longer allocate/free a dummystruct vregionand to returnNULLfor vregion ops.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| zephyr/include/rtos/alloc.h | Adds mod_alloc_ctx and sof_ctx_* helpers (with vregion support) directly in RTOS alloc header. |
| posix/include/rtos/alloc.h | Adds POSIX “heap-only” mod_alloc_ctx and sof_ctx_* helpers for API parity. |
| src/include/sof/lib/vregion.h | Simplifies non-vregions stubs (no dummy allocation; vregion ops return NULL). |
| src/include/sof/lib/dai-zephyr.h | Removes now-deleted sof/ctx_alloc.h include. |
| src/include/sof/audio/component.h | Removes now-deleted sof/ctx_alloc.h include. |
| src/include/sof/ctx_alloc.h | Deletes the standalone ctx allocation header (API moved to rtos/alloc.h). |
| src/include/ipc4/pipeline.h | Replaces interim/lifetime/shared fields with heap_bytes in IPC4 pipeline mem data. |
| src/include/ipc4/module.h | Replaces interim/lifetime/shared fields with heap_bytes in IPC4 DP mem data. |
| src/ipc/ipc4/helper.c | Updates IPC4 pipeline ext object decode log to match heap_bytes. |
| src/audio/module_adapter/module_adapter_ipc4.c | Updates IPC4 module ext init decode log to match heap_bytes. |
| src/audio/module_adapter/module/generic.c | Drops sof/ctx_alloc.h include (uses moved API). |
| src/audio/buffers/ring_buffer.c | Drops sof/ctx_alloc.h include (uses moved API). |
| src/audio/buffers/comp_buffer.c | Drops sof/ctx_alloc.h include (uses moved API). |
| struct k_heap *sof_sys_heap_get(void); | ||
| struct k_heap *sof_sys_user_heap_get(void); | ||
|
|
||
| /* Posix version of struct mod_alloc_ctx without vregion support */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is base on #10831 and should go in after it. It is also an integral part of soon to be pushed new version #10783 and should go in only after we are convinced of #10783 changes, automating division between vregion lifetime and interim allocations, and in effect moving most of allocations to lifetime linear part of the vregion heap.
This is a separate PR because this should go in before we tag the next SOF release, to not to let our IPC and topology attribute wandering to contaminate our SOF releases. That is if we get convinced of #10783 approach.
This is a pair with the soon to be pushed new version of thesofproject/linux#5537