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

sandbox: vm: encode vm_page zone id within p_flags

Browse Source
This commit is contained in:
max 🍓
2023-02-01 12:26:49 +00:00
parent a0d1fee01e
commit 2147837e9e
5 changed files with 62 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,17 +6,31 @@
#include <socks/status.h>
#include <socks/queue.h>
/* maximum number of NUMA nodes */
#define VM_MAX_NODES 64
/* maximum number of memory zones per node */
#define VM_MAX_ZONES (VM_ZONE_MAX + 1)
/* maximum number of supported page orders */
#define VM_MAX_PAGE_ORDERS (VM_PAGE_MAX_ORDER + 1)
#define VM_CHECK_ALIGN(p, mask) ((((p) & (mask)) == (p)) ? 1 : 0)
#define VM_PAGE_SIZE 0x1000
#define VM_PAGE_SHIFT 12
typedef phys_addr_t vm_alignment_t;
typedef unsigned int vm_node_id_t;
typedef struct vm_object {
unsigned int reserved;
} vm_object_t;
typedef enum vm_flags {
VM_GET_DMA = 0x01u,
} vm_flags_t;
typedef enum vm_zone_id {
/* NOTE that these are used as indices into the node_zones array in vm/zone.c
they need to be continuous, and must start at 0! */
VM_ZONE_DMA = 0u,
VM_ZONE_NORMAL = 1u,
VM_ZONE_HIGHMEM = 2u,
@@ -55,7 +69,7 @@ typedef enum vm_memory_region_status {
typedef struct vm_zone_descriptor {
vm_zone_id_t zd_id;
unsigned int zd_node;
vm_node_id_t zd_node;
const char zd_name[32];
phys_addr_t zd_base;
phys_addr_t zd_limit;
@@ -64,12 +78,12 @@ typedef struct vm_zone_descriptor {
typedef struct vm_zone {
vm_zone_descriptor_t z_info;
queue_t z_free_pages[VM_PAGE_MAX_ORDER + 1];
queue_t z_free_pages[VM_MAX_PAGE_ORDERS];
unsigned long z_size;
} vm_zone_t;
typedef struct vm_pg_data {
vm_zone_t pg_zones[VM_ZONE_MAX + 1];
vm_zone_t pg_zones[VM_MAX_ZONES];
} vm_pg_data_t;
typedef struct vm_region {
@@ -89,24 +103,23 @@ typedef enum vm_page_flags {
} vm_page_flags_t;
typedef struct vm_page {
/* 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;
/* the id of the NUMA node that this page belongs to */
uint32_t p_node : 6;
/* the id of the memory zone that this page belongs to */
uint32_t p_zone : 2;
/* vm_page_flags_t bitfields. */
uint32_t p_flags : 24;
/* 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 vm_pg_data_t *vm_pg_data_get(vm_node_id_t node);
extern void vm_page_init_array();
extern vm_page_t *vm_page_get(phys_addr_t addr);
@@ -117,9 +130,12 @@ extern size_t vm_page_get_pfn(vm_page_t *pg);
extern size_t vm_page_order_to_bytes(vm_page_order_t order);
extern size_t vm_page_order_to_pages(vm_page_order_t order);
extern vm_alignment_t vm_page_order_to_alignment(vm_page_order_t order);
extern vm_page_t *vm_page_alloc(vm_page_order_t order, vm_flags_t flags);
extern void vm_page_free(vm_page_t *pg);
extern size_t vm_bytes_to_pages(size_t bytes);
extern void vm_zone_init(vm_zone_t *z, const vm_zone_descriptor_t *zone_info);
extern vm_page_t *vm_zone_alloc_page(vm_zone_t *z, vm_page_order_t order, vm_flags_t flags);
#endif