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

copy_user_pte: vmap area not owned by McKernel

Browse Source 
Refs: #1166
Fujitsu: POSTK_DEBUG_TEMP_FIX_14
Change-Id: Iae0f1145d58ec2c14cecc14409b08a1db3b067b7
This commit is contained in:
Masamichi Takagi
2019-02-24 17:24:22 +09:00
parent 764948b51f
commit f07e20a381
5 changed files with 105 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/process.c
View File

@ -644,6 +644,7 @@ static int copy_user_pte(void *arg0, page_table_t src_pt, pte_t *src_ptep, void
int error;
intptr_t src_phys;
struct page *src_page;
unsigned long src_lphys;
void *src_kvirt;
size_t pgsize = (size_t)1 << pgshift;
int npages;
@ -651,6 +652,7 @@ static int copy_user_pte(void *arg0, page_table_t src_pt, pte_t *src_ptep, void
intptr_t phys;
int pgalign = pgshift - PAGE_SHIFT;
enum ihk_mc_pt_attribute attr;
int is_mckernel;
if (!pte_is_present(src_ptep)) {
error = 0;
@ -659,7 +661,6 @@ static int copy_user_pte(void *arg0, page_table_t src_pt, pte_t *src_ptep, void
src_phys = pte_get_phys(src_ptep);
src_page = phys_to_page(src_phys);
src_kvirt = phys_to_virt(src_phys);
if (src_page && page_is_in_memobj(src_page)) {
error = 0;
@ -698,10 +699,24 @@ static int copy_user_pte(void *arg0, page_table_t src_pt, pte_t *src_ptep, void
phys = virt_to_phys(virt);
dkprintf("copy_user_pte(): phys page allocated\n");
attr = arch_vrflag_to_ptattr(args->new_vrflag, PF_POPULATE,
NULL);
is_mckernel = is_mckernel_memory(src_phys, src_phys + pgsize);
if (is_mckernel) {
src_kvirt = phys_to_virt(src_phys);
} else {
src_lphys = ihk_mc_map_memory(NULL, src_phys, pgsize);
src_kvirt = ihk_mc_map_virtual(src_lphys, 1, attr);
}
memcpy(virt, src_kvirt, pgsize);
dkprintf("copy_user_pte(): memcpy OK\n");
attr = arch_vrflag_to_ptattr(args->new_vrflag, PF_POPULATE, NULL);
if (!is_mckernel) {
ihk_mc_unmap_virtual(src_kvirt, 1);
ihk_mc_unmap_memory(NULL, src_lphys, pgsize);
}
}
error = ihk_mc_pt_set_range(args->new_vm->address_space->page_table,