-
Notifications
You must be signed in to change notification settings - Fork 349
zephyr: userspace_helper: add test_mailbox.c (plus a test) #10477
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ | |
| #include <rtos/userspace_helper.h> | ||
| #include <sof/audio/module_adapter/module/generic.h> | ||
| #include <sof/audio/module_adapter/library/userspace_proxy.h> | ||
| #include <sof/lib/mailbox.h> | ||
|
|
||
| #define MODULE_DRIVER_HEAP_CACHED CONFIG_SOF_ZEPHYR_HEAP_CACHED | ||
|
|
||
|
|
@@ -82,6 +83,46 @@ int user_memory_init_shared(k_tid_t thread_id, struct processing_module *mod) | |
| return k_mem_domain_add_thread(comp_dom, thread_id); | ||
| } | ||
|
|
||
| int user_access_to_mailbox(struct k_mem_domain *domain, k_tid_t thread_id) | ||
| { | ||
| struct k_mem_partition mem_partition; | ||
| int ret; | ||
|
|
||
| /* | ||
| * Start with mailbox_swregs. This is aligned with mailbox.h | ||
| * implementation with uncached addressed used for register I/O. | ||
| */ | ||
| mem_partition.start = | ||
| (uintptr_t)sys_cache_uncached_ptr_get((void __sparse_cache *)MAILBOX_SW_REG_BASE); | ||
|
|
||
| BUILD_ASSERT(MAILBOX_SW_REG_SIZE == CONFIG_MMU_PAGE_SIZE); | ||
| mem_partition.size = CONFIG_MMU_PAGE_SIZE; | ||
| mem_partition.attr = K_MEM_PARTITION_P_RW_U_RW; | ||
|
|
||
| ret = k_mem_domain_add_partition(domain, &mem_partition); | ||
| if (ret < 0) | ||
| return ret; | ||
|
|
||
| #ifndef CONFIG_IPC_MAJOR_4 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Userspace with IPC3? really?
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @lyakh Probably no, but there is no technical relation with userspace and IPC protocol version. I did this test with a brute force check of how mailbox.h is used in SOF application code and tried to cover all usages in this test PR. If I assume some functions are only used with IPC4 (see #10480 ), and then proceed to to only test with another assumption that user-space is only used in IPC4, I'm not sure if future SOF maintainers will appreciate this. OTOH, I can just drop this as well -- this won't prevent IPC3 usage either.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Cool, long life support for IPC3 :)
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kv2019i My concern is purely practical - dead code. Has anyone ever tested userspace with IPC3? I suspect (and hope) that not. And I estimate the probability of this ever being used as very low, but you might know something that I don't! So, if I'm right and there's no somewhat realistic chance of this being used - please let's remove this. |
||
| /* | ||
| * Next mailbox_stream (not available in IPC4). Stream access is cached, | ||
| * so different mapping this time. | ||
| */ | ||
| mem_partition.start = | ||
| (uintptr_t)sys_cache_cached_ptr_get((void *)SRAM_STREAM_BASE); | ||
| BUILD_ASSERT(MAILBOX_STREAM_SIZE == CONFIG_MMU_PAGE_SIZE); | ||
| /* size and attr the same as for mailbox_swregs */ | ||
|
|
||
| ret = k_mem_domain_add_partition(domain, &mem_partition); | ||
| if (ret < 0) | ||
| return ret; | ||
| #endif | ||
|
|
||
| k_mem_domain_add_thread(domain, thread_id); | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| #else /* CONFIG_USERSPACE */ | ||
|
|
||
| void *user_stack_allocate(size_t stack_size, uint32_t options) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| // SPDX-License-Identifier: BSD-3-Clause | ||
| /* | ||
| * Copyright(c) 2026 Intel Corporation. | ||
| */ | ||
|
|
||
| /* | ||
| * Test case for sof/mailbox.h interface use from a Zephyr user | ||
| * thread. | ||
| */ | ||
|
|
||
| #include <sof/boot_test.h> | ||
| #include <sof/lib/mailbox.h> | ||
| #include <rtos/userspace_helper.h> | ||
|
|
||
| #include <zephyr/kernel.h> | ||
| #include <zephyr/ztest.h> | ||
| #include <zephyr/logging/log.h> | ||
| #include <zephyr/app_memory/app_memdomain.h> | ||
|
|
||
| #include <ipc4/fw_reg.h> /* mailbox definitions */ | ||
|
|
||
| LOG_MODULE_DECLARE(sof_boot_test, LOG_LEVEL_DBG); | ||
|
|
||
| #define USER_STACKSIZE 2048 | ||
|
|
||
| static struct k_thread user_thread; | ||
| static K_THREAD_STACK_DEFINE(user_stack, USER_STACKSIZE); | ||
|
|
||
| static void mailbox_write_to_pipeline_regs(void) | ||
| { | ||
| unsigned int offset = offsetof(struct ipc4_fw_registers, pipeline_regs); | ||
| struct ipc4_pipeline_registers pipe_reg; | ||
|
|
||
| /* | ||
| * IPC4 pipe_reg struct used for test, but this test also | ||
| * works for IPC3 targets. | ||
| */ | ||
| pipe_reg.stream_start_offset = (uint64_t)-1; | ||
| pipe_reg.stream_end_offset = (uint64_t)-1; | ||
|
|
||
| LOG_INF("Write to sw_regs mailbox at offset %u", offset); | ||
|
|
||
| mailbox_sw_regs_write(offset, &pipe_reg, sizeof(pipe_reg)); | ||
| } | ||
|
|
||
| static void mailbox_test_thread(void *p1, void *p2, void *p3) | ||
| { | ||
| zassert_true(k_is_user_context(), "isn't user"); | ||
|
|
||
| LOG_INF("SOF thread %s (%s)", | ||
| k_is_user_context() ? "UserSpace!" : "privileged mode.", | ||
| CONFIG_BOARD_TARGET); | ||
|
|
||
| mailbox_write_to_pipeline_regs(); | ||
| } | ||
|
|
||
| static void mailbox_test(void) | ||
| { | ||
| struct k_mem_domain domain; | ||
| int ret = k_mem_domain_init(&domain, 0, NULL); | ||
|
|
||
| zassert_equal(ret, 0); | ||
|
|
||
| k_thread_create(&user_thread, user_stack, USER_STACKSIZE, | ||
| mailbox_test_thread, NULL, NULL, NULL, | ||
| -1, K_USER, K_FOREVER); | ||
|
|
||
| LOG_INF("set up user access to mailbox"); | ||
|
|
||
| ret = user_access_to_mailbox(&domain, &user_thread); | ||
| zassert_equal(ret, 0); | ||
|
|
||
| k_thread_start(&user_thread); | ||
|
|
||
| LOG_INF("user started, waiting in kernel until test complete"); | ||
|
|
||
| k_thread_join(&user_thread, K_FOREVER); | ||
| } | ||
|
|
||
| ZTEST(userspace_mailbox, mailbox_test) | ||
| { | ||
| /* first test from kernel */ | ||
| mailbox_write_to_pipeline_regs(); | ||
|
|
||
| /* then full test in userspace */ | ||
| mailbox_test(); | ||
|
|
||
| ztest_test_pass(); | ||
| } | ||
|
|
||
| ZTEST_SUITE(userspace_mailbox, NULL, NULL, NULL, NULL, NULL); | ||
|
|
||
| /** | ||
| * SOF main has booted up and IPC handling is stopped. | ||
| * Run test suites with ztest_run_all. | ||
| */ | ||
| static int run_tests(void) | ||
| { | ||
| ztest_run_test_suite(userspace_mailbox, false, 1, 1, NULL); | ||
| return 0; | ||
| } | ||
|
|
||
| SYS_INIT(run_tests, APPLICATION, 99); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kv2019i oh, wait... don't we need a method to remove the partition too? This is for the LL scheduling thread, right? Would it be restarted during the life time of the firmware? If so, then we need to remove the partition too.