Skip to content
Snippets Groups Projects
Commit 9e35b398 authored by Adrian Danis's avatar Adrian Danis
Browse files

x86: Refactor vspace code to have verification friendly invocations

parent 08884631
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/arch/x86/arch/kernel/vspace.h
+ 1
− 1
View file @ 9e35b398
......@@ -99,7 +99,7 @@ findVSpaceForASID_ret_t findVSpaceForASID(asid_t asid);
void unmapPage(vm_page_size_t page_size, asid_t asid, vptr_t vptr, void *pptr);
void modeUnmapPage(vm_page_size_t page_size, vspace_root_t *vroot, vptr_t vptr, void *pptr);
exception_t modeMapRemapPage(word_t invLabel, vm_page_size_t page_size, vspace_root_t *vroot, vptr_t vptr, paddr_t paddr, vm_rights_t vm_rights, vm_attributes_t vm_attr);
exception_t decodeX86ModeMapRemapPage(word_t invLabel, vm_page_size_t page_size, cte_t *cte, cap_t cap, vspace_root_t *vroot, vptr_t vptr, paddr_t paddr, vm_rights_t vm_rights, vm_attributes_t vm_attr);
void setVMRoot(tcb_t *tcb);
bool_t CONST isValidVTableRoot(cap_t cap);
bool_t CONST isValidNativeRoot(cap_t cap);
......
src/arch/x86/32/kernel/vspace.c
+ 1
− 1
View file @ 9e35b398
......@@ -748,7 +748,7 @@ void modeUnmapPage(vm_page_size_t page_size, vspace_root_t *vroot, vptr_t vaddr,
}
exception_t modeMapRemapPage(word_t invLabel, vm_page_size_t page_size, vspace_root_t *vroot, vptr_t vaddr, paddr_t paddr, vm_rights_t vm_rights, vm_attributes_t vm_attr)
exception_t decodeX86ModeMapRemapPage(word_t invLabel, vm_page_size_t page_size, cte_t *cte, cap_t cap, vspace_root_t *vroot, vptr_t vaddr, paddr_t paddr, vm_rights_t vm_rights, vm_attributes_t vm_attr)
{
fail("Invalid Page type");
}
src/arch/x86/32/kernel/vspace_pae.c
+ 39
− 22
View file @ 9e35b398
......@@ -318,6 +318,43 @@ void unmapPageDirectory(asid_t asid, vptr_t vaddr, pde_t *pd)
invalidatePageStructureCache();
}
static exception_t
performIA32PageDirectoryInvocationUnmap(cap_t cap, cte_t *ctSlot)
{
if (cap_page_directory_cap_get_capPDIsMapped(cap)) {
pde_t *pd = PDE_PTR(cap_page_directory_cap_get_capPDBasePtr(cap));
unmapPageDirectory(
cap_page_directory_cap_get_capPDMappedASID(cap),
cap_page_directory_cap_get_capPDMappedAddress(cap),
pd
);
clearMemory((void *)pd, cap_get_capSizeBits(cap));
}
cap_page_directory_cap_ptr_set_capPDIsMapped(&(ctSlot->cap), 0);
return EXCEPTION_NONE;
}
static exception_t
performIA32PageDirectoryInvocationMap(cap_t cap, cte_t *ctSlot, pdpte_t pdpte, pdpte_t *pdptSlot, cap_t threadRootCap, cap_t vspaceCap)
{
ctSlot->cap = cap;
*pdptSlot = pdpte;
/* according to the intel manual if we modify a pdpt we must
* reload cr3 */
if (isValidNativeRoot(threadRootCap) && (vspace_root_t *)pptr_of_cap(threadRootCap) == (vspace_root_t *)pptr_of_cap(vspaceCap)) {
write_cr3(read_cr3());
}
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
exception_t
decodeIA32PageDirectoryInvocation(
word_t invLabel,
......@@ -346,18 +383,7 @@ decodeIA32PageDirectoryInvocation(
}
setThreadState(ksCurThread, ThreadState_Restart);
if (cap_page_directory_cap_get_capPDIsMapped(cap)) {
pde_t *pd = PDE_PTR(cap_page_directory_cap_get_capPDBasePtr(cap));
unmapPageDirectory(
cap_page_directory_cap_get_capPDMappedASID(cap),
cap_page_directory_cap_get_capPDMappedAddress(cap),
pd
);
clearMemory((void *)pd, cap_get_capSizeBits(cap));
}
cap_page_directory_cap_ptr_set_capPDIsMapped(&(cte->cap), 0);
return EXCEPTION_NONE;
return performIA32PageDirectoryInvocationUnmap(cap, cte);
}
if (invLabel != X86PageDirectoryMap) {
......@@ -436,19 +462,10 @@ decodeIA32PageDirectoryInvocation(
cap = cap_page_directory_cap_set_capPDMappedASID(cap, asid);
cap = cap_page_directory_cap_set_capPDMappedAddress(cap, vaddr);
cte->cap = cap;
*pdptSlot = pdpte;
/* according to the intel manual if we modify a pdpt we must
* reload cr3 */
threadRoot = TCB_PTR_CTE_PTR(ksCurThread, tcbVTable)->cap;
if (isValidNativeRoot(threadRoot) && (vspace_root_t*)pptr_of_cap(threadRoot) == (vspace_root_t*)pptr_of_cap(vspaceCap)) {
write_cr3(read_cr3());
}
setThreadState(ksCurThread, ThreadState_Restart);
invalidatePageStructureCache();
return EXCEPTION_NONE;
return performIA32PageDirectoryInvocationMap(cap, cte, pdpte, pdptSlot, threadRoot, vspaceCap);
}
#endif
src/arch/x86/kernel/vspace.c
+ 99
− 56
View file @ 9e35b398
......@@ -744,6 +744,56 @@ void unmapPageTable(asid_t asid, vptr_t vaddr, pte_t* pt)
invalidatePageStructureCache();
}
static exception_t
performX86PageInvocationMapPTE(cap_t cap, cte_t *ctSlot, pte_t *ptSlot, pte_t pte)
{
ctSlot->cap = cap;
*ptSlot = pte;
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
static exception_t
performX86PageInvocationMapPDE(cap_t cap, cte_t *ctSlot, pde_t *pdSlot, pde_t pde)
{
ctSlot->cap = cap;
*pdSlot = pde;
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
static exception_t
performX86PageInvocationRemapPTE(pte_t *ptSlot, pte_t pte)
{
*ptSlot = pte;
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
static exception_t
performX86PageInvocationRemapPDE(pde_t *pdSlot, pde_t pde)
{
*pdSlot = pde;
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
static exception_t
performX86PageInvocationUnmap(cap_t cap, cte_t *ctSlot)
{
unmapPage(
cap_frame_cap_get_capFSize(cap),
cap_frame_cap_get_capFMappedASID(cap),
cap_frame_cap_get_capFMappedAddress(cap),
(void *)cap_frame_cap_get_capFBasePtr(cap)
);
cap_frame_cap_ptr_set_capFMappedAddress(&ctSlot->cap, 0);
cap_frame_cap_ptr_set_capFMappedASID(&ctSlot->cap, asidInvalid);
return EXCEPTION_NONE;
}
exception_t decodeX86FrameInvocation(
word_t invLabel,
word_t length,
......@@ -861,14 +911,14 @@ exception_t decodeX86FrameInvocation(
}
pte = makeUserPTE(paddr, vmAttr, vmRights);
cte->cap = cap;
*lu_ret.ptSlot = pte;
break;
setThreadState(ksCurThread, ThreadState_Restart);
return performX86PageInvocationMapPTE(cap, cte, lu_ret.ptSlot, pte);
}
/* PDE mappings */
case X86_LargePage: {
pde_t* pdeSlot;
pde_t pde;
lookupPDSlot_ret_t lu_ret;
lu_ret = lookupPDSlot(vspace, vaddr);
......@@ -896,26 +946,17 @@ exception_t decodeX86FrameInvocation(
return EXCEPTION_SYSCALL_ERROR;
}
*pdeSlot = makeUserPDELargePage(paddr, vmAttr, vmRights);
cte->cap = cap;
break;
pde = makeUserPDELargePage(paddr, vmAttr, vmRights);
setThreadState(ksCurThread, ThreadState_Restart);
return performX86PageInvocationMapPDE(cap, cte, lu_ret.pdSlot, pde);
}
default: {
exception_t ret = modeMapRemapPage(invLabel, frameSize, vspace, vaddr, paddr, vmRights, vmAttr);
if (ret != EXCEPTION_NONE) {
return ret;
}
cte->cap = cap;
break;
return decodeX86ModeMapRemapPage(invLabel, frameSize, cte, cap, vspace, vaddr, paddr, vmRights, vmAttr);
}
}
invalidatePageStructureCache();
setThreadState(ksCurThread, ThreadState_Restart);
return EXCEPTION_NONE;
return EXCEPTION_SYSCALL_ERROR;
}
case X86PageRemap: { /* Remap */
......@@ -1007,14 +1048,16 @@ exception_t decodeX86FrameInvocation(
}
pte = makeUserPTE(paddr, vmAttr, vmRights);
*lu_ret.ptSlot = pte;
break;
setThreadState(ksCurThread, ThreadState_Restart);
return performX86PageInvocationRemapPTE(lu_ret.ptSlot, pte);
}
/* PDE mappings */
case X86_LargePage: {
pde_t* pdeSlot;
pde_t pde;
lookupPDSlot_ret_t lu_ret;
lu_ret = lookupPDSlot(vspace, vaddr);
......@@ -1033,41 +1076,30 @@ exception_t decodeX86FrameInvocation(
return EXCEPTION_SYSCALL_ERROR;
}
*pdeSlot = makeUserPDELargePage(paddr, vmAttr, vmRights);
pde = makeUserPDELargePage(paddr, vmAttr, vmRights);
break;
setThreadState(ksCurThread, ThreadState_Restart);
return performX86PageInvocationRemapPDE(pdeSlot, pde);
}
default: {
exception_t ret = modeMapRemapPage(invLabel, frameSize, vspace, vaddr, paddr, vmRights, vmAttr);
if (ret != EXCEPTION_NONE) {
return ret;
}
break;
return decodeX86ModeMapRemapPage(invLabel, frameSize, cte, cap, vspace, vaddr, paddr, vmRights, vmAttr);
}
}
invalidatePageStructureCache();
setThreadState(ksCurThread, ThreadState_Restart);
return EXCEPTION_NONE;
return EXCEPTION_SYSCALL_ERROR;
}
case X86PageUnmap: { /* Unmap */
if (cap_frame_cap_get_capFMappedASID(cap) != asidInvalid) {
if (isIOSpaceFrame(cap)) {
return decodeX86IOUnMapInvocation(invLabel, length, cte, cap, excaps);
} else {
setThreadState(ksCurThread, ThreadState_Restart);
return performX86PageInvocationUnmap(cap, cte);
}
unmapPage(
cap_frame_cap_get_capFSize(cap),
cap_frame_cap_get_capFMappedASID(cap),
cap_frame_cap_get_capFMappedAddress(cap),
(void *)cap_frame_cap_get_capFBasePtr(cap)
);
}
cap_frame_cap_ptr_set_capFMappedAddress(&cte->cap, 0);
cap_frame_cap_ptr_set_capFMappedASID(&cte->cap, asidInvalid);
setThreadState(ksCurThread, ThreadState_Restart);
return EXCEPTION_NONE;
}
......@@ -1090,6 +1122,33 @@ exception_t decodeX86FrameInvocation(
}
}
static exception_t
performX86PageTableInvocationUnmap(cap_t cap, cte_t *ctSlot)
{
if (cap_page_table_cap_get_capPTIsMapped(cap)) {
pte_t *pt = PTE_PTR(cap_page_table_cap_get_capPTBasePtr(cap));
unmapPageTable(
cap_page_table_cap_get_capPTMappedASID(cap),
cap_page_table_cap_get_capPTMappedAddress(cap),
pt
);
clearMemory((void *)pt, cap_get_capSizeBits(cap));
}
cap_page_table_cap_ptr_set_capPTIsMapped(&(ctSlot->cap), 0);
return EXCEPTION_NONE;
}
static exception_t
performX86PageTableInvocationMap(cap_t cap, cte_t *ctSlot, pde_t pde, pde_t *pdSlot)
{
ctSlot->cap = cap;
*pdSlot = pde;
invalidatePageStructureCache();
return EXCEPTION_NONE;
}
static exception_t
decodeX86PageTableInvocation(
word_t invLabel,
......@@ -1115,19 +1174,7 @@ decodeX86PageTableInvocation(
return EXCEPTION_SYSCALL_ERROR;
}
setThreadState(ksCurThread, ThreadState_Restart);
if (cap_page_table_cap_get_capPTIsMapped(cap)) {
pte_t *pt = PTE_PTR(cap_page_table_cap_get_capPTBasePtr(cap));
unmapPageTable(
cap_page_table_cap_get_capPTMappedASID(cap),
cap_page_table_cap_get_capPTMappedAddress(cap),
pt
);
clearMemory((void *)pt, cap_get_capSizeBits(cap));
}
cap_page_table_cap_ptr_set_capPTIsMapped(&(cte->cap), 0);
return EXCEPTION_NONE;
return performX86PageTableInvocationUnmap(cap, cte);
}
if (invLabel != X86PageTableMap ) {
......@@ -1214,12 +1261,8 @@ decodeX86PageTableInvocation(
cap = cap_page_table_cap_set_capPTMappedASID(cap, asid);
cap = cap_page_table_cap_set_capPTMappedAddress(cap, vaddr);
cte->cap = cap;
*pdSlot.pdSlot = pde;
setThreadState(ksCurThread, ThreadState_Restart);
invalidatePageStructureCache();
return EXCEPTION_NONE;
return performX86PageTableInvocationMap(cap, cte, pde, pdSlot.pdSlot);
}
exception_t decodeX86MMUInvocation(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment