Skip to content

zephyr: vpage: add checks against invalid vpage config #11323

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 1 commit into
base: main
Choose a base branch
from
+50 −10
Open

zephyr: vpage: add checks against invalid vpage config #11323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 50 additions & 10 deletions zephyr/lib/vpage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ static int vpages_alloc_and_map(unsigned int pages, void **ptr)
if (!ptr)
return -EINVAL;

/* the virtual region is missing if init found no space for it */
if (!vpage_ctx.virtual_region)
return -ENODEV;

if (!pages) {
*ptr = NULL;
return 0;
Expand Down Expand Up @@ -175,6 +179,9 @@ static int vpages_free_and_unmap(uintptr_t *ptr)
unsigned int pages = 0;
int ret;

if (!vpage_ctx.virtual_region)
return -ENODEV;

/* check for valid ptr which must be page aligned */
CHECKIF(!IS_ALIGNED(ptr, CONFIG_MM_DRV_PAGE_SIZE)) {
LOG_ERR("error: invalid non aligned page pointer %p", ptr);
Expand Down Expand Up @@ -269,19 +276,52 @@ static int vpage_init(void)
int ret;

/* create the virtual memory region and add it to the system */
size_t remaining_ram = L2_SRAM_BASE + L2_SRAM_SIZE -
(adsp_mm_get_unused_l2_start_aligned() +
CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE +
CONFIG_LIBRARY_REGION_SIZE);

ret = adsp_add_virtual_memory_region(adsp_mm_get_unused_l2_start_aligned() +
CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE,
remaining_ram, VIRTUAL_REGION_VPAGES_ATTR);
if (ret)
return ret;
uintptr_t l2_end = L2_SRAM_BASE + L2_SRAM_SIZE;
uintptr_t start = adsp_mm_get_unused_l2_start_aligned() +
CONFIG_SOF_ZEPHYR_VIRTUAL_HEAP_REGION_SIZE;
uintptr_t end;
size_t remaining_ram;

k_mutex_init(&vpage_ctx.lock);

if (start + CONFIG_LIBRARY_REGION_SIZE + CONFIG_MM_DRV_PAGE_SIZE <= l2_end) {
/* virtual heap and library regions fit in L2, vpages get the rest */
end = l2_end - CONFIG_LIBRARY_REGION_SIZE;
} else {
/*
* TODO: on demand mapping currently only supports
* cached mappings, so we need to limit vpages to
* physical L2 size for now until support is added to

@kv2019i kv2019i Oct 20, 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.

Related Zephyr PR to address this limitation zephyrproject-rtos/zephyr#122801

* Zephyr mm_drv_intel_adsp_mtl_tlb.c and friends
*/
end = l2_end;

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

Ack, fixed in V2.

}

/* the image or virtual heap may leave no room, don't let this underflow */
if (end < start + CONFIG_MM_DRV_PAGE_SIZE) {
LOG_WRN("no space left for vpages, start %#lx end %#lx",
(unsigned long)start, (unsigned long)end);
return -ENOMEM;
}

remaining_ram = end - start;
if (end > l2_end) {
uintptr_t image_end = adsp_mm_get_unused_l2_start_aligned();
size_t phys_left = image_end < l2_end ? l2_end - image_end : 0;

remaining_ram = MIN(remaining_ram, phys_left);
}

/* revalidate, the physical cap can leave less than a page */
if (remaining_ram < CONFIG_MM_DRV_PAGE_SIZE) {
LOG_ERR("error: no physical L2 left for vpages");
return -ENOMEM;
}

ret = adsp_add_virtual_memory_region(start, remaining_ram, VIRTUAL_REGION_VPAGES_ATTR);
if (ret)
return ret;

/* now find the virtual region in all memory regions */
virtual_memory_regions = sys_mm_drv_query_memory_regions();
SYS_MM_DRV_MEMORY_REGION_FOREACH(virtual_memory_regions, region) {
Expand Down
Loading