Skip to content

scattered fixes and cosmetic improvements #11110

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

Merged
kv2019i merged 3 commits into from
Aug 24, 2026
+30 −62
Merged

scattered fixes and cosmetic improvements #11110

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4659aa
ipc: ipc4: remove a memcpy() in MOD_INIT_INSTANCE
lyakh Aug 18, 2026
992c1e2
ipc: (cosmetic) compact several lines
lyakh Aug 3, 2026
11c8aad
audio: module-adapter: (cosmetic) remove unused macros
lyakh Aug 21, 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
21 changes: 9 additions & 12 deletions src/ipc/ipc4/handler-user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1513,28 +1513,25 @@ __cold int ipc4_user_process_module_message(struct ipc4_message_request *ipc4,
case SOF_IPC4_MOD_INIT_INSTANCE:
#ifdef CONFIG_SOF_USERSPACE_LL
{
BUILD_ASSERT(sizeof(struct comp_driver) + sizeof(struct tr_ctx) <=
sizeof(((struct ipc_user *)0)->init_drv_data),
"ipc_user.init_drv_data too small for driver copy");

/* User-space init: kernel does driver lookup only (requires
* access to IMR manifest and driver list in kernel memory).
* Component creation (drv->ops.create) runs in user thread
* so untrusted module code does not execute in kernel context.
* Cross-core creation stays fully in kernel.
*/
struct ipc4_module_init_instance mi;

BUILD_ASSERT(sizeof(struct comp_driver) + sizeof(struct tr_ctx) <=
sizeof(((struct ipc_user *)0)->init_drv_data),
"ipc_user.init_drv_data too small for driver copy");

ret = memcpy_s(&mi, sizeof(mi), ipc4, sizeof(*ipc4));
if (ret < 0)
break;
const struct ipc4_module_init_instance *mi =
(const struct ipc4_module_init_instance *)ipc4;

@kv2019i kv2019i Aug 21, 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.

Hmm, right, this was indeed unnecessary. This is not crossing kernel-user boundary, so no need to do copies here.


if (!cpu_is_me(mi.extension.r.core_id)) {
if (!cpu_is_me(mi->extension.r.core_id)) {
ret = ipc4_init_module_instance(ipc4);
} else {
struct ipc *ipc = ipc_get();
uint32_t comp_id = IPC4_COMP_ID(mi.primary.r.module_id,
mi.primary.r.instance_id);
uint32_t comp_id = IPC4_COMP_ID(mi->primary.r.module_id,
mi->primary.r.instance_id);
const struct comp_driver *drv = ipc4_get_comp_drv(
IPC4_MOD_ID(comp_id));
struct ipc_user *pdata = ipc->ipc_user_pdata;
Expand Down