wash/mango
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sandbox: vm: make vm_page queue entry private, owner-defined usage

Browse Source
This commit is contained in:
max 🍓
2023-02-02 16:58:24 +00:00
parent e5a7546996
commit 3c781a4cb3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/vm/include/socks/vm.h
View File

@@ -133,7 +133,7 @@ typedef struct vm_page {
some examples: some examples:
- the buddy allocator uses this to maintain its per-zone free-page lists. - the buddy allocator uses this to maintain its per-zone free-page lists.
*/ */
queue_entry_t p_free_list; queue_entry_t p_list;
} __attribute__((aligned(2 * sizeof(unsigned long)))) vm_page_t; } __attribute__((aligned(2 * sizeof(unsigned long)))) vm_page_t;

18
sandbox/vm/zone.c
View File

@@ -64,7 +64,7 @@ static void convert_region_to_blocks(vm_zone_t *zone,
vm_page_t *block_page = group_pages_into_block(zone, base, block_limit, order); vm_page_t *block_page = group_pages_into_block(zone, base, block_limit, order);
if (reserved == 0) { if (reserved == 0) {
queue_push_back(&zone->z_free_pages[order], &block_page->p_free_list); queue_push_back(&zone->z_free_pages[order], &block_page->p_list);
} }
base = block_limit + 1; base = block_limit + 1;
@@ -165,13 +165,13 @@ static int replenish_free_page_list(vm_zone_t *z, vm_page_order_t order)
to the next order's free list. */ to the next order's free list. */
for (vm_page_order_t i = first_order_with_free; i > order; i--) { for (vm_page_order_t i = first_order_with_free; i > order; i--) {
queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[i]); queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[i]);
vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_free_list, pg_entry); vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_list, pg_entry);
vm_page_t *a, *b; vm_page_t *a, *b;
vm_page_split(pg, &a, &b); vm_page_split(pg, &a, &b);
queue_push_back(&z->z_free_pages[i - 1], &a->p_free_list); queue_push_back(&z->z_free_pages[i - 1], &a->p_list);
queue_push_back(&z->z_free_pages[i - 1], &b->p_free_list); queue_push_back(&z->z_free_pages[i - 1], &b->p_list);
} }
return 0; return 0;
@@ -185,7 +185,7 @@ vm_page_t *vm_zone_alloc_page(vm_zone_t *z, vm_page_order_t order, vm_flags_t fl
} }
queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[order]); queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[order]);
vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_free_list, pg_entry); vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_list, pg_entry);
vm_page_foreach (pg, i) { vm_page_foreach (pg, i) {
i->p_flags |= VM_PAGE_ALLOC; i->p_flags |= VM_PAGE_ALLOC;
} }
@@ -196,7 +196,7 @@ vm_page_t *vm_zone_alloc_page(vm_zone_t *z, vm_page_order_t order, vm_flags_t fl
void vm_zone_free_page(vm_zone_t *z, vm_page_t *pg) void vm_zone_free_page(vm_zone_t *z, vm_page_t *pg)
{ {
pg->p_flags &= ~VM_PAGE_ALLOC; pg->p_flags &= ~VM_PAGE_ALLOC;
queue_push_back(&z->z_free_pages[pg->p_order], &pg->p_free_list); queue_push_back(&z->z_free_pages[pg->p_order], &pg->p_list);
while (1) { while (1) {
vm_page_t *buddy = vm_page_get_buddy(pg); vm_page_t *buddy = vm_page_get_buddy(pg);
@@ -205,9 +205,9 @@ void vm_zone_free_page(vm_zone_t *z, vm_page_t *pg)
break; break;
} }
queue_delete(&z->z_free_pages[buddy->p_order - 1], &buddy->p_free_list); queue_delete(&z->z_free_pages[buddy->p_order - 1], &buddy->p_list);
queue_delete(&z->z_free_pages[buddy->p_order - 1], &pg->p_free_list); queue_delete(&z->z_free_pages[buddy->p_order - 1], &pg->p_list);
queue_push_back(&z->z_free_pages[huge->p_order], &huge->p_free_list); queue_push_back(&z->z_free_pages[huge->p_order], &huge->p_list);
pg = huge; pg = huge;
} }