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

sandbox: vm: fix incorrect region/zone limit addresses

Browse Source
This commit is contained in:
max 🍓
2023-01-29 20:10:15 +00:00
parent 8fb71ccb77
commit c0c930e5a9
3 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
sandbox/vm/vm_zone.c
View File

@@ -1,14 +1,39 @@
#include "socks/queue.h"
#include <socks/types.h>
#include <socks/vm.h>
#include <string.h>
#include <stdio.h>
#include <inttypes.h>
#include <assert.h>
#include <stdlib.h>
static vm_page_t *group_pages_into_block(vm_zone_t *z, phys_addr_t base, phys_addr_t limit, int order)
{
vm_page_t *first_page = NULL;
for (phys_addr_t i = base; i < limit; i += VM_PAGE_SIZE) {
vm_page_t *pg = vm_page_get(i);
if (order != VM_PAGE_MIN_ORDER) {
pg->p_flags |= VM_PAGE_HUGE;
}
if (i == base) {
pg->p_flags |= VM_PAGE_HEAD;
first_page = pg;
}
pg->p_order = order;
pg->p_zone = z;
}
return first_page;
}
static void convert_region_to_blocks(vm_zone_t *zone, phys_addr_t base, phys_addr_t limit, int reserved)
{
size_t block_frames = vm_bytes_to_pages(limit - base);
printf("adding region %08zx-%08zx (%zu frames) to zone %s\n", base, limit, block_frames, zone->z_name);
size_t block_frames = vm_bytes_to_pages(limit - base + 1);
printf("adding region %08zx-%08zx (%zu frames) to zone %s\n",
base, limit, block_frames, zone->z_info.zd_name);
int reset_order = 0;
for (int order = VM_PAGE_MAX_ORDER; order >= VM_PAGE_MIN_ORDER; ) {
@@ -27,12 +52,19 @@ static void convert_region_to_blocks(vm_zone_t *zone, phys_addr_t base, phys_add
}
printf("%s: %zu %s pages at %08" PRIxPTR "\n",
zone->z_name,
zone->z_info.zd_name,
order_frames,
reserved == 1 ? "reserved" : "free",
base);
base += order_frames * VM_PAGE_SIZE;
phys_addr_t block_limit = base + (order_frames * VM_PAGE_SIZE) - 1;
vm_page_t *block_page = group_pages_into_block(zone, base, block_limit, order);
if (reserved == 0) {
queue_push_back(&zone->z_free_pages[order], &block_page->p_free_list);
}
base = block_limit + 1;
block_frames -= order_frames;
if (reset_order) {
@@ -42,8 +74,8 @@ static void convert_region_to_blocks(vm_zone_t *zone, phys_addr_t base, phys_add
order--;
}
if (base > limit) {
printf("too many pages created!\n");
if (base > limit + 1) {
printf("too many pages created! %zx > %zx\n", base, limit);
abort();
}
@@ -53,15 +85,21 @@ static void convert_region_to_blocks(vm_zone_t *zone, phys_addr_t base, phys_add
}
}
void vm_zone_init(vm_zone_t *z, const char *name, uintptr_t base, uintptr_t limit)
void vm_zone_init(vm_zone_t *z, const vm_zone_descriptor_t *zone_info)
{
printf("initialising zone %s (%08zx-%08zx)\n", name, base, limit);
if (!vm_page_get(zone_info->zd_base)) {
return;
}
printf("initialising zone %s (%08zx-%08zx)\n",
zone_info->zd_name, zone_info->zd_base, zone_info->zd_limit);
memset(z, 0x0, sizeof *z);
z->z_name = name;
memcpy(&z->z_info, zone_info, sizeof *zone_info);
phys_addr_t block_start = base, block_end = base;
phys_addr_t block_start = zone_info->zd_base, block_end = zone_info->zd_limit;
int this_page_reserved = 0, last_page_reserved = -1;
for (uintptr_t i = base; i < limit; i += VM_PAGE_SIZE) {
for (uintptr_t i = zone_info->zd_base; i < zone_info->zd_limit; i += VM_PAGE_SIZE) {
vm_page_t *pg = vm_page_get(i);
if (!pg) {
break;
@@ -78,13 +116,13 @@ void vm_zone_init(vm_zone_t *z, const char *name, uintptr_t base, uintptr_t limi
continue;
}
convert_region_to_blocks(z, block_start, i, last_page_reserved);
convert_region_to_blocks(z, block_start, block_end + VM_PAGE_SIZE - 1, last_page_reserved);
block_start = i;
last_page_reserved = this_page_reserved;
}
if (block_start != block_end) {
convert_region_to_blocks(z, block_start, block_end, this_page_reserved);
convert_region_to_blocks(z, block_start, block_end + VM_PAGE_SIZE - 1, this_page_reserved);
}
}