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

ihk_mc_pt_virt_to_pagemap: refactor

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-04-21 22:25:46 +09:00
parent 328175547f
commit 176f6d23a9
1 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,48 +504,21 @@ static int __clear_pt_page(struct page_table *pt, void *virt, int largepage)
uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt) uint64_t ihk_mc_pt_virt_to_pagemap(struct page_table *pt, unsigned long virt)
{ {
int l4idx, l3idx, l2idx, l1idx; int error;
unsigned long v = (unsigned long)virt; unsigned long phys;
uint64_t ret = 0; uint64_t pagemap;
if (!pt) { error = ihk_mc_pt_virt_to_phys(pt, (void *)virt, &phys);
pt = init_pt; if (error) {
return 0;
} }
GET_VIRT_INDICES(v, l4idx, l3idx, l2idx, l1idx); pagemap = PM_PFRAME(phys >> PAGE_SHIFT);
pagemap |= PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT;
if (!(pt->entry[l4idx] & PFL4_PRESENT)) { return pagemap;
return ret;
}
pt = phys_to_virt(pt->entry[l4idx] & PAGE_MASK);
if (!(pt->entry[l3idx] & PFL3_PRESENT)) {
return ret;
}
pt = phys_to_virt(pt->entry[l3idx] & PAGE_MASK);
if (!(pt->entry[l2idx] & PFL2_PRESENT)) {
return ret;
}
if ((pt->entry[l2idx] & PFL2_SIZE)) {
ret = PM_PFRAME(((pt->entry[l2idx] & LARGE_PAGE_MASK) +
(v & (LARGE_PAGE_SIZE - 1))) >> PAGE_SHIFT);
ret |= PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT;
return ret;
}
pt = phys_to_virt(pt->entry[l2idx] & PAGE_MASK);
if (!(pt->entry[l1idx] & PFL1_PRESENT)) {
return ret;
}
ret = PM_PFRAME((pt->entry[l1idx] & PT_PHYSMASK) >> PAGE_SHIFT);
ret |= PM_PSHIFT(PAGE_SHIFT) | PM_PRESENT;
return ret;
} }
int ihk_mc_pt_virt_to_phys(struct page_table *pt, int ihk_mc_pt_virt_to_phys(struct page_table *pt,
const void *virt, unsigned long *phys) const void *virt, unsigned long *phys)
{ {