From 4595aa307922695a6a32c4c8feab7169eb6123c8 Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Fri, 18 Mar 2016 20:19:52 +0900 Subject: [PATCH] pte_visitor_t(): change "pgsize" into "pgshift" --- arch/x86/kernel/memory.c | 25 +++++++++++----------- kernel/process.c | 45 +++++++++++++++++++++------------------- lib/include/ihk/mm.h | 2 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/arch/x86/kernel/memory.c b/arch/x86/kernel/memory.c index 79421f46..9aed39d8 100644 --- a/arch/x86/kernel/memory.c +++ b/arch/x86/kernel/memory.c @@ -939,7 +939,7 @@ static int visit_pte_l1(void *arg0, pte_t *ptep, uintptr_t base, } return (*args->funcp)(args->arg, args->pt, ptep, (void *)base, - PTL1_SIZE); + PTL1_SHIFT); } static int visit_pte_l2(void *arg0, pte_t *ptep, uintptr_t base, @@ -959,7 +959,7 @@ static int visit_pte_l2(void *arg0, pte_t *ptep, uintptr_t base, && (((base + PTL2_SIZE) <= end) || (end == 0))) { error = (*args->funcp)(args->arg, args->pt, ptep, - (void *)base, PTL2_SIZE); + (void *)base, PTL2_SHIFT); if (error != -E2BIG) { return error; } @@ -1003,7 +1003,7 @@ static int visit_pte_l3(void *arg0, pte_t *ptep, uintptr_t base, && (((base + PTL3_SIZE) <= end) || (end == 0))) { error = (*args->funcp)(args->arg, args->pt, ptep, - (void *)base, PTL3_SIZE); + (void *)base, PTL3_SHIFT); if (error != -E2BIG) { return error; } @@ -1921,21 +1921,22 @@ struct move_args { }; static int move_one_page(void *arg0, page_table_t pt, pte_t *ptep, - void *pgaddr, size_t pgsize) + void *pgaddr, int pgshift) { int error; struct move_args *args = arg0; + const size_t pgsize = (size_t)1 << pgshift; uintptr_t dest; pte_t apte; uintptr_t phys; enum ihk_mc_pt_attribute attr; - dkprintf("move_one_page(%p,%p,%p %#lx,%p,%#lx)\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize); + dkprintf("move_one_page(%p,%p,%p %#lx,%p,%d)\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift); if (pte_is_fileoff(ptep, pgsize)) { error = -ENOTSUPP; - kprintf("move_one_page(%p,%p,%p %#lx,%p,%#lx):fileoff. %d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + kprintf("move_one_page(%p,%p,%p %#lx,%p,%d):fileoff. %d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); goto out; } @@ -1950,16 +1951,16 @@ static int move_one_page(void *arg0, page_table_t pt, pte_t *ptep, error = ihk_mc_pt_set_range(pt, args->vm, (void *)dest, (void *)(dest + pgsize), phys, attr); if (error) { - kprintf("move_one_page(%p,%p,%p %#lx,%p,%#lx):" + kprintf("move_one_page(%p,%p,%p %#lx,%p,%d):" "set failed. %d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); goto out; } error = 0; out: - dkprintf("move_one_page(%p,%p,%p %#lx,%p,%#lx):%d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + dkprintf("move_one_page(%p,%p,%p %#lx,%p,%d):%d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); return error; } diff --git a/kernel/process.c b/kernel/process.c index 2a935057..1203fcc0 100644 --- a/kernel/process.c +++ b/kernel/process.c @@ -1211,23 +1211,24 @@ struct rfp_args { }; static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep, - void *pgaddr, size_t pgsize) + void *pgaddr, int pgshift) { struct rfp_args * const args = arg0; + const size_t pgsize = (size_t)1 << pgshift; int error; off_t off; pte_t apte; uintptr_t phys; struct page *page; - dkprintf("remap_one_page(%p,%p,%p %#lx,%p,%#lx)\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize); + dkprintf("remap_one_page(%p,%p,%p %#lx,%p,%d)\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift); /* XXX: NYI: large pages */ if (pgsize != PAGE_SIZE) { error = -E2BIG; - ekprintf("remap_one_page(%p,%p,%p %#lx,%p,%#lx):%d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + ekprintf("remap_one_page(%p,%p,%p %#lx,%p,%d):%d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); goto out; } @@ -1254,8 +1255,8 @@ static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep, error = 0; out: - dkprintf("remap_one_page(%p,%p,%p %#lx,%p,%#lx): %d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + dkprintf("remap_one_page(%p,%p,%p %#lx,%p,%d): %d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); return error; } @@ -1297,14 +1298,15 @@ struct sync_args { }; static int sync_one_page(void *arg0, page_table_t pt, pte_t *ptep, - void *pgaddr, size_t pgsize) + void *pgaddr, int pgshift) { struct sync_args *args = arg0; + const size_t pgsize = (size_t)1 << pgshift; int error; uintptr_t phys; - dkprintf("sync_one_page(%p,%p,%p %#lx,%p,%#lx)\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize); + dkprintf("sync_one_page(%p,%p,%p %#lx,%p,%d)\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift); if (pte_is_null(ptep) || pte_is_fileoff(ptep, pgsize) || !pte_is_dirty(ptep, pgsize)) { error = 0; @@ -1317,17 +1319,17 @@ static int sync_one_page(void *arg0, page_table_t pt, pte_t *ptep, phys = pte_get_phys(ptep); error = memobj_flush_page(args->memobj, phys, pgsize); if (error) { - ekprintf("sync_one_page(%p,%p,%p %#lx,%p,%#lx):" + ekprintf("sync_one_page(%p,%p,%p %#lx,%p,%d):" "flush failed. %d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); pte_set_dirty(ptep, pgsize); goto out; } error = 0; out: - dkprintf("sync_one_page(%p,%p,%p %#lx,%p,%#lx):%d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + dkprintf("sync_one_page(%p,%p,%p %#lx,%p,%d):%d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); return error; } @@ -1365,18 +1367,19 @@ struct invalidate_args { }; static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep, - void *pgaddr, size_t pgsize) + void *pgaddr, int pgshift) { struct invalidate_args *args = arg0; struct vm_range *range = args->range; + const size_t pgsize = (size_t)1 << pgshift; int error; uintptr_t phys; struct page *page; off_t linear_off; pte_t apte; - dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%#lx)\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize); + dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%d)\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift); if (pte_is_null(ptep) || pte_is_fileoff(ptep, pgsize)) { error = 0; goto out; @@ -1400,16 +1403,16 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep, error = memobj_invalidate_page(range->memobj, phys, pgsize); if (error) { - ekprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%#lx):" + ekprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%d):" "invalidate failed. %d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); goto out; } error = 0; out: - dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%#lx):%d\n", - arg0, pt, ptep, *ptep, pgaddr, pgsize, error); + dkprintf("invalidate_one_page(%p,%p,%p %#lx,%p,%d):%d\n", + arg0, pt, ptep, *ptep, pgaddr, pgshift, error); return error; } diff --git a/lib/include/ihk/mm.h b/lib/include/ihk/mm.h index 620ae0cc..39d114f9 100644 --- a/lib/include/ihk/mm.h +++ b/lib/include/ihk/mm.h @@ -136,7 +136,7 @@ int ihk_mc_pt_prepare_map(page_table_t pt, void *virt, unsigned long size, enum ihk_mc_pt_prepare_flag); typedef int pte_visitor_t(void *arg, page_table_t pt, pte_t *ptep, - void *pgaddr, size_t pgsize); + void *pgaddr, int pgshift); int visit_pte_range(page_table_t pt, void *start, void *end, enum visit_pte_flag flags, pte_visitor_t *funcp, void *arg); int move_pte_range(page_table_t pt, struct process_vm *vm,