[PATCH] RPC: extract socket logic common to both client and server
Clean-up: Move some code that is common to both RPC client- and server-side socket transports into its own source file, net/sunrpc/socklib.c. Test-plan: Compile kernel with CONFIG_NFS enabled. Millions of fsx operations over UDP, client and server. Connectathon over UDP. Version: Thu, 11 Aug 2005 16:03:09 -0400 Signed-off-by: Chuck Lever <cel@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
committed by
Trond Myklebust
parent
602f83273c
commit
094bb20b9f
@ -691,70 +691,6 @@ xprt_complete_rqst(struct rpc_xprt *xprt, struct rpc_rqst *req, int copied)
|
||||
return;
|
||||
}
|
||||
|
||||
static size_t
|
||||
skb_read_bits(skb_reader_t *desc, void *to, size_t len)
|
||||
{
|
||||
if (len > desc->count)
|
||||
len = desc->count;
|
||||
if (skb_copy_bits(desc->skb, desc->offset, to, len))
|
||||
return 0;
|
||||
desc->count -= len;
|
||||
desc->offset += len;
|
||||
return len;
|
||||
}
|
||||
|
||||
static size_t
|
||||
skb_read_and_csum_bits(skb_reader_t *desc, void *to, size_t len)
|
||||
{
|
||||
unsigned int csum2, pos;
|
||||
|
||||
if (len > desc->count)
|
||||
len = desc->count;
|
||||
pos = desc->offset;
|
||||
csum2 = skb_copy_and_csum_bits(desc->skb, pos, to, len, 0);
|
||||
desc->csum = csum_block_add(desc->csum, csum2, pos);
|
||||
desc->count -= len;
|
||||
desc->offset += len;
|
||||
return len;
|
||||
}
|
||||
|
||||
/*
|
||||
* We have set things up such that we perform the checksum of the UDP
|
||||
* packet in parallel with the copies into the RPC client iovec. -DaveM
|
||||
*/
|
||||
int
|
||||
csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
|
||||
{
|
||||
skb_reader_t desc;
|
||||
|
||||
desc.skb = skb;
|
||||
desc.offset = sizeof(struct udphdr);
|
||||
desc.count = skb->len - desc.offset;
|
||||
|
||||
if (skb->ip_summed == CHECKSUM_UNNECESSARY)
|
||||
goto no_checksum;
|
||||
|
||||
desc.csum = csum_partial(skb->data, desc.offset, skb->csum);
|
||||
if (xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_and_csum_bits) < 0)
|
||||
return -1;
|
||||
if (desc.offset != skb->len) {
|
||||
unsigned int csum2;
|
||||
csum2 = skb_checksum(skb, desc.offset, skb->len - desc.offset, 0);
|
||||
desc.csum = csum_block_add(desc.csum, csum2, desc.offset);
|
||||
}
|
||||
if (desc.count)
|
||||
return -1;
|
||||
if ((unsigned short)csum_fold(desc.csum))
|
||||
return -1;
|
||||
return 0;
|
||||
no_checksum:
|
||||
if (xdr_partial_copy_from_skb(xdr, 0, &desc, skb_read_bits) < 0)
|
||||
return -1;
|
||||
if (desc.count)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Input handler for RPC replies. Called from a bottom half and hence
|
||||
* atomic.
|
||||
|
Reference in New Issue
Block a user