Commit 57331a59 authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Anna Schumaker
Browse files

NFSv4.1: Use the nfs_client's rpc timeouts for backchannel 



For backchannel requests that lookup the appropriate nfs_client, use the
state-management rpc_clnt's rpc_timeout parameters for the backchannel's
response.  When the nfs_client cannot be found, fall back to using the
xprt's default timeout parameters.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Tested-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e6f533b6

fs/nfs/callback_xdr.c

+5 −0
Original line number Diff line number Diff line
@@ -967,6 +967,11 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
		nops--;

	}



	if (svc_is_backchannel(rqstp) && cps.clp) {

		rqstp->bc_to_initval = cps.clp->cl_rpcclient->cl_timeout->to_initval;

		rqstp->bc_to_retries = cps.clp->cl_rpcclient->cl_timeout->to_retries;

	}



	*hdr_res.status = status;

	*hdr_res.nops = htonl(nops);

	nfs4_cb_free_slot(&cps);

include/linux/sunrpc/bc_xprt.h

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#ifdef CONFIG_SUNRPC_BACKCHANNEL

struct rpc_rqst *xprt_lookup_bc_request(struct rpc_xprt *xprt, __be32 xid);

void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied);

void xprt_init_bc_request(struct rpc_rqst *req, struct rpc_task *task);

void xprt_init_bc_request(struct rpc_rqst *req, struct rpc_task *task,

		const struct rpc_timeout *to);

void xprt_free_bc_request(struct rpc_rqst *req);

int xprt_setup_backchannel(struct rpc_xprt *, unsigned int min_reqs);

void xprt_destroy_backchannel(struct rpc_xprt *, unsigned int max_reqs);

include/linux/sunrpc/sched.h

+13 −1
Original line number Diff line number Diff line
@@ -37,6 +37,17 @@ struct rpc_wait { 
	struct list_head	timer_list;	/* Timer list */

};



/*

 * This describes a timeout strategy

 */

struct rpc_timeout {

	unsigned long		to_initval,		/* initial timeout */

				to_maxval,		/* max timeout */

				to_increment;		/* if !exponential */

	unsigned int		to_retries;		/* max # of retries */

	unsigned char		to_exponential;

};



/*

 * This is the RPC task struct

 */
@@ -205,7 +216,8 @@ struct rpc_wait_queue { 
 */

struct rpc_task *rpc_new_task(const struct rpc_task_setup *);

struct rpc_task *rpc_run_task(const struct rpc_task_setup *);

struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req);

struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req,

		struct rpc_timeout *timeout);

void		rpc_put_task(struct rpc_task *);

void		rpc_put_task_async(struct rpc_task *);

bool		rpc_task_set_rpc_status(struct rpc_task *task, int rpc_status);

include/linux/sunrpc/svc.h

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,8 @@ struct svc_rqst { 
	struct net		*rq_bc_net;	/* pointer to backchannel's

						 * net namespace

						 */

	unsigned long	bc_to_initval;

	unsigned int	bc_to_retries;

	void **			rq_lease_breaker; /* The v4 client breaking a lease */

	unsigned int		rq_status_counter; /* RPC processing counter */

};

include/linux/sunrpc/xprt.h

+0 −11
Original line number Diff line number Diff line
@@ -30,17 +30,6 @@ 
#define RPC_MAXCWND(xprt)	((xprt)->max_reqs << RPC_CWNDSHIFT)

#define RPCXPRT_CONGESTED(xprt) ((xprt)->cong >= (xprt)->cwnd)



/*

 * This describes a timeout strategy

 */

struct rpc_timeout {

	unsigned long		to_initval,		/* initial timeout */

				to_maxval,		/* max timeout */

				to_increment;		/* if !exponential */

	unsigned int		to_retries;		/* max # of retries */

	unsigned char		to_exponential;

};



enum rpc_display_format_t {

	RPC_DISPLAY_ADDR = 0,

	RPC_DISPLAY_PORT,