gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add rollback when ihk_mc_pt_set_page returns error

Browse Source
This commit is contained in:
Tomoki Shirasawa
2013-06-02 13:54:38 +09:00
parent 54798253c5
commit 5d9efa7241
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/memory.c
View File

@@ -621,6 +621,11 @@ int ihk_mc_pt_clear_page(page_table_t pt, void *virt)
return __clear_pt_page(pt, virt, 0); return __clear_pt_page(pt, virt, 0);
} }
int ihk_mc_pt_clear_large_page(page_table_t pt, void *virt)
{
return __clear_pt_page(pt, virt, 1);
}
void load_page_table(struct page_table *pt) void load_page_table(struct page_table *pt)
{ {
unsigned long pt_addr; unsigned long pt_addr;

33
kernel/process.c
View File

@@ -112,7 +112,7 @@ static int update_process_page_table(struct process *process,
struct vm_range *range, enum ihk_mc_pt_attribute flag) struct vm_range *range, enum ihk_mc_pt_attribute flag)
{ {
unsigned long p, pa = range->phys; unsigned long p, pa = range->phys;
unsigned long pp;
unsigned long flags = ihk_mc_spinlock_lock(&process->vm->page_table_lock); unsigned long flags = ihk_mc_spinlock_lock(&process->vm->page_table_lock);
p = range->start; p = range->start;
while (p < range->end) { while (p < range->end) {
@@ -125,8 +125,7 @@ static int update_process_page_table(struct process *process,
if (ihk_mc_pt_set_large_page(process->vm->page_table, (void *)p, if (ihk_mc_pt_set_large_page(process->vm->page_table, (void *)p,
pa, PTATTR_WRITABLE | PTATTR_USER | flag) != 0) { pa, PTATTR_WRITABLE | PTATTR_USER | flag) != 0) {
kprintf("ERROR:setting large page for 0x%lX -> 0x%lX\n", p, pa); goto err;
panic("");
} }
dkprintf("large page set for 0x%lX -> 0x%lX\n", p, pa); dkprintf("large page set for 0x%lX -> 0x%lX\n", p, pa);
@@ -138,8 +137,7 @@ static int update_process_page_table(struct process *process,
#endif #endif
if(ihk_mc_pt_set_page(process->vm->page_table, (void *)p, if(ihk_mc_pt_set_page(process->vm->page_table, (void *)p,
pa, PTATTR_WRITABLE | PTATTR_USER | flag) != 0){ pa, PTATTR_WRITABLE | PTATTR_USER | flag) != 0){
ihk_mc_spinlock_unlock(&process->vm->page_table_lock, flags); goto err;
return -ENOMEM;
} }
pa += PAGE_SIZE; pa += PAGE_SIZE;
@@ -150,6 +148,31 @@ static int update_process_page_table(struct process *process,
} }
ihk_mc_spinlock_unlock(&process->vm->page_table_lock, flags); ihk_mc_spinlock_unlock(&process->vm->page_table_lock, flags);
return 0; return 0;
err:
pp = range->start;
pa = range->phys;
while(pp < p){
#ifdef USE_LARGE_PAGES
if ((p & (LARGE_PAGE_SIZE - 1)) == 0 &&
(pa & (LARGE_PAGE_SIZE - 1)) == 0 &&
(range->end - p) >= LARGE_PAGE_SIZE) {
ihk_mc_pt_clear_large_page(process->vm->page_table, (void *)pp);
pa += LARGE_PAGE_SIZE;
pp += LARGE_PAGE_SIZE;
}
else{
#endif
ihk_mc_pt_clear_page(process->vm->page_table, (void *)pp);
pa += PAGE_SIZE;
pp += PAGE_SIZE;
#ifdef USE_LARGE_PAGES
}
#endif
}
ihk_mc_spinlock_unlock(&process->vm->page_table_lock, flags);
return -ENOMEM;
} }
#if 0 #if 0

1
lib/include/ihk/mm.h
View File

@@ -91,6 +91,7 @@ int ihk_mc_pt_set_large_page(page_table_t pt, void *virt,
int ihk_mc_pt_change_page(page_table_t pt, void *virt, int ihk_mc_pt_change_page(page_table_t pt, void *virt,
enum ihk_mc_pt_attribute); enum ihk_mc_pt_attribute);
int ihk_mc_pt_clear_page(page_table_t pt, void *virt); int ihk_mc_pt_clear_page(page_table_t pt, void *virt);
int ihk_mc_pt_clear_large_page(page_table_t pt, void *virt);
int ihk_mc_pt_prepare_map(page_table_t pt, void *virt, unsigned long size, int ihk_mc_pt_prepare_map(page_table_t pt, void *virt, unsigned long size,
enum ihk_mc_pt_prepare_flag); enum ihk_mc_pt_prepare_flag);