thomas/mittos64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VMM -- Interface cleanup

Browse Source
This commit is contained in:
Thomas Lovén 2018-03-21 09:16:19 +01:00
parent 4011b5f12f
commit fc6c7f3bc7
4 changed files with 50 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/include/memory.h
View File

@ -41,9 +41,8 @@ uint64_t pmm_calloc();
uint64_t vmm_get_page(uint64_t P4, uint64_t addr); uint64_t vmm_get_page(uint64_t P4, uint64_t addr);
#define PAGE_EXIST(p) ((p) != (uint64_t)-1) #define PAGE_EXIST(p) ((p) != (uint64_t)-1)
int vmm_set_page(uint64_t P4, uint64_t addr, uint64_t page, uint16_t flags, int touch); int vmm_set_page(uint64_t P4, uint64_t addr, uint64_t page, uint16_t flags);
int touch_page(uint64_t P4, uint64_t addr, uint16_t flags); void vmm_clear_page(uint64_t P4, uint64_t addr, int free);
void free_page(uint64_t P4, uint64_t addr, int free);
extern union PTE BootP4; extern union PTE BootP4;
extern int kernel_start, kernel_end; extern int kernel_start, kernel_end;

2
src/kernel/memory/memory.c
View File

@ -25,7 +25,7 @@ void memory_init()
if(!PAGE_EXIST(page) || !(page & PAGE_PRESENT)) if(!PAGE_EXIST(page) || !(page & PAGE_PRESENT))
{ {
uint16_t flags = PAGE_GLOBAL | PAGE_WRITE; uint16_t flags = PAGE_GLOBAL | PAGE_WRITE;
vmm_set_page(kernel_P4, addr, p, flags | PAGE_PRESENT, 1); vmm_set_page(kernel_P4, addr, p, flags | PAGE_PRESENT);
} }
if(type == MMAP_FREE) if(type == MMAP_FREE)

47
src/kernel/memory/vmm.c
View File

@ -21,29 +21,7 @@ static int page_exists(uint64_t P4, uint64_t addr)
return 0; return 0;
} }
uint64_t vmm_get_page(uint64_t P4, uint64_t addr) static int touch_page(uint64_t P4, uint64_t addr, uint16_t flags)
{
if(page_exists(P4, addr))
{
return P1E;
}
return -1;
}
int vmm_set_page(uint64_t P4, uint64_t addr, uint64_t page, uint16_t flags, int touch)
{
if(!page_exists(P4, addr))
{
if(!touch)
return -1;
touch_page(P4, addr, flags);
}
P1E = page | flags;
return 0;
}
int touch_page(uint64_t P4, uint64_t addr, uint16_t flags)
{ {
if(!P4) return -1; if(!P4) return -1;
@ -62,7 +40,28 @@ int touch_page(uint64_t P4, uint64_t addr, uint16_t flags)
return 0; return 0;
} }
void free_page(uint64_t P4, uint64_t addr, int free) uint64_t vmm_get_page(uint64_t P4, uint64_t addr)
{
if(page_exists(P4, addr))
{
return P1E;
}
return -1;
}
int vmm_set_page(uint64_t P4, uint64_t addr, uint64_t page, uint16_t flags)
{
if(!page_exists(P4, addr))
{
if(touch_page(P4, addr, flags))
return -1;
}
P1E = page | flags;
return 0;
}
void vmm_clear_page(uint64_t P4, uint64_t addr, int free)
{ {
if(!page_exists(P4, addr)) if(!page_exists(P4, addr))
return; return;

57
src/kernel/memory/vmm.tt
View File

@ -73,7 +73,7 @@ TEST(set_page_sets_page)
{ {
BUILD_PT(0,0,0); BUILD_PT(0,0,0);
vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT, 0); vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT);
ASSERT_EQ_PTR(p1[0], 0x1234567890ABC000 | PAGE_PRESENT); ASSERT_EQ_PTR(p1[0], 0x1234567890ABC000 | PAGE_PRESENT);
} }
@ -81,25 +81,16 @@ TEST(set_page_returns_success_if_working)
{ {
BUILD_PT(0,0,0); BUILD_PT(0,0,0);
int retval = vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT, 0); int retval = vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT);
ASSERT_EQ_INT(retval, 0); ASSERT_EQ_INT(retval, 0);
} }
TEST(set_page_fails_if_PT_missing)
{
BUILD_PT(0,0,0);
p3[0] = (uint64_t)p2;
int retval = vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT, 0);
ASSERT_NEQ_INT(retval, 0);
}
TEST(set_page_does_not_fail_if_PT_missing_but_touch_flag_is_set) TEST(set_page_does_not_fail_if_PT_missing_but_touch_flag_is_set)
{ {
BUILD_PT(0,0,0); BUILD_PT(0,0,0);
p3[0] = (uint64_t)p2; p3[0] = (uint64_t)p2;
int retval = vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT, 1); int retval = vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT);
ASSERT_EQ_INT(retval, 0); ASSERT_EQ_INT(retval, 0);
} }
@ -108,7 +99,7 @@ TEST(set_page_makes_P3_if_PT_missing_but_touch_flag_is_set)
BUILD_PT(0,0,0); BUILD_PT(0,0,0);
p3[0] = (uint64_t)p2; p3[0] = (uint64_t)p2;
vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT, 1); vmm_set_page(P4, 0, 0x1234567890ABC000, PAGE_PRESENT);
ASSERT_EQ_INT(p3[0] & PAGE_PRESENT, PAGE_PRESENT); ASSERT_EQ_INT(p3[0] & PAGE_PRESENT, PAGE_PRESENT);
} }
@ -121,71 +112,71 @@ uint64_t pmm_calloc()
return (uint64_t)pages[counter++]; return (uint64_t)pages[counter++];
} }
TEST(touch_page_adds_P3) TEST(touching_page_adds_P3)
{ {
touch_page(P4, ADDR1234, 0); vmm_set_page(P4, ADDR1234, 0, 0);
ASSERT_EQ_PTR(p4[1], (uint64_t)p3 | PAGE_PRESENT); ASSERT_EQ_PTR(p4[1], (uint64_t)p3 | PAGE_PRESENT);
} }
TEST(touch_page_adds_P2) TEST(touching_page_adds_P2)
{ {
touch_page(P4, ADDR1234, 0); vmm_set_page(P4, ADDR1234, 0, 0);
ASSERT_EQ_PTR(p3[2], (uint64_t)p2 | PAGE_PRESENT); ASSERT_EQ_PTR(p3[2], (uint64_t)p2 | PAGE_PRESENT);
} }
TEST(touch_page_adds_P1) TEST(touching_page_adds_P1)
{ {
touch_page(P4, ADDR1234, 0); vmm_set_page(P4, ADDR1234, 0, 0);
ASSERT_EQ_PTR(p2[3], (uint64_t)p1 | PAGE_PRESENT); ASSERT_EQ_PTR(p2[3], (uint64_t)p1 | PAGE_PRESENT);
} }
TEST(touch_page_sets_flags) TEST(touching_page_sets_flags)
{ {
touch_page(P4, 0, PAGE_WRITE); vmm_set_page(P4, 0, 0, PAGE_WRITE);
ASSERT_EQ_PTR(p2[0], (uint64_t)p1 | PAGE_WRITE | PAGE_PRESENT); ASSERT_EQ_PTR(p2[0], (uint64_t)p1 | PAGE_WRITE | PAGE_PRESENT);
} }
TEST(touch_page_fails_if_out_of_pages) TEST(touching_page_fails_if_out_of_pages)
{ {
pmm_calloc(); pmm_calloc();
int retval = touch_page(P4, 0, 0); int retval = vmm_set_page(P4, ADDR1234, 0, 0);
ASSERT_NEQ_INT(retval, 0); ASSERT_NEQ_INT(retval, 0);
} }
TEST(free_page_unsets_page) TEST(clear_page_unsets_page)
{ {
BUILD_PT(1,2,3); BUILD_PT(1,2,3);
p1[4] = PAGE_PRESENT; p1[4] = PAGE_PRESENT;
free_page(P4, ADDR1234, 0); vmm_clear_page(P4, ADDR1234, 0);
ASSERT_EQ_PTR(p1[4], 0); ASSERT_EQ_PTR(p1[4], 0);
} }
TEST(free_page_unsets_P2_entry_if_P1_is_empty) TEST(clear_page_unsets_P2_entry_if_P1_is_empty)
{ {
BUILD_PT(1,2,3); BUILD_PT(1,2,3);
p1[4] = PAGE_PRESENT; p1[4] = PAGE_PRESENT;
free_page(P4, ADDR1234, 1); vmm_clear_page(P4, ADDR1234, 1);
ASSERT_EQ_PTR(p2[3], 0); ASSERT_EQ_PTR(p2[3], 0);
} }
TEST(free_page_does_not_unset_P2_entry_if_not_asked_to) TEST(clear_page_does_not_unset_P2_entry_if_not_asked_to)
{ {
BUILD_PT(1,2,3); BUILD_PT(1,2,3);
p1[4] = PAGE_PRESENT; p1[4] = PAGE_PRESENT;
free_page(P4, ADDR1234, 0); vmm_clear_page(P4, ADDR1234, 0);
ASSERT_NEQ_PTR(p2[3], 0); ASSERT_NEQ_PTR(p2[3], 0);
} }
TEST(free_page_does_not_unset_P2_entry_if_P1_is_not_empty) TEST(clear_page_does_not_unset_P2_entry_if_P1_is_not_empty)
{ {
BUILD_PT(1,2,3); BUILD_PT(1,2,3);
p1[4] = PAGE_PRESENT; p1[4] = PAGE_PRESENT;
p1[0] = PAGE_PRESENT; p1[0] = PAGE_PRESENT;
free_page(P4, ADDR1234, 1); vmm_clear_page(P4, ADDR1234, 1);
ASSERT_NEQ_PTR(p2[3], 0); ASSERT_NEQ_PTR(p2[3], 0);
} }
@ -196,12 +187,12 @@ void pmm_free(uint64_t page)
static int counter = 0; static int counter = 0;
freed[counter++] = page; freed[counter++] = page;
} }
TEST(free_page_returns_P1_to_PMM_if_empty) TEST(clear_page_returns_P1_to_PMM_if_empty)
{ {
BUILD_PT(1,2,3); BUILD_PT(1,2,3);
p1[4] = PAGE_PRESENT; p1[4] = PAGE_PRESENT;
free_page(P4, ADDR1234, 1); vmm_clear_page(P4, ADDR1234, 1);
ASSERT_EQ_PTR(freed[0], p1); ASSERT_EQ_PTR(freed[0], p1);
} }