Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ccc61b1 authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

SUNRPC: Add xdr_stream::rqst field 



Having access to the controlling rpc_rqst means a trace point in the
XDR code can report:

 - the XID
 - the task ID and client ID
 - the p_name of RPC being processed

Subsequent patches will introduce such trace points.

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

fs/nfs/callback_xdr.c

+3 −2
Original line number Diff line number Diff line
@@ -943,10 +943,11 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
	};

	unsigned int nops = 0;



	xdr_init_decode(&xdr_in, &rqstp->rq_arg, rqstp->rq_arg.head[0].iov_base);

	xdr_init_decode(&xdr_in, &rqstp->rq_arg,

			rqstp->rq_arg.head[0].iov_base, NULL);



	p = (__be32*)((char *)rqstp->rq_res.head[0].iov_base + rqstp->rq_res.head[0].iov_len);

	xdr_init_encode(&xdr_out, &rqstp->rq_res, p);

	xdr_init_encode(&xdr_out, &rqstp->rq_res, p, NULL);



	status = decode_compound_hdr_arg(&xdr_in, &hdr_arg);

	if (status == htonl(NFS4ERR_RESOURCE))

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ ff_layout_encode_layoutreturn(struct xdr_stream *xdr, 


	dprintk("%s: Begin\n", __func__);



	xdr_init_encode(&tmp_xdr, &tmp_buf, NULL);

	xdr_init_encode(&tmp_xdr, &tmp_buf, NULL, NULL);



	ff_layout_encode_ioerr(&tmp_xdr, args, ff_args);

	ff_layout_encode_iostats_array(&tmp_xdr, args, ff_args);

include/linux/sunrpc/xdr.h

+6 −2
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ struct xdr_stream { 
	struct kvec scratch;	/* Scratch buffer */

	struct page **page_ptr;	/* pointer to the current page */

	unsigned int nwords;	/* Remaining decode buffer length */



	struct rpc_rqst *rqst;	/* For debugging */

};



/*
@@ -227,7 +229,8 @@ typedef void (*kxdreproc_t)(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 
typedef int	(*kxdrdproc_t)(struct rpc_rqst *rqstp, struct xdr_stream *xdr,

		void *obj);



extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);

extern void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf,

			    __be32 *p, struct rpc_rqst *rqst);

extern __be32 *xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes);

extern void xdr_commit_encode(struct xdr_stream *xdr);

extern void xdr_truncate_encode(struct xdr_stream *xdr, size_t len);
@@ -235,7 +238,8 @@ extern int xdr_restrict_buflen(struct xdr_stream *xdr, int newbuflen); 
extern void xdr_write_pages(struct xdr_stream *xdr, struct page **pages,

		unsigned int base, unsigned int len);

extern unsigned int xdr_stream_pos(const struct xdr_stream *xdr);

extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, __be32 *p);

extern void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf,

			    __be32 *p, struct rpc_rqst *rqst);

extern void xdr_init_decode_pages(struct xdr_stream *xdr, struct xdr_buf *buf,

		struct page **pages, unsigned int len);

extern void xdr_set_scratch_buffer(struct xdr_stream *xdr, void *buf, size_t buflen);

net/sunrpc/auth.c

+2 −2
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ static void rpcauth_wrap_req_encode(kxdreproc_t encode, struct rpc_rqst *rqstp, 
{

	struct xdr_stream xdr;



	xdr_init_encode(&xdr, &rqstp->rq_snd_buf, data);

	xdr_init_encode(&xdr, &rqstp->rq_snd_buf, data, rqstp);

	encode(rqstp, &xdr, obj);

}
@@ -823,7 +823,7 @@ rpcauth_unwrap_req_decode(kxdrdproc_t decode, struct rpc_rqst *rqstp, 
{

	struct xdr_stream xdr;



	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, data);

	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, data, rqstp);

	return decode(rqstp, &xdr, obj);

}

net/sunrpc/auth_gss/auth_gss.c

+2 −2
Original line number Diff line number Diff line
@@ -1722,7 +1722,7 @@ static void gss_wrap_req_encode(kxdreproc_t encode, struct rpc_rqst *rqstp, 
{

	struct xdr_stream xdr;



	xdr_init_encode(&xdr, &rqstp->rq_snd_buf, p);

	xdr_init_encode(&xdr, &rqstp->rq_snd_buf, p, rqstp);

	encode(rqstp, &xdr, obj);

}
@@ -1998,7 +1998,7 @@ gss_unwrap_req_decode(kxdrdproc_t decode, struct rpc_rqst *rqstp, 
{

	struct xdr_stream xdr;



	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);

	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p, rqstp);

	return decode(rqstp, &xdr, obj);

}