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

HFI: call hfi1_map_device_addresses() at initialization time

Browse Source 
Conflicts:
	kernel/syscall.c
This commit is contained in:
Balazs Gerofi
2017-10-04 14:18:53 +09:00
parent 54bdb3419d
commit 7a1ad31183
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/file_ops.c
View File

@@ -571,6 +571,7 @@ long hfi1_file_ioctl(void *private_data, unsigned int cmd,
else else
return -EPERM; return -EPERM;
#endif #endif
ret = -ENODEV;
dkprintf("%s: HFI1_IOCTL_SET_PKEY \n", __FUNCTION__); dkprintf("%s: HFI1_IOCTL_SET_PKEY \n", __FUNCTION__);
break; break;
@@ -687,10 +688,6 @@ ssize_t hfi1_aio_write(void *private_data, const struct iovec *iovec, unsigned l
if (!dim) if (!dim)
return -EINVAL; return -EINVAL;
if (hfi1_map_device_addresses(fd) < 0) {
return -EINVAL;
}
hfi1_cdbg(SDMA, "SDMA request from %u:%u (%lu)", hfi1_cdbg(SDMA, "SDMA request from %u:%u (%lu)",
fd->uctxt->ctxt, fd->subctxt, dim); fd->uctxt->ctxt, fd->subctxt, dim);

21
kernel/syscall.c
View File

@@ -3146,6 +3146,7 @@ SYSCALL_DECLARE(ioctl)
long irqstate; long irqstate;
void *private_data = proc->fd_priv_table[fd]; void *private_data = proc->fd_priv_table[fd];
unsigned long t_s = rdtsc(); unsigned long t_s = rdtsc();
int sub_rc = 0;
irqstate = ihk_mc_spinlock_lock(&proc->mckfd_lock); irqstate = ihk_mc_spinlock_lock(&proc->mckfd_lock);
for(fdp = proc->mckfd; fdp; fdp = fdp->next) for(fdp = proc->mckfd; fdp; fdp = fdp->next)
@@ -3163,20 +3164,34 @@ SYSCALL_DECLARE(ioctl)
ihk_mc_syscall_arg1(ctx), ihk_mc_syscall_arg1(ctx),
ihk_mc_syscall_arg2(ctx), ihk_mc_syscall_arg2(ctx),
t_s); t_s);
/* continue forwarding iff hfi1 didn't handle it */
/* Continue forwarding iff hfi1 didn't handle it */
// TODO: improve heuristics? // TODO: improve heuristics?
if (rc != -ENOTSUPP) if (rc != -ENOTSUPP && rc != -ENODEV)
return rc; return rc;
if (rc == -ENODEV) {
sub_rc = rc;
}
} }
if (fdp && fdp->ioctl_cb) { if (fdp && fdp->ioctl_cb) {
//kprintf("ioctl: found system fd %d\n", fd);
rc = fdp->ioctl_cb(fdp, ctx); rc = fdp->ioctl_cb(fdp, ctx);
} }
else { else {
rc = syscall_generic_forwarding(__NR_ioctl, ctx); rc = syscall_generic_forwarding(__NR_ioctl, ctx);
} }
if (private_data && sub_rc == -ENODEV) {
extern int hfi1_map_device_addresses(void *fd);
if (hfi1_map_device_addresses(private_data) < 0) {
kprintf("%s: Could not map hfi1 device addresses\n",
__FUNCTION__);
return -EINVAL;
}
}
return rc; return rc;
} }

6
kernel/user_exp_rcv.c
View File

@@ -100,12 +100,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, struct hfi1_tid_info *tinf
return -EINVAL; return -EINVAL;
} }
if (hfi1_map_device_addresses(fd) < 0) {
kprintf("%s: Could not map hfi1 device addresses\n",
__FUNCTION__);
return -EINVAL;
}
tidlist = kmalloc_cache_alloc(&tidlist_cache, tidlist = kmalloc_cache_alloc(&tidlist_cache,
//sizeof(*tidlist) * uctxt->expected_count); //sizeof(*tidlist) * uctxt->expected_count);
sizeof(*tidlist) * 1024); sizeof(*tidlist) * 1024);