Skip to content

vregion: allocate the metadata separately #10811

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
lyakh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

vregion: allocate the metadata separately #10811

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
25 changes: 14 additions & 11 deletions zephyr/lib/vregion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,23 +117,25 @@ struct vregion *vregion_create(size_t lifetime_size, size_t interim_size)
return NULL;
}

/*
* Align up lifetime sizes and interim sizes to nearest page, the
* vregion structure is stored in lifetime area so account for its size too.
*/
lifetime_size += sizeof(*vr);
/* Align up lifetime sizes and interim sizes to nearest page */
lifetime_size = ALIGN_UP(lifetime_size, CONFIG_MM_DRV_PAGE_SIZE);
interim_size = ALIGN_UP(interim_size, CONFIG_MM_DRV_PAGE_SIZE);
total_size = lifetime_size + interim_size;
Comment thread
lyakh marked this conversation as resolved.

/* allocate vregion metadata separately to keep it inaccessible to the user */
vr = rmalloc(0, sizeof(*vr));
if (!vr)
return NULL;

/* allocate pages for vregion */
pages = total_size / CONFIG_MM_DRV_PAGE_SIZE;
vregion_base = vpage_alloc(pages);
if (!vregion_base)
if (!vregion_base) {
rfree(vr);
return NULL;
}

/* init vregion - place it at the start of the lifetime region */
vr = (struct vregion *)(vregion_base + interim_size);
/* init vregion */
vr->base = vregion_base;
vr->size = total_size;
vr->pages = pages;
Expand All @@ -147,9 +149,9 @@ struct vregion *vregion_create(size_t lifetime_size, size_t interim_size)
vr->lifetime.base = vr->base + interim_size;

/* set alloc ptr addresses for lifetime linear partitions */
vr->lifetime.ptr = vr->lifetime.base +
ALIGN_UP(sizeof(*vr), CONFIG_DCACHE_LINE_SIZE); /* skip vregion struct */
vr->lifetime.used = ALIGN_UP(sizeof(*vr), CONFIG_DCACHE_LINE_SIZE);
vr->lifetime.ptr = vr->lifetime.base;
vr->lifetime.used = 0;
Comment thread
lyakh marked this conversation as resolved.
vr->lifetime.free_count = 0;

/* init interim heaps */
k_heap_init(&vr->interim.heap, vr->interim.heap.heap.init_mem, interim_size);
Expand Down Expand Up @@ -205,6 +207,7 @@ struct vregion *vregion_put(struct vregion *vr)
LOG_DBG("destroy %p size %#zx pages %u", (void *)vr->base, vr->size, vr->pages);
LOG_DBG(" lifetime used %zu free count %d", vr->lifetime.used, vr->lifetime.free_count);
vpage_free(vr->base);
rfree(vr);

return NULL;
}
Expand Down
Loading