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

user_sdma_send_pkts(): unlikely() around slow path condition

Browse Source
This commit is contained in:
Balazs Gerofi
2017-08-17 22:27:58 +09:00
parent 51bc28acca
commit 5ac582a678
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/user_sdma.c
View File

@ -1343,7 +1343,10 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
TP("+ If the request contains any data vectors, add up to fragsize bytes to the descriptor."); TP("+ If the request contains any data vectors, add up to fragsize bytes to the descriptor.");
while (queued < datalen && while (queued < datalen &&
(req->sent + data_sent) < req->data_len) { (req->sent + data_sent) < req->data_len) {
unsigned pageidx, len; #ifdef __HFI1_ORIG__
unsigned pageidx;
#endif
unsigned len;
unsigned long base, offset; unsigned long base, offset;
void *virt; void *virt;
pte_t *ptep; pte_t *ptep;
@ -1354,12 +1357,12 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
/* /*
* Resolve base_phys if vaddr is out of previous page. * Resolve base_phys if vaddr is out of previous page.
*/ */
if (virt < base_virt || if (unlikely(virt < base_virt ||
virt > (base_virt + base_pgsize)) { virt > (base_virt + base_pgsize))) {
ptep = ihk_mc_pt_lookup_pte( ptep = ihk_mc_pt_lookup_pte(
cpu_local_var(current)->vm->address_space->page_table, cpu_local_var(current)->vm->address_space->page_table,
virt, 0, 0, &base_pgsize, 0); virt, 0, 0, &base_pgsize, 0);
if (!ptep || !pte_is_present(ptep)) { if (unlikely(!ptep || !pte_is_present(ptep))) {
kprintf("%s: ERROR: no valid PTE for 0x%lx\n", kprintf("%s: ERROR: no valid PTE for 0x%lx\n",
__FUNCTION__, virt); __FUNCTION__, virt);
return -EFAULT; return -EFAULT;
@ -1386,10 +1389,11 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
* doesn't like it if the physical range in an SDMA * doesn't like it if the physical range in an SDMA
* descriptor crosses page boundaries?? * descriptor crosses page boundaries??
*/ */
/*
len = virt + req->info.fragsize > len = virt + req->info.fragsize >
base_virt + base_pgsize ? base_virt + base_pgsize ?
base_virt + base_pgsize - virt : req->info.fragsize; base_virt + base_pgsize - virt : req->info.fragsize;
*/
offset = offset_in_page(base + iovec->offset + offset = offset_in_page(base + iovec->offset +
iov_offset); iov_offset);
len = offset + req->info.fragsize > PAGE_SIZE ? len = offset + req->info.fragsize > PAGE_SIZE ?
@ -1460,8 +1464,12 @@ static int user_sdma_send_pkts(struct user_sdma_request *req, unsigned maxpkts)
dosend: dosend:
ret = sdma_send_txlist(req->sde, ret = sdma_send_txlist(req->sde,
iowait_get_ib_work(&pq->busy), #ifdef __HFI1_ORIG__
&req->txps, &count); iowait_get_ib_work(&pq->busy),
#else
NULL,
#endif
&req->txps, &count);
req->seqsubmitted += count; req->seqsubmitted += count;
if (req->seqsubmitted == req->info.npkts) { if (req->seqsubmitted == req->info.npkts) {
set_bit(SDMA_REQ_SEND_DONE, &req->flags); set_bit(SDMA_REQ_SEND_DONE, &req->flags);
@ -1471,10 +1479,8 @@ dosend:
* happen due to the sequential manner in which * happen due to the sequential manner in which
* descriptors are processed. * descriptors are processed.
*/ */
#ifdef __HFI1_ORIG__
if (test_bit(SDMA_REQ_HAVE_AHG, &req->flags)) if (test_bit(SDMA_REQ_HAVE_AHG, &req->flags))
sdma_ahg_free(req->sde, req->ahg_idx); sdma_ahg_free(req->sde, req->ahg_idx);
#endif /* __HFI1_ORIG__ */
} }
hfi1_cdbg(AIOWRITE, "-"); hfi1_cdbg(AIOWRITE, "-");
TP("-"); TP("-");