Commit 7e4359e2 authored by Tom Tucker's avatar Tom Tucker Committed by J. Bruce Fields

Fix regression in NFSRDMA server

The server regression was caused by the addition of rq_next_page
(afc59400). There were a few places that
were missed with the update of the rq_respages array.
Signed-off-by: default avatarTom Tucker <tom@ogc.us>
Tested-by: default avatarSteve Wise <swise@ogc.us>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent fbb74a34
...@@ -90,6 +90,7 @@ static void rdma_build_arg_xdr(struct svc_rqst *rqstp, ...@@ -90,6 +90,7 @@ static void rdma_build_arg_xdr(struct svc_rqst *rqstp,
sge_no++; sge_no++;
} }
rqstp->rq_respages = &rqstp->rq_pages[sge_no]; rqstp->rq_respages = &rqstp->rq_pages[sge_no];
rqstp->rq_next_page = rqstp->rq_respages + 1;
/* We should never run out of SGE because the limit is defined to /* We should never run out of SGE because the limit is defined to
* support the max allowed RPC data length * support the max allowed RPC data length
...@@ -169,6 +170,7 @@ static int map_read_chunks(struct svcxprt_rdma *xprt, ...@@ -169,6 +170,7 @@ static int map_read_chunks(struct svcxprt_rdma *xprt,
*/ */
head->arg.pages[page_no] = rqstp->rq_arg.pages[page_no]; head->arg.pages[page_no] = rqstp->rq_arg.pages[page_no];
rqstp->rq_respages = &rqstp->rq_arg.pages[page_no+1]; rqstp->rq_respages = &rqstp->rq_arg.pages[page_no+1];
rqstp->rq_next_page = rqstp->rq_respages + 1;
byte_count -= sge_bytes; byte_count -= sge_bytes;
ch_bytes -= sge_bytes; ch_bytes -= sge_bytes;
...@@ -276,6 +278,7 @@ static int fast_reg_read_chunks(struct svcxprt_rdma *xprt, ...@@ -276,6 +278,7 @@ static int fast_reg_read_chunks(struct svcxprt_rdma *xprt,
/* rq_respages points one past arg pages */ /* rq_respages points one past arg pages */
rqstp->rq_respages = &rqstp->rq_arg.pages[page_no]; rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
rqstp->rq_next_page = rqstp->rq_respages + 1;
/* Create the reply and chunk maps */ /* Create the reply and chunk maps */
offset = 0; offset = 0;
...@@ -520,13 +523,6 @@ static int rdma_read_xdr(struct svcxprt_rdma *xprt, ...@@ -520,13 +523,6 @@ static int rdma_read_xdr(struct svcxprt_rdma *xprt,
for (ch_no = 0; &rqstp->rq_pages[ch_no] < rqstp->rq_respages; ch_no++) for (ch_no = 0; &rqstp->rq_pages[ch_no] < rqstp->rq_respages; ch_no++)
rqstp->rq_pages[ch_no] = NULL; rqstp->rq_pages[ch_no] = NULL;
/*
* Detach res pages. If svc_release sees any it will attempt to
* put them.
*/
while (rqstp->rq_next_page != rqstp->rq_respages)
*(--rqstp->rq_next_page) = NULL;
return err; return err;
} }
...@@ -550,7 +546,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp, ...@@ -550,7 +546,7 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
/* rq_respages starts after the last arg page */ /* rq_respages starts after the last arg page */
rqstp->rq_respages = &rqstp->rq_arg.pages[page_no]; rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
rqstp->rq_next_page = &rqstp->rq_arg.pages[page_no]; rqstp->rq_next_page = rqstp->rq_respages + 1;
/* Rebuild rq_arg head and tail. */ /* Rebuild rq_arg head and tail. */
rqstp->rq_arg.head[0] = head->arg.head[0]; rqstp->rq_arg.head[0] = head->arg.head[0];
......
...@@ -625,6 +625,7 @@ static int send_reply(struct svcxprt_rdma *rdma, ...@@ -625,6 +625,7 @@ static int send_reply(struct svcxprt_rdma *rdma,
if (page_no+1 >= sge_no) if (page_no+1 >= sge_no)
ctxt->sge[page_no+1].length = 0; ctxt->sge[page_no+1].length = 0;
} }
rqstp->rq_next_page = rqstp->rq_respages + 1;
BUG_ON(sge_no > rdma->sc_max_sge); BUG_ON(sge_no > rdma->sc_max_sge);
memset(&send_wr, 0, sizeof send_wr); memset(&send_wr, 0, sizeof send_wr);
ctxt->wr_op = IB_WR_SEND; ctxt->wr_op = IB_WR_SEND;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment