michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "mmu: backing stores reserve page fault room"

Browse source 
This reverts commit 7a642f81ab.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-01-22 07:37:16 -05:00
commit 5e978d237c
4 changed files with 11 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/demand_paging/backing_store/ram.c
View file

@ -51,7 +51,6 @@
static char backing_store[CONFIG_MMU_PAGE_SIZE *
CONFIG_BACKING_STORE_RAM_PAGES];
static struct k_mem_slab backing_slabs;
static unsigned int free_slabs;
static void *location_to_slab(uintptr_t location)
{
@ -79,21 +78,17 @@ static uintptr_t slab_to_location(void *slab)
return offset;
}
int z_backing_store_location_get(struct z_page_frame *pf, uintptr_t *location,
bool page_fault)
int z_backing_store_location_get(struct z_page_frame *pf,
uintptr_t *location)
{
int ret;
void *slab;
if ((!page_fault && free_slabs == 1) || free_slabs == 0) {
ret = k_mem_slab_alloc(&backing_slabs, &slab, K_NO_WAIT);
if (ret != 0) {
return -ENOMEM;
}
ret = k_mem_slab_alloc(&backing_slabs, &slab, K_NO_WAIT);
__ASSERT(ret == 0, "slab count mismatch");
(void)ret;
*location = slab_to_location(slab);
free_slabs--;
return 0;
}
@ -103,7 +98,6 @@ void z_backing_store_location_free(uintptr_t location)
void *slab = location_to_slab(location);
k_mem_slab_free(&backing_slabs, &slab);
free_slabs++;
}
void z_backing_store_page_out(uintptr_t location)
@ -127,5 +121,4 @@ void z_backing_store_init(void)
{
k_mem_slab_init(&backing_slabs, backing_store, CONFIG_MMU_PAGE_SIZE,
CONFIG_BACKING_STORE_RAM_PAGES);
free_slabs = CONFIG_BACKING_STORE_RAM_PAGES;
}