pNFS/flexfiles: Cancel I/O if the layout is revoked
Subsystems (3)
[email protected]
maintainerPATCH 2/4 SUNRPC: Add a helper to allow pNFS drivers to selectively cancel RPC calls
In reply to [email protected]From: Trond Myklebust <[email protected]>
Add the helper rpc_cancel_tasks(), which uses a caller-defined selection function to define a set of in-flight RPC calls to cancel. This is mainly intended for pNFS drivers which are subject to a layout recall, and which may therefore want to cancel all pending I/O using that layout in order to redrive it after the layout recall has been satisfied.
--- include/linux/sunrpc/sched.h | 5 +++++ net/sunrpc/clnt.c | 37 ++++++++++++++++++++++++++++++++++++ net/sunrpc/sched.c | 11 +++++++++++ 3 files changed, 53 insertions(+)
include/linux/sunrpc/sched.h +5 -0
@@ -210,11 +210,16 @@ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req);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); +void rpc_task_try_cancel (struct rpc_task *task,int error);void rpc_signal_task (struct rpc_task *);void rpc_exit_task (struct rpc_task *);void rpc_exit (struct rpc_task *,int );void rpc_release_calldata (const struct rpc_call_ops *,void *);void rpc_killall_tasks (struct rpc_clnt *); +unsigned long rpc_cancel_tasks (struct rpc_clnt *clnt,int error, +bool (*fnmatch)(const struct rpc_task *, +const void *), +const void *data);void rpc_execute (struct rpc_task *);void rpc_init_priority_wait_queue (struct rpc_wait_queue *,const char *);void rpc_init_wait_queue (struct rpc_wait_queue *,const char *);
net/sunrpc/clnt.c +37 -0
@@ -873,6 +873,43 @@ void rpc_killall_tasks(struct rpc_clnt *clnt) }EXPORT_SYMBOL_GPL (rpc_killall_tasks); +/** +* rpc_cancel_tasks - try to cancel a set of RPC tasks +* @clnt: Pointer to RPC client +* @error: RPC task error value to set +* @fnmatch: Pointer to selector function +* @data: User data +* +* Uses @fnmatch to define a set of RPC tasks that are to be cancelled. +* The argument @error must be a negative error value. +*/ +unsigned long rpc_cancel_tasks (struct rpc_clnt *clnt,int error, +bool (*fnmatch)(const struct rpc_task *, +const void *), +const void *data) +{ +struct rpc_task *task; +unsigned long count =0 ; + +if (list_empty (&clnt->cl_tasks)) +return 0 ; +/* +* Spin lock all_tasks to prevent changes... +*/ +spin_lock (&clnt->cl_lock); +list_for_each_entry (task, &clnt->cl_tasks, tk_task) { +if (!RPC_IS_ACTIVATED (task)) +continue ; +if (!fnmatch (task, data)) +continue ; +rpc_task_try_cancel (task, error); + count++; + } +spin_unlock (&clnt->cl_lock); +return count; +} +EXPORT_SYMBOL_GPL (rpc_cancel_tasks); +/* * Properly shut down an RPC client, terminating all outstanding * requests.
net/sunrpc/sched.c +11 -0
@@ -872,6 +872,17 @@ void rpc_signal_task(struct rpc_task *task)rpc_wake_up_queued_task (queue, task); } +void rpc_task_try_cancel (struct rpc_task *task,int error) +{ +struct rpc_wait_queue *queue; + +if (!rpc_task_set_rpc_status (task, error)) +return ; + queue =READ_ONCE (task->tk_waitqueue); +if (queue) +rpc_wake_up_queued_task (queue, task); +} +void rpc_exit (struct rpc_task *task,int status) { task->tk_status = status;
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH 3/4 SUNRPC: Add API to force the client to disconnect
From: Trond Myklebust <[email protected]>
Allow the caller to force a disconnection of the RPC client so that we can clear any pending requests that are buffered in the socket.
--- include/linux/sunrpc/clnt.h | 1 + net/sunrpc/clnt.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+)
include/linux/sunrpc/clnt.h +1 -0
@@ -246,6 +246,7 @@ void rpc_clnt_xprt_switch_remove_xprt(struct rpc_clnt *, struct rpc_xprt *);bool rpc_clnt_xprt_switch_has_addr (struct rpc_clnt *clnt,const struct sockaddr *sap);void rpc_clnt_xprt_set_online (struct rpc_clnt *clnt,struct rpc_xprt *xprt); +void rpc_clnt_disconnect (struct rpc_clnt *clnt);void rpc_cleanup_clids (void );static inline int rpc_reply_expected (struct rpc_task *task)
net/sunrpc/clnt.c +14 -0
@@ -910,6 +910,20 @@ unsigned long rpc_cancel_tasks(struct rpc_clnt *clnt, int error, }EXPORT_SYMBOL_GPL (rpc_cancel_tasks); +static int rpc_clnt_disconnect_xprt (struct rpc_clnt *clnt, +struct rpc_xprt *xprt,void *dummy) +{ +if (xprt_connected (xprt)) +xprt_force_disconnect (xprt); +return 0 ; +} + +void rpc_clnt_disconnect (struct rpc_clnt *clnt) +{ +rpc_clnt_iterate_for_each_xprt (clnt, rpc_clnt_disconnect_xprt,NULL ); +} +EXPORT_SYMBOL_GPL (rpc_clnt_disconnect); +/* * Properly shut down an RPC client, terminating all outstanding * requests.
Signature · 1 line
2.37.3
[email protected]
maintainercover pNFS/flexfiles: Cancel I/O if the layout is revoked
From: Trond Myklebust <[email protected]>
The pNFS/flexfiles driver is capable of having a lot of outstanding I/O in the RPC layer when it flushes out the writeback data. If the server decides to recall or revoke the layout when this happens, then it takes a while for that I/O to complete.
To speed things up, add an API to allow the flexfiles driver to cancel that I/O and hence return the layout earlier.
Trond Myklebust (4):
SUNRPC: Fix races with rpc_killall_tasks()
SUNRPC: Add a helper to allow pNFS drivers to selectively cancel RPC
calls
SUNRPC: Add API to force the client to disconnect NFSv4/flexfiles: Cancel I/O if the layout is recalled or revoked
fs/nfs/flexfilelayout/flexfilelayout.c | 84 +++++++++++++++++++++++++- fs/nfs/pnfs.c | 9 ++- fs/nfs/pnfs.h | 9 +++ include/linux/sunrpc/clnt.h | 1 + include/linux/sunrpc/sched.h | 6 ++ net/sunrpc/clnt.c | 57 +++++++++++++++-- net/sunrpc/sched.c | 51 +++++++++++----- net/sunrpc/xprtsock.c | 3 +- 8 files changed, 194 insertions(+), 26 deletions(-)
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH 1/4 SUNRPC: Fix races with rpc_killall_tasks()
From: Trond Myklebust <[email protected]>
Ensure that we immediately call rpc_exit_task() after waking up, and that the tk_rpc_status cannot get clobbered by some other function.
--- include/linux/sunrpc/sched.h | 1 + net/sunrpc/clnt.c | 6 ++---- net/sunrpc/sched.c | 40 ++++++++++++++++++++++-------------- net/sunrpc/xprtsock.c | 3 +-- 4 files changed, 29 insertions(+), 21 deletions(-)
include/linux/sunrpc/sched.h +1 -0
@@ -209,6 +209,7 @@ struct rpc_task *rpc_run_task(const struct rpc_task_setup *);struct rpc_task *rpc_run_bc_task (struct rpc_rqst *req);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);void rpc_signal_task (struct rpc_task *);void rpc_exit_task (struct rpc_task *);void rpc_exit (struct rpc_task *,int );
net/sunrpc/clnt.c +2 -4
@@ -1642,7 +1642,7 @@ static void __rpc_call_rpcerror(struct rpc_task *task, int tk_status, int rpc_status) {trace_rpc_call_rpcerror (task, tk_status, rpc_status); - task->tk_rpc_status = rpc_status; +rpc_task_set_rpc_status (task, rpc_status);rpc_exit (task, tk_status); }
@@ -2435,10 +2435,8 @@ rpc_check_timeout(struct rpc_task *task) {struct rpc_clnt *clnt = task->tk_client; -if (RPC_SIGNALLED (task)) { -rpc_call_rpcerror (task, -ERESTARTSYS ); +if (RPC_SIGNALLED (task))return ; - }if (xprt_adjust_timeout (task->tk_rqstp) ==0 )return ;
net/sunrpc/sched.c +25 -15
@@ -65,6 +65,13 @@ gfp_t rpc_task_gfp_mask(void) }EXPORT_SYMBOL_GPL (rpc_task_gfp_mask); +bool rpc_task_set_rpc_status (struct rpc_task *task,int rpc_status) +{ +if (cmpxchg (&task->tk_rpc_status,0 , rpc_status) ==0 ) +return true; +return false; +} +unsigned long rpc_task_timeout (const struct rpc_task *task) {
@@ -855,12 +862,14 @@ void rpc_signal_task(struct rpc_task *task)if (!RPC_IS_ACTIVATED (task))return ; +if (!rpc_task_set_rpc_status (task, -ERESTARTSYS )) +return ;trace_rpc_task_signalled (task, task->tk_action);set_bit (RPC_TASK_SIGNALLED , &task->tk_runstate);smp_mb__after_atomic (); queue =READ_ONCE (task->tk_waitqueue);if (queue) -rpc_wake_up_queued_task_set_status (queue, task, -ERESTARTSYS ); +rpc_wake_up_queued_task (queue, task); }void rpc_exit (struct rpc_task *task,int status)
@@ -907,10 +916,16 @@ static void __rpc_execute(struct rpc_task *task)* Perform the next FSM step or a pending callback. * * tk_action may be NULL if the task has been killed. -* In particular, note that rpc_killall_tasks may -* do this at any time, so beware when dereferencing. */ do_action = task->tk_action; +/* Tasks with an RPC error status should exit */ +if (do_action != rpc_exit_task && + (status =READ_ONCE (task->tk_rpc_status)) !=0 ) { + task->tk_status = status; +if (do_action !=NULL ) + do_action = rpc_exit_task; + } +/* Callbacks override all actions */ if (task->tk_callback) { do_action = task->tk_callback; task->tk_callback =NULL ;
@@ -932,14 +947,6 @@ static void __rpc_execute(struct rpc_task *task)continue ; } -/* -* Signalled tasks should exit rather than sleep. -*/ -if (RPC_SIGNALLED (task)) { - task->tk_rpc_status = -ERESTARTSYS ; -rpc_exit (task, -ERESTARTSYS ); - } -/* * The queue->lock protects against races with * rpc_make_runnable().
@@ -955,6 +962,12 @@ static void __rpc_execute(struct rpc_task *task)spin_unlock (&queue->lock);continue ; } +/* Wake up any task that has an exit status */ +if (READ_ONCE (task->tk_rpc_status) !=0 ) { +rpc_wake_up_task_queue_locked (queue, task); +spin_unlock (&queue->lock); +continue ; + }rpc_clear_running (task);spin_unlock (&queue->lock);if (task_is_async)
@@ -972,10 +985,7 @@ static void __rpc_execute(struct rpc_task *task)* clean up after sleeping on some queue, we don't * break the loop here, but go around once more. */ -trace_rpc_task_signalled (task, task->tk_action); -set_bit (RPC_TASK_SIGNALLED , &task->tk_runstate); - task->tk_rpc_status = -ERESTARTSYS ; -rpc_exit (task, -ERESTARTSYS ); +rpc_signal_task (task); }trace_rpc_task_sync_wake (task, task->tk_action); }
net/sunrpc/xprtsock.c +1 -2
@@ -1978,8 +1978,7 @@ static void xs_local_connect(struct rpc_xprt *xprt, struct rpc_task *task)* we'll need to figure out how to pass a namespace to * connect. */ - task->tk_rpc_status = -ENOTCONN ; -rpc_exit (task, -ENOTCONN ); +rpc_task_set_rpc_status (task, -ENOTCONN ); goto out_wake; } ret =xs_local_setup_socket (transport);
Signature · 1 line
2.37.3
[email protected]
maintainerPATCH 4/4 NFSv4/flexfiles: Cancel I/O if the layout is recalled or revoked
In reply to [email protected]From: Trond Myklebust <[email protected]>
If the layout is recalled or revoked, we want to cancel I/O as quickly as possible so that we can return the layout.
--- fs/nfs/flexfilelayout/flexfilelayout.c | 84 +++++++++++++++++++++++++- fs/nfs/pnfs.c | 9 ++- fs/nfs/pnfs.h | 9 +++ 3 files changed, 97 insertions(+), 5 deletions(-)
fs/nfs/flexfilelayout/flexfilelayout.c +81 -3
@@ -1379,6 +1379,11 @@ static int ff_layout_read_prepare_common(struct rpc_task *task,return -EIO ; } +if (!pnfs_is_valid_lseg (hdr->lseg)) { +rpc_exit (task, -EAGAIN ); +return -EAGAIN ; + } +ff_layout_read_record_layoutstats_start (task, hdr);return 0 ; }
@@ -1559,6 +1564,11 @@ static int ff_layout_write_prepare_common(struct rpc_task *task,return -EIO ; } +if (!pnfs_is_valid_lseg (hdr->lseg)) { +rpc_exit (task, -EAGAIN ); +return -EAGAIN ; + } +ff_layout_write_record_layoutstats_start (task, hdr);return 0 ; }
@@ -1651,15 +1661,23 @@ static void ff_layout_commit_record_layoutstats_done(struct rpc_task *task,set_bit (NFS_LSEG_LAYOUTRETURN , &cdata->lseg->pls_flags); } -static void ff_layout_commit_prepare_common (struct rpc_task *task, -struct nfs_commit_data *cdata) +static int ff_layout_commit_prepare_common (struct rpc_task *task, +struct nfs_commit_data *cdata) { +if (!pnfs_is_valid_lseg (cdata->lseg)) { +rpc_exit (task, -EAGAIN ); +return -EAGAIN ; + } +ff_layout_commit_record_layoutstats_start (task, cdata); +return 0 ; }static void ff_layout_commit_prepare_v3 (struct rpc_task *task,void *data) { -ff_layout_commit_prepare_common (task, data); +if (ff_layout_commit_prepare_common (task, data)) +return ; +rpc_call_start (task); }
@@ -1955,6 +1973,65 @@ ff_layout_commit_pagelist(struct inode *inode, struct list_head *mds_pages, ff_layout_initiate_commit); } +static bool ff_layout_match_rw (const struct rpc_task *task, +const struct nfs_pgio_header *hdr, +const struct pnfs_layout_segment *lseg) +{ +return hdr->lseg == lseg; +} + +static bool ff_layout_match_commit (const struct rpc_task *task, +const struct nfs_commit_data *cdata, +const struct pnfs_layout_segment *lseg) +{ +return cdata->lseg == lseg; +} + +static bool ff_layout_match_io (const struct rpc_task *task,const void *data) +{ +const struct rpc_call_ops *ops = task->tk_ops; + +if (ops == &ff_layout_read_call_ops_v3 || + ops == &ff_layout_read_call_ops_v4 || + ops == &ff_layout_write_call_ops_v3 || + ops == &ff_layout_write_call_ops_v4) +return ff_layout_match_rw (task, task->tk_calldata, data); +if (ops == &ff_layout_commit_call_ops_v3 || + ops == &ff_layout_commit_call_ops_v4) +return ff_layout_match_commit (task, task->tk_calldata, data); +return false; +} + +static void ff_layout_cancel_io (struct pnfs_layout_segment *lseg) +{ +struct nfs4_ff_layout_segment *flseg =FF_LAYOUT_LSEG (lseg); +struct nfs4_ff_layout_mirror *mirror; +struct nfs4_ff_layout_ds *mirror_ds; +struct nfs4_pnfs_ds *ds; +struct nfs_client *ds_clp; +struct rpc_clnt *clnt; +u32 idx; + +for (idx =0 ; idx < flseg->mirror_array_cnt; idx++) { + mirror = flseg->mirror_array[idx]; + mirror_ds = mirror->mirror_ds; +if (!mirror_ds) +continue ; + ds = mirror->mirror_ds->ds; +if (!ds) +continue ; + ds_clp = ds->ds_clp; +if (!ds_clp) +continue ; + clnt = ds_clp->cl_rpcclient; +if (!clnt) +continue ; +if (!rpc_cancel_tasks (clnt, -EAGAIN , ff_layout_match_io, lseg)) +continue ; +rpc_clnt_disconnect (clnt); + } +} +static struct pnfs_ds_commit_info *ff_layout_get_ds_info (struct inode *inode) {
@@ -2512,6 +2589,7 @@ static struct pnfs_layoutdriver_type flexfilelayout_type = { .prepare_layoutreturn = ff_layout_prepare_layoutreturn, .sync = pnfs_nfs_generic_sync, .prepare_layoutstats = ff_layout_prepare_layoutstats, + .cancel_io = ff_layout_cancel_io, };static int __init nfs4flexfilelayout_init (void )
fs/nfs/pnfs.c +7 -2
@@ -710,6 +710,7 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, u32 seq) {struct pnfs_layout_segment *lseg, *next; +struct nfs_server *server =NFS_SERVER (lo->plh_inode);int remaining =0 ;dprintk ("%s:Begin lo %p\n" , __func__, lo);
@@ -722,8 +723,10 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo,"offset %llu length %llu\n" , __func__, lseg, lseg->pls_range.iomode, lseg->pls_seq, lseg->pls_range.offset, lseg->pls_range.length); -if (!mark_lseg_invalid (lseg, tmp_list)) - remaining++; +if (mark_lseg_invalid (lseg, tmp_list)) +continue ; + remaining++; +pnfs_lseg_cancel_io (server, lseg); }dprintk ("%s:Return %i\n" , __func__, remaining);return remaining;
@@ -2485,6 +2488,7 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, u32 seq) {struct pnfs_layout_segment *lseg, *next; +struct nfs_server *server =NFS_SERVER (lo->plh_inode);int remaining =0 ;dprintk ("%s:Begin lo %p\n" , __func__, lo);
@@ -2507,6 +2511,7 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo,continue ; remaining++;set_bit (NFS_LSEG_LAYOUTRETURN , &lseg->pls_flags); +pnfs_lseg_cancel_io (server, lseg); }if (remaining) {
fs/nfs/pnfs.h +9 -0
@@ -169,6 +169,8 @@ struct pnfs_layoutdriver_type {void (*cleanup_layoutcommit) (struct nfs4_layoutcommit_data *data);int (*prepare_layoutcommit) (struct nfs4_layoutcommit_args *args);int (*prepare_layoutstats) (struct nfs42_layoutstat_args *args); + +void (*cancel_io)(struct pnfs_layout_segment *lseg); };struct pnfs_commit_ops {
@@ -685,6 +687,13 @@ pnfs_lseg_request_intersecting(struct pnfs_layout_segment *lseg, struct nfs_page req_offset(req), req_last); } +static inline void pnfs_lseg_cancel_io (struct nfs_server *server, +struct pnfs_layout_segment *lseg) +{ +if (server->pnfs_curr_ld->cancel_io) + server->pnfs_curr_ld->cancel_io (lseg); +} +extern unsigned int layoutstats_timer;#ifdef NFS_DEBUG
Signature · 1 line
2.37.3