Commit 067fb11b authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Remove rpc_xprt::tsh_size 



tsh_size was added to accommodate transports that send a pre-amble
before each RPC message. However, this assumes the pre-amble is
fixed in size, which isn't true for some transports. That makes
tsh_size not very generic.

Also I'd like to make the estimation of RPC send and receive
buffer sizes more precise. tsh_size doesn't currently appear to be
accounted for at all by call_allocate.

Therefore let's just remove the tsh_size concept, and make the only
transports that have a non-zero tsh_size employ a direct approach.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 80125d4a

include/linux/sunrpc/xprt.h

+0 −7
Original line number Diff line number Diff line
@@ -196,8 +196,6 @@ struct rpc_xprt { 


	size_t			max_payload;	/* largest RPC payload size,

						   in bytes */

	unsigned int		tsh_size;	/* size of transport specific

						   header */



	struct rpc_wait_queue	binding;	/* requests waiting on rpcbind */

	struct rpc_wait_queue	sending;	/* requests waiting to send */
@@ -362,11 +360,6 @@ struct rpc_xprt * xprt_alloc(struct net *net, size_t size, 
				unsigned int max_req);

void			xprt_free(struct rpc_xprt *);



static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)

{

	return p + xprt->tsh_size;

}



static inline int

xprt_enable_swap(struct rpc_xprt *xprt)

{

net/sunrpc/auth_gss/auth_gss.c

+1 −2
Original line number Diff line number Diff line
@@ -1563,8 +1563,7 @@ gss_marshal(struct rpc_task *task, __be32 *p) 


	/* We compute the checksum for the verifier over the xdr-encoded bytes

	 * starting with the xid and ending at the end of the credential: */

	iov.iov_base = xprt_skip_transport_header(req->rq_xprt,

					req->rq_snd_buf.head[0].iov_base);

	iov.iov_base = req->rq_snd_buf.head[0].iov_base;

	iov.iov_len = (u8 *)p - (u8 *)iov.iov_base;

	xdr_buf_from_iov(&iov, &verf_buf);

net/sunrpc/clnt.c

+0 −1
Original line number Diff line number Diff line
@@ -2331,7 +2331,6 @@ rpc_encode_header(struct rpc_task *task) 


	/* FIXME: check buffer size? */



	p = xprt_skip_transport_header(req->rq_xprt, p);

	*p++ = req->rq_xid;		/* XID */

	*p++ = htonl(RPC_CALL);		/* CALL */

	*p++ = htonl(RPC_VERSION);	/* RPC version */

net/sunrpc/svc.c

+4 −15
Original line number Diff line number Diff line
@@ -1144,17 +1144,6 @@ void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) 
static __printf(2,3) void svc_printk(struct svc_rqst *rqstp, const char *fmt, ...) {}

#endif



/*

 * Setup response header for TCP, it has a 4B record length field.

 */

static void svc_tcp_prep_reply_hdr(struct svc_rqst *rqstp)

{

	struct kvec *resv = &rqstp->rq_res.head[0];



	/* tcp needs a space for the record length... */

	svc_putnl(resv, 0);

}



/*

 * Common routine for processing the RPC request.

 */
@@ -1182,10 +1171,6 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) 
	set_bit(RQ_USEDEFERRAL, &rqstp->rq_flags);

	clear_bit(RQ_DROPME, &rqstp->rq_flags);



	/* Setup reply header */

	if (rqstp->rq_prot == IPPROTO_TCP)

		svc_tcp_prep_reply_hdr(rqstp);



	svc_putu32(resv, rqstp->rq_xid);



	vers = svc_getnl(argv);
@@ -1443,6 +1428,10 @@ svc_process(struct svc_rqst *rqstp) 
		goto out_drop;

	}



	/* Reserve space for the record marker */

	if (rqstp->rq_prot == IPPROTO_TCP)

		svc_putnl(resv, 0);



	/* Returns 1 for send, 0 for drop */

	if (likely(svc_process_common(rqstp, argv, resv)))

		return svc_send(rqstp);

net/sunrpc/xprtrdma/svc_rdma_backchannel.c

+0 −1
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ xprt_setup_rdma_bc(struct xprt_create *args) 
	xprt->idle_timeout = RPCRDMA_IDLE_DISC_TO;



	xprt->prot = XPRT_TRANSPORT_BC_RDMA;

	xprt->tsh_size = 0;

	xprt->ops = &xprt_rdma_bc_procs;



	memcpy(&xprt->addr, args->dstaddr, args->addrlen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE