Commit 85e39fee authored by Olga Kornievskaia's avatar Olga Kornievskaia Committed by Trond Myklebust
Browse files

NFSv4.1 identify and mark RPC tasks that can move between transports 



In preparation for when we can re-try a task on a different transport,
identify and mark such RPC tasks as moveable. Only 4.1+ operarations can
be re-tried on a different transport.

Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 5b7eb784

fs/nfs/nfs4proc.c

+33 −5
Original line number Diff line number Diff line
@@ -1155,7 +1155,11 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, 
				   struct nfs4_sequence_args *args,

				   struct nfs4_sequence_res *res)

{

	return nfs4_do_call_sync(clnt, server, msg, args, res, 0);

	unsigned short task_flags = 0;



	if (server->nfs_client->cl_minorversion)

		task_flags = RPC_TASK_MOVEABLE;

	return nfs4_do_call_sync(clnt, server, msg, args, res, task_flags);

}
@@ -2569,6 +2573,9 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, 
	};

	int status;



	if (server->nfs_client->cl_minorversion)

		task_setup_data.flags |= RPC_TASK_MOVEABLE;



	kref_get(&data->kref);

	data->rpc_done = false;

	data->rpc_status = 0;
@@ -3749,6 +3756,9 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait) 
	};

	int status = -ENOMEM;



	if (server->nfs_client->cl_minorversion)

		task_setup_data.flags |= RPC_TASK_MOVEABLE;



	nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_CLEANUP,

		&task_setup_data.rpc_client, &msg);
@@ -4188,6 +4198,9 @@ static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, 
	};

	unsigned short task_flags = 0;



	if (nfs4_has_session(server->nfs_client))

		task_flags = RPC_TASK_MOVEABLE;



	/* Is this is an attribute revalidation, subject to softreval? */

	if (inode && (server->flags & NFS_MOUNT_SOFTREVAL))

		task_flags |= RPC_TASK_TIMEOUT;
@@ -4307,6 +4320,9 @@ static int _nfs4_proc_lookup(struct rpc_clnt *clnt, struct inode *dir, 
	};

	unsigned short task_flags = 0;



	if (server->nfs_client->cl_minorversion)

		task_flags = RPC_TASK_MOVEABLE;



	/* Is this is an attribute revalidation, subject to softreval? */

	if (nfs_lookup_is_soft_revalidate(dentry))

		task_flags |= RPC_TASK_TIMEOUT;
@@ -6538,7 +6554,7 @@ static int _nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, 
		.rpc_client = server->client,

		.rpc_message = &msg,

		.callback_ops = &nfs4_delegreturn_ops,

		.flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT,

		.flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT | RPC_TASK_MOVEABLE,

	};

	int status = 0;
@@ -6856,6 +6872,11 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl, 
		.workqueue = nfsiod_workqueue,

		.flags = RPC_TASK_ASYNC,

	};

	struct nfs_client *client =

		NFS_SERVER(lsp->ls_state->inode)->nfs_client;



	if (client->cl_minorversion)

		task_setup_data.flags |= RPC_TASK_MOVEABLE;



	nfs4_state_protect(NFS_SERVER(lsp->ls_state->inode)->nfs_client,

		NFS_SP4_MACH_CRED_CLEANUP, &task_setup_data.rpc_client, &msg);
@@ -7130,6 +7151,10 @@ static int _nfs4_do_setlk(struct nfs4_state *state, int cmd, struct file_lock *f 
		.flags = RPC_TASK_ASYNC | RPC_TASK_CRED_NOREF,

	};

	int ret;

	struct nfs_client *client = NFS_SERVER(state->inode)->nfs_client;



	if (client->cl_minorversion)

		task_setup_data.flags |= RPC_TASK_MOVEABLE;



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

	data = nfs4_alloc_lockdata(fl, nfs_file_open_context(fl->fl_file),
@@ -9186,7 +9211,7 @@ static struct rpc_task *_nfs41_proc_sequence(struct nfs_client *clp, 
		.rpc_client = clp->cl_rpcclient,

		.rpc_message = &msg,

		.callback_ops = &nfs41_sequence_ops,

		.flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT,

		.flags = RPC_TASK_ASYNC | RPC_TASK_TIMEOUT | RPC_TASK_MOVEABLE,

	};

	struct rpc_task *ret;
@@ -9509,7 +9534,8 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, long *timeout) 
		.rpc_message = &msg,

		.callback_ops = &nfs4_layoutget_call_ops,

		.callback_data = lgp,

		.flags = RPC_TASK_ASYNC | RPC_TASK_CRED_NOREF,

		.flags = RPC_TASK_ASYNC | RPC_TASK_CRED_NOREF |

			 RPC_TASK_MOVEABLE,

	};

	struct pnfs_layout_segment *lseg = NULL;

	struct nfs4_exception exception = {
@@ -9650,6 +9676,7 @@ int nfs4_proc_layoutreturn(struct nfs4_layoutreturn *lrp, bool sync) 
		.rpc_message = &msg,

		.callback_ops = &nfs4_layoutreturn_call_ops,

		.callback_data = lrp,

		.flags = RPC_TASK_MOVEABLE,

	};

	int status = 0;
@@ -9804,6 +9831,7 @@ nfs4_proc_layoutcommit(struct nfs4_layoutcommit_data *data, bool sync) 
		.rpc_message = &msg,

		.callback_ops = &nfs4_layoutcommit_ops,

		.callback_data = data,

		.flags = RPC_TASK_MOVEABLE,

	};

	struct rpc_task *task;

	int status = 0;
@@ -10131,7 +10159,7 @@ static int nfs41_free_stateid(struct nfs_server *server, 
		.rpc_client = server->client,

		.rpc_message = &msg,

		.callback_ops = &nfs41_free_stateid_ops,

		.flags = RPC_TASK_ASYNC,

		.flags = RPC_TASK_ASYNC | RPC_TASK_MOVEABLE,

	};

	struct nfs_free_stateid_data *data;

	struct rpc_task *task;

fs/nfs/pagelist.c

+6 −2
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc) 
{

	struct nfs_pgio_header *hdr;

	int ret;

	unsigned short task_flags = 0;



	hdr = nfs_pgio_header_alloc(desc->pg_rw_ops);

	if (!hdr) {
@@ -962,14 +963,17 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc) 
	}

	nfs_pgheader_init(desc, hdr, nfs_pgio_header_free);

	ret = nfs_generic_pgio(desc, hdr);

	if (ret == 0)

	if (ret == 0) {

		if (NFS_SERVER(hdr->inode)->nfs_client->cl_minorversion)

			task_flags = RPC_TASK_MOVEABLE;

		ret = nfs_initiate_pgio(NFS_CLIENT(hdr->inode),

					hdr,

					hdr->cred,

					NFS_PROTO(hdr->inode),

					desc->pg_rpc_callops,

					desc->pg_ioflags,

					RPC_TASK_CRED_NOREF);

					RPC_TASK_CRED_NOREF | task_flags);

	}

	return ret;

}

fs/nfs/write.c

+5 −1
Original line number Diff line number Diff line
@@ -1810,6 +1810,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, 
		struct nfs_commit_info *cinfo)

{

	struct nfs_commit_data	*data;

	unsigned short task_flags = 0;



	/* another commit raced with us */

	if (list_empty(head))
@@ -1820,8 +1821,11 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how, 
	/* Set up the argument struct */

	nfs_init_commit(data, head, NULL, cinfo);

	atomic_inc(&cinfo->mds->rpcs_out);

	if (NFS_SERVER(inode)->nfs_client->cl_minorversion)

		task_flags = RPC_TASK_MOVEABLE;

	return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),

				   data->mds_ops, how, RPC_TASK_CRED_NOREF);

				   data->mds_ops, how,

				   RPC_TASK_CRED_NOREF | task_flags);

}



/*

include/linux/sunrpc/sched.h

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct rpc_task_setup { 
 */

#define RPC_TASK_ASYNC		0x0001		/* is an async task */

#define RPC_TASK_SWAPPER	0x0002		/* is swapping in/out */

#define RPC_TASK_MOVEABLE	0x0004		/* nfs4.1+ rpc tasks */

#define RPC_TASK_NULLCREDS	0x0010		/* Use AUTH_NULL credential */

#define RPC_CALL_MAJORSEEN	0x0020		/* major timeout seen */

#define RPC_TASK_ROOTCREDS	0x0040		/* force root creds */
@@ -139,6 +140,7 @@ struct rpc_task_setup { 
#define RPC_IS_SOFT(t)		((t)->tk_flags & (RPC_TASK_SOFT|RPC_TASK_TIMEOUT))

#define RPC_IS_SOFTCONN(t)	((t)->tk_flags & RPC_TASK_SOFTCONN)

#define RPC_WAS_SENT(t)		((t)->tk_flags & RPC_TASK_SENT)

#define RPC_IS_MOVEABLE(t)	((t)->tk_flags & RPC_TASK_MOVEABLE)



#define RPC_TASK_RUNNING	0

#define RPC_TASK_QUEUED		1