ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

svcrdma: Use parsed chunk lists to derive the inv_rkey

Browse Source 
Refactor: Don't duplicate header decoding smarts here. Instead, use
the new parsed chunk lists.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever
2020-06-22 09:46:05 -04:00
parent 78147ca8b4
commit eb3de6a49d
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
View File

@@ -586,60 +586,53 @@ static bool xdr_check_reply_chunk(struct svc_rdma_recv_ctxt *rctxt)
* *
* If there is exactly one distinct R_key in the received transport * If there is exactly one distinct R_key in the received transport
* header, set rc_inv_rkey to that R_key. Otherwise, set it to zero. * header, set rc_inv_rkey to that R_key. Otherwise, set it to zero.
*
* Perform this operation while the received transport header is
* still in the CPU cache.
*/ */
static void svc_rdma_get_inv_rkey(struct svcxprt_rdma *rdma, static void svc_rdma_get_inv_rkey(struct svcxprt_rdma *rdma,
struct svc_rdma_recv_ctxt *ctxt) struct svc_rdma_recv_ctxt *ctxt)
{ {
__be32 inv_rkey, *p; struct svc_rdma_segment *segment;
u32 i, segcount; struct svc_rdma_chunk *chunk;
u32 inv_rkey;
ctxt->rc_inv_rkey = 0; ctxt->rc_inv_rkey = 0;
if (!rdma->sc_snd_w_inv) if (!rdma->sc_snd_w_inv)
return; return;
inv_rkey = xdr_zero; inv_rkey = 0;
p = ctxt->rc_recv_buf; pcl_for_each_chunk(chunk, &ctxt->rc_call_pcl) {
p += rpcrdma_fixed_maxsz; pcl_for_each_segment(segment, chunk) {
if (inv_rkey == 0)
/* Read list */ inv_rkey = segment->rs_handle;
while (xdr_item_is_present(p++)) { else if (inv_rkey != segment->rs_handle)
p++; /* position */
if (inv_rkey == xdr_zero)
inv_rkey = *p;
else if (inv_rkey != *p)
return;
p += 4;
}
/* Write list */
while (xdr_item_is_present(p++)) {
segcount = be32_to_cpup(p++);
for (i = 0; i < segcount; i++) {
if (inv_rkey == xdr_zero)
inv_rkey = *p;
else if (inv_rkey != *p)
return; return;
p += 4;
} }
} }
pcl_for_each_chunk(chunk, &ctxt->rc_read_pcl) {
/* Reply chunk */ pcl_for_each_segment(segment, chunk) {
if (xdr_item_is_present(p++)) { if (inv_rkey == 0)
segcount = be32_to_cpup(p++); inv_rkey = segment->rs_handle;
for (i = 0; i < segcount; i++) { else if (inv_rkey != segment->rs_handle)
if (inv_rkey == xdr_zero)
inv_rkey = *p;
else if (inv_rkey != *p)
return; return;
p += 4;
} }
} }
pcl_for_each_chunk(chunk, &ctxt->rc_write_pcl) {
ctxt->rc_inv_rkey = be32_to_cpu(inv_rkey); pcl_for_each_segment(segment, chunk) {
if (inv_rkey == 0)
inv_rkey = segment->rs_handle;
else if (inv_rkey != segment->rs_handle)
return;
}
}
pcl_for_each_chunk(chunk, &ctxt->rc_reply_pcl) {
pcl_for_each_segment(segment, chunk) {
if (inv_rkey == 0)
inv_rkey = segment->rs_handle;
else if (inv_rkey != segment->rs_handle)
return;
}
}
ctxt->rc_inv_rkey = inv_rkey;
} }
/** /**