sof _ctx_alloc() followup: Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h. by jsarha · Pull Request #10831 · thesofproject/sof

jsarha · 2026-06-01T20:33:09Z

Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h.

Added based on this discussion:
#10802 (comment)

My revised version was just a little bit late and the old version was merged before I pushed the new one.

Copilot

Pull request overview

This PR removes the dedicated sof/ctx_alloc.h header and relocates the mod_alloc_ctx + sof_ctx_{alloc,zalloc,free}() inline allocation helpers into rtos/alloc.h, updating various SOF headers/sources to stop including the removed header.

Changes:

Deleted src/include/sof/ctx_alloc.h and moved its contents into zephyr/include/rtos/alloc.h.
Removed now-obsolete #include <sof/ctx_alloc.h> from several headers and sources.
Centralized ctx-based allocation helpers behind the RTOS allocation header (for Zephyr).

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
`zephyr/include/rtos/alloc.h`	Adds `struct mod_alloc_ctx` and `sof_ctx_{alloc,zalloc,free}()` inline helpers (moved from `sof/ctx_alloc.h`).
`src/include/sof/lib/dai-zephyr.h`	Drops `sof/ctx_alloc.h` include.
`src/include/sof/audio/component.h`	Drops `sof/ctx_alloc.h` include.
`src/audio/module_adapter/module/generic.c`	Drops `sof/ctx_alloc.h` include.
`src/audio/buffers/ring_buffer.c`	Drops `sof/ctx_alloc.h` include.
`src/audio/buffers/comp_buffer.c`	Drops `sof/ctx_alloc.h` include.
`src/include/sof/ctx_alloc.h`	Deleted (content moved to `rtos/alloc.h`).

+struct mod_alloc_ctx {
+	struct k_heap *heap;
+	struct vregion *vreg;
+};
+


kv2019i

Thanks, makes sense!

jsarha · 2026-06-03T15:10:54Z

Fixed !CONFIG_SOF_VREGIONS build.

Nope, I did not. The !CONFIG_SOF_VREGIONS build is hard to fix properly, due to need of rmalloc() in vregions.h header. Do we really need to create a dummy vregion object? Can't and shouldn't we fail already the vregion_create()-call? I'll try that.

jsarha · 2026-06-03T16:18:09Z

-
-	vr->use_count = 1;
-	return vr;
+	return NULL;


@lgirdwood , @lyakh I just went and removed the vregion refcounting code from !CONFIG_SOF_VREGIONS build. What was the original reason for adding it? Does it still apply?

@lgirdwood , @lyakh I just went and removed the vregion refcounting code from !CONFIG_SOF_VREGIONS build. What was the original reason for adding it? Does it still apply?

@jsarha no, please bring it back. It's needed because, e.g. in the DP case not only module objects but also buffer objects have to be allocated from the same vregion. That's why refcounting is needed. Check where vregion_get() and vregion_put() are called.

@lyakh do you mean we need the refcounted dummy vregion objects even when we do not have vregions configured in our build, e.g. CONFIG_SOF_VREGIONS=n ?

lyakh

refcounting is needed

jsarha · 2026-06-04T13:26:54Z

refcounting is needed

This only affect CONFIG_SOF_VREGIONS=n builds. All the cases that I tested work even with CONFIG_SOF_VREGIONS=n configuration. The only case that changes a bit is CONFIG_SOF_VREGIONS=n CONFIG_SOF_USERSPACE_USE_DRIVER_HEAP=n CONFIG_USERSPACE=y configuration when module_adapter_dp_heap_new() fails. With the dummy vregion code it would get a way by allocating a dummy vregion object, but it will still fail a bit later when trying to allocate memory from the dummy vregion object.

The refcounting still works fine when we have functional vregions. My change only takes away the dummy vregion objects when CONFIG_SOF_VREGIONS=n. So, @lyakh , could you lift the -1 ?

…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. Also make sure the vregions is not tried to be used if its not enabled. Even before this change the failure would have happened couple of lines later. 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>

jsarha · 2026-06-04T20:31:07Z

The only change was to making sure the vregion_create() is not called in module_adapter_mem_alloc() when CONFIG_SOF_VREGIONS=n.

Copilot AI review requested due to automatic review settings June 1, 2026 20:33

jsarha requested review from abonislawski, dbaluta, iuliana-prodan, kv2019i, lbetlej, lgirdwood, lyakh, mmaka1 and plbossart as code owners June 1, 2026 20:33

Copilot started reviewing on behalf of jsarha June 1, 2026 20:33 View session

Copilot AI reviewed Jun 1, 2026

View reviewed changes

Comment thread zephyr/include/rtos/alloc.h

Comment on lines +156 to +160

struct mod_alloc_ctx {

struct k_heap *heap;

struct vregion *vreg;

};

Comment thread zephyr/include/rtos/alloc.h Outdated

kv2019i approved these changes Jun 2, 2026

View reviewed changes

jsarha force-pushed the sof_ctx_alloc_followup branch 2 times, most recently from 54db2cb to b73659a Compare June 3, 2026 15:08

jsarha force-pushed the sof_ctx_alloc_followup branch from b73659a to 4f71ecd Compare June 3, 2026 15:44

jsarha commented Jun 3, 2026

View reviewed changes

This was referenced Jun 3, 2026

[DNM] Only heap size attribute #10842

Open

[DNM] vregions phase II: Actually use the lifetime allocations and make the memory division between lifetime and interim dynamic #10783

Draft

lyakh requested changes Jun 4, 2026

View reviewed changes

Jyri Sarha added 3 commits June 4, 2026 22:04

zephyr: lib: Remove ctx_alloc.h and put the contents into rtos/alloc.h

461e387

Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

posix: alloc.h: Add dummy mod_alloc_ctx and sof_ctx_alloc() support

65d5912

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

jsarha force-pushed the sof_ctx_alloc_followup branch from ab33679 to 65d5912 Compare June 4, 2026 20:29

jsarha requested a review from ranj063 as a code owner June 4, 2026 20:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

sof _ctx_alloc() followup: Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h.#10831

sof _ctx_alloc() followup: Remove the ctx_alloc.h header and move the implementation into rtos/alloc.h.#10831
jsarha wants to merge 3 commits into
thesofproject:mainfrom
jsarha:sof_ctx_alloc_followup

jsarha commented Jun 1, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

kv2019i left a comment

Uh oh!

jsarha commented Jun 3, 2026 •

edited

Loading

Uh oh!

jsarha Jun 3, 2026

Uh oh!

lyakh Jun 4, 2026

Uh oh!

jsarha Jun 4, 2026 •

edited

Loading

Uh oh!

lyakh left a comment

Uh oh!

jsarha commented Jun 4, 2026

Uh oh!

jsarha commented Jun 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

jsarha commented Jun 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

jsarha commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jsarha Jun 3, 2026

Choose a reason for hiding this comment

Uh oh!

lyakh Jun 4, 2026

Choose a reason for hiding this comment

Uh oh!

jsarha Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lyakh left a comment

Choose a reason for hiding this comment

Uh oh!

jsarha commented Jun 4, 2026

Uh oh!

jsarha commented Jun 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jsarha commented Jun 3, 2026 •

edited

Loading

jsarha Jun 4, 2026 •

edited

Loading