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

ContiguousPTE[4/12] modify invalidate_process_memory_range

Browse Source 
Change-Id: Ib59f4c5d78580a1c4344ac632d3d8f68355d7058
This commit is contained in:
TOIDA,Suguru
2018-11-30 09:18:06 +09:00
committed by Masamichi Takagi
parent 639d0e496b
commit 0449437c15
1 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
kernel/process.c
View File

@@ -1711,12 +1711,18 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep,
phys = pte_get_phys(ptep); phys = pte_get_phys(ptep);
page = phys_to_page(phys); page = phys_to_page(phys);
linear_off = range->objoff + ((uintptr_t)pgaddr - range->start); linear_off = range->objoff + ((uintptr_t)pgaddr - range->start);
if (page && (page->offset == linear_off)) {
if (page) {
if (page->offset == linear_off) {
pte_make_null(&apte, pgsize);
}
else {
pte_make_fileoff(page->offset, 0, pgsize, &apte);
}
} else {
pte_make_null(&apte, pgsize); pte_make_null(&apte, pgsize);
} }
else {
pte_make_fileoff(page->offset, 0, pgsize, &apte);
}
pte_xchg(ptep, &apte); pte_xchg(ptep, &apte);
flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */ flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */
@@ -1745,6 +1751,8 @@ int invalidate_process_memory_range(struct process_vm *vm,
{ {
int error; int error;
struct invalidate_args args; struct invalidate_args args;
pte_t *ptep;
size_t pgsize;
dkprintf("invalidate_process_memory_range(%p,%p,%#lx,%#lx)\n", dkprintf("invalidate_process_memory_range(%p,%p,%#lx,%#lx)\n",
vm, range, start, end); vm, range, start, end);
@@ -1752,6 +1760,43 @@ int invalidate_process_memory_range(struct process_vm *vm,
ihk_mc_spinlock_lock_noirq(&vm->page_table_lock); ihk_mc_spinlock_lock_noirq(&vm->page_table_lock);
memobj_ref(range->memobj); memobj_ref(range->memobj);
ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table,
(void *)start, 0, NULL,
&pgsize, NULL);
if (ptep && pte_is_contiguous(ptep)) {
if (!page_is_contiguous_head(ptep, pgsize)) {
// start pte is not contiguous head
error = split_contiguous_pages(ptep, pgsize);
if (error) {
ihk_spinlock_t *page_table_lock;
memobj_unref(range->memobj);
page_table_lock = &vm->page_table_lock;
ihk_mc_spinlock_unlock_noirq(page_table_lock);
goto out;
}
}
}
ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table,
(void *)end - 1, 0, NULL,
&pgsize, NULL);
if (ptep && pte_is_contiguous(ptep)) {
if (!page_is_contiguous_tail(ptep, pgsize)) {
// end pte is not contiguous tail
error = split_contiguous_pages(ptep, pgsize);
if (error) {
ihk_spinlock_t *page_table_lock;
memobj_unref(range->memobj);
page_table_lock = &vm->page_table_lock;
ihk_mc_spinlock_unlock_noirq(page_table_lock);
goto out;
}
}
}
error = visit_pte_range(vm->address_space->page_table, (void *)start, error = visit_pte_range(vm->address_space->page_table, (void *)start,
(void *)end, range->pgshift, VPTEF_SKIP_NULL, (void *)end, range->pgshift, VPTEF_SKIP_NULL,
&invalidate_one_page, &args); &invalidate_one_page, &args);