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

HFI1: fix completion mapping

Browse Source
This commit is contained in:
Balazs Gerofi
2017-08-10 21:22:49 +09:00
parent 37866e61ab
commit 3c357dc30a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/user_sdma.c
View File

@ -78,6 +78,7 @@
#include "trace.h" #include "trace.h"
#include "mmu_rb.h" #include "mmu_rb.h"
#include <ihk/mm.h>
module_param_named(sdma_comp_size, hfi1_sdma_comp_ring_size, uint, S_IRUGO); module_param_named(sdma_comp_size, hfi1_sdma_comp_ring_size, uint, S_IRUGO);
MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 128"); MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 128");
@ -647,19 +648,18 @@ int hfi1_user_sdma_process_request(void *private_data, struct iovec *iovec,
enum ihk_mc_pt_attribute attr = PTATTR_WRITABLE; enum ihk_mc_pt_attribute attr = PTATTR_WRITABLE;
ihk_mc_spinlock_lock_noirq(&vm->page_table_lock); ihk_mc_spinlock_lock_noirq(&vm->page_table_lock);
/* Check if mapping exists already and map if not */ /* Check if mapping exists already and map if not */
for (virt = (void *)cq->comps; virt < (void *)cq->comps + len; for (virt = (void *)cq->comps; virt < (((void *)cq->comps) + len);
virt += PAGE_SIZE) { virt += PAGE_SIZE) {
ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table, ptep = ihk_mc_pt_lookup_pte(vm->address_space->page_table,
virt, 0, &phys, &pgsize, 0); virt, 0, 0, &pgsize, 0);
if (ptep && pte_is_present(*ptep)) { if (ptep && pte_is_present(ptep)) {
goto cq_map_unlock; goto cq_map_unlock;
} }
ptep = ihk_mc_pt_lookup_pte(ihk_mc_get_linux_kernel_pgt(), if (ihk_mc_pt_virt_to_phys(ihk_mc_get_linux_kernel_pgt(),
virt, 0, &phys, &pgsize, 0); virt, &phys) < 0) {
if (!ptep || !pte_is_present(*ptep)) {
/* TODO: shall we make this function fail? */ /* TODO: shall we make this function fail? */
kprintf("%s: ERROR: mapping cq, Linux mapping doesn't exist\n", kprintf("%s: ERROR: mapping cq, Linux mapping doesn't exist\n",
__FUNCTION__); __FUNCTION__);