diff options
Diffstat (limited to 'net/sunrpc/xprtrdma')
-rw-r--r-- | net/sunrpc/xprtrdma/rpc_rdma.c | 26 | ||||
-rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_sendto.c | 8 |
2 files changed, 19 insertions, 15 deletions
diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index 14106d26bb95..e5e28d1946a4 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c | |||
@@ -310,6 +310,19 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad) | |||
310 | __func__, pad, destp, rqst->rq_slen, curlen); | 310 | __func__, pad, destp, rqst->rq_slen, curlen); |
311 | 311 | ||
312 | copy_len = rqst->rq_snd_buf.page_len; | 312 | copy_len = rqst->rq_snd_buf.page_len; |
313 | |||
314 | if (rqst->rq_snd_buf.tail[0].iov_len) { | ||
315 | curlen = rqst->rq_snd_buf.tail[0].iov_len; | ||
316 | if (destp + copy_len != rqst->rq_snd_buf.tail[0].iov_base) { | ||
317 | memmove(destp + copy_len, | ||
318 | rqst->rq_snd_buf.tail[0].iov_base, curlen); | ||
319 | r_xprt->rx_stats.pullup_copy_count += curlen; | ||
320 | } | ||
321 | dprintk("RPC: %s: tail destp 0x%p len %d\n", | ||
322 | __func__, destp + copy_len, curlen); | ||
323 | rqst->rq_svec[0].iov_len += curlen; | ||
324 | } | ||
325 | |||
313 | r_xprt->rx_stats.pullup_copy_count += copy_len; | 326 | r_xprt->rx_stats.pullup_copy_count += copy_len; |
314 | npages = PAGE_ALIGN(rqst->rq_snd_buf.page_base+copy_len) >> PAGE_SHIFT; | 327 | npages = PAGE_ALIGN(rqst->rq_snd_buf.page_base+copy_len) >> PAGE_SHIFT; |
315 | for (i = 0; copy_len && i < npages; i++) { | 328 | for (i = 0; copy_len && i < npages; i++) { |
@@ -332,17 +345,6 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad) | |||
332 | destp += curlen; | 345 | destp += curlen; |
333 | copy_len -= curlen; | 346 | copy_len -= curlen; |
334 | } | 347 | } |
335 | if (rqst->rq_snd_buf.tail[0].iov_len) { | ||
336 | curlen = rqst->rq_snd_buf.tail[0].iov_len; | ||
337 | if (destp != rqst->rq_snd_buf.tail[0].iov_base) { | ||
338 | memcpy(destp, | ||
339 | rqst->rq_snd_buf.tail[0].iov_base, curlen); | ||
340 | r_xprt->rx_stats.pullup_copy_count += curlen; | ||
341 | } | ||
342 | dprintk("RPC: %s: tail destp 0x%p len %d curlen %d\n", | ||
343 | __func__, destp, copy_len, curlen); | ||
344 | rqst->rq_svec[0].iov_len += curlen; | ||
345 | } | ||
346 | /* header now contains entire send message */ | 348 | /* header now contains entire send message */ |
347 | return pad; | 349 | return pad; |
348 | } | 350 | } |
@@ -656,7 +658,7 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqst, char *srcp, int copy_len, int pad) | |||
656 | if (curlen > rqst->rq_rcv_buf.tail[0].iov_len) | 658 | if (curlen > rqst->rq_rcv_buf.tail[0].iov_len) |
657 | curlen = rqst->rq_rcv_buf.tail[0].iov_len; | 659 | curlen = rqst->rq_rcv_buf.tail[0].iov_len; |
658 | if (rqst->rq_rcv_buf.tail[0].iov_base != srcp) | 660 | if (rqst->rq_rcv_buf.tail[0].iov_base != srcp) |
659 | memcpy(rqst->rq_rcv_buf.tail[0].iov_base, srcp, curlen); | 661 | memmove(rqst->rq_rcv_buf.tail[0].iov_base, srcp, curlen); |
660 | dprintk("RPC: %s: tail srcp 0x%p len %d curlen %d\n", | 662 | dprintk("RPC: %s: tail srcp 0x%p len %d curlen %d\n", |
661 | __func__, srcp, copy_len, curlen); | 663 | __func__, srcp, copy_len, curlen); |
662 | rqst->rq_rcv_buf.tail[0].iov_len = curlen; | 664 | rqst->rq_rcv_buf.tail[0].iov_len = curlen; |
diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c index a3334e3b73cc..6c26a675435a 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c | |||
@@ -191,7 +191,6 @@ static int map_xdr(struct svcxprt_rdma *xprt, | |||
191 | struct xdr_buf *xdr, | 191 | struct xdr_buf *xdr, |
192 | struct svc_rdma_req_map *vec) | 192 | struct svc_rdma_req_map *vec) |
193 | { | 193 | { |
194 | int sge_max = (xdr->len+PAGE_SIZE-1) / PAGE_SIZE + 3; | ||
195 | int sge_no; | 194 | int sge_no; |
196 | u32 sge_bytes; | 195 | u32 sge_bytes; |
197 | u32 page_bytes; | 196 | u32 page_bytes; |
@@ -235,7 +234,11 @@ static int map_xdr(struct svcxprt_rdma *xprt, | |||
235 | sge_no++; | 234 | sge_no++; |
236 | } | 235 | } |
237 | 236 | ||
238 | BUG_ON(sge_no > sge_max); | 237 | dprintk("svcrdma: map_xdr: sge_no %d page_no %d " |
238 | "page_base %u page_len %u head_len %zu tail_len %zu\n", | ||
239 | sge_no, page_no, xdr->page_base, xdr->page_len, | ||
240 | xdr->head[0].iov_len, xdr->tail[0].iov_len); | ||
241 | |||
239 | vec->count = sge_no; | 242 | vec->count = sge_no; |
240 | return 0; | 243 | return 0; |
241 | } | 244 | } |
@@ -579,7 +582,6 @@ static int send_reply(struct svcxprt_rdma *rdma, | |||
579 | ctxt->sge[page_no+1].length = 0; | 582 | ctxt->sge[page_no+1].length = 0; |
580 | } | 583 | } |
581 | BUG_ON(sge_no > rdma->sc_max_sge); | 584 | BUG_ON(sge_no > rdma->sc_max_sge); |
582 | BUG_ON(sge_no > ctxt->count); | ||
583 | memset(&send_wr, 0, sizeof send_wr); | 585 | memset(&send_wr, 0, sizeof send_wr); |
584 | ctxt->wr_op = IB_WR_SEND; | 586 | ctxt->wr_op = IB_WR_SEND; |
585 | send_wr.wr_id = (unsigned long)ctxt; | 587 | send_wr.wr_id = (unsigned long)ctxt; |