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

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

@@ -55,15 +55,16 @@ typedef enum vm_memory_region_status {
typedef struct vm_zone_descriptor {
vm_zone_id_t zd_id;
const char *zd_name;
unsigned int zd_node;
const char zd_name[32];
phys_addr_t zd_base;
phys_addr_t zd_limit;
} vm_zone_descriptor_t;
typedef struct vm_zone {
queue_t z_free_pages[VM_PAGE_MAX_ORDER + 1];
vm_zone_descriptor_t z_info;
const char *z_name;
queue_t z_free_pages[VM_PAGE_MAX_ORDER + 1];
unsigned long z_size;
} vm_zone_t;
@@ -88,17 +89,25 @@ typedef enum vm_page_flags {
} vm_page_flags_t;
typedef struct vm_page {
uint32_t p_flags; /* vm_page_flags_t bitfield */
/* vm_page_flags_t bitfields.
the 2 most significant bits of this field encode the ID of the vm_zone that
the page belongs to */
uint32_t p_flags;
/* buddy allocator free page list head (vm_zone_t->z_free_pages[p_order]) */
queue_entry_t p_free_list;
/* temporary */
vm_zone_t *p_zone;
/* order of the page block that this page belongs too */
unsigned char p_order;
} __attribute__((aligned(2 * sizeof(unsigned long)))) vm_page_t;
extern kern_status_t vm_bootstrap(const vm_zone_descriptor_t *zones, size_t nr_zones);
extern vm_pg_data_t *vm_pg_data_get(int node);
extern void vm_page_init_array();
extern vm_page_t *vm_page_get(phys_addr_t addr);
extern phys_addr_t vm_page_get_paddr(vm_page_t *pg);
@@ -111,6 +120,6 @@ extern vm_alignment_t vm_page_order_to_alignment(vm_page_order_t order);
extern size_t vm_bytes_to_pages(size_t bytes);
extern void vm_zone_init(vm_zone_t *z, const char *name, uintptr_t base, uintptr_t limit);
extern void vm_zone_init(vm_zone_t *z, const vm_zone_descriptor_t *zone_info);
#endif