From f7b277a6237d322a9a0debd312e861073f779fc1 Mon Sep 17 00:00:00 2001 From: Balazs Gerofi Date: Wed, 25 Apr 2018 16:16:38 +0900 Subject: [PATCH] HFI1: use ihk_mc_pt_lookup_fault_pte() in SDMA/exp receive --- kernel/user_exp_rcv.c | 6 +++--- kernel/user_sdma.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/user_exp_rcv.c b/kernel/user_exp_rcv.c index 151c5d5b..55b456ec 100644 --- a/kernel/user_exp_rcv.c +++ b/kernel/user_exp_rcv.c @@ -121,7 +121,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, struct hfi1_tid_info *tinf vaddr = tinfo->vaddr; - ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table, + ptep = ihk_mc_pt_lookup_fault_pte(vm, (void*)vaddr, 0, (void**)&base_vaddr, &base_pgsize, 0); @@ -138,7 +138,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, struct hfi1_tid_info *tinf /* Are we right at a page border? */ if (len == 0) { - ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table, + ptep = ihk_mc_pt_lookup_fault_pte(vm, (void*)vaddr, 0, (void**)&base_vaddr, &base_pgsize, 0); @@ -161,7 +161,7 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, struct hfi1_tid_info *tinf int contiguous = 0; /* Look up next page */ - __ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table, + __ptep = ihk_mc_pt_lookup_fault_pte(vm, (void*)vaddr + len, 0, (void**)&__base_vaddr, &__base_pgsize, 0); diff --git a/kernel/user_sdma.c b/kernel/user_sdma.c index df9ae22b..836a1c81 100644 --- a/kernel/user_sdma.c +++ b/kernel/user_sdma.c @@ -743,8 +743,8 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec, * Store the physical address of the first page and * the page size in iovec. */ - ptep = ihk_mc_pt_lookup_pte( - cpu_local_var(current)->vm->address_space->page_table, + ptep = ihk_mc_pt_lookup_fault_pte( + cpu_local_var(current)->vm, virt, 0, 0, @@ -1178,8 +1178,8 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, pte_t *ptep; size_t base_pgsize; - ptep = ihk_mc_pt_lookup_pte( - cpu_local_var(current)->vm->address_space->page_table, + ptep = ihk_mc_pt_lookup_fault_pte( + cpu_local_var(current)->vm, virt, 0, 0, &base_pgsize, 0); if (unlikely(!ptep || !pte_is_present(ptep))) { kprintf("%s: ERROR: no valid PTE for 0x%lx\n",