NFSv4: use exponential retry on NFS4ERR_DELAY for async requests.

Currently asynchronous NFSv4 request will be retried with
exponential timeout (from 1/10 to 15 seconds), but async
requests will always use a 15second retry.

Some "async" requests are really synchronous though.  The
async mechanism is used to allow the request to continue if
the requesting process is killed.
In those cases, an exponential retry is appropriate.

For example, if two different clients both open a file and
get a READ delegation, and one client then unlinks the file
(while still holding an open file descriptor), that unlink
will used the "silly-rename" handling which is async.
The first rename will result in NFS4ERR_DELAY while the
delegation is reclaimed from the other client.  The rename
will not be retried for 15 seconds, causing an unlink to take
15 seconds rather than 100msec.

This patch only added exponential timeout for async unlink and
async rename.  Other async calls, such as 'close' are sometimes
waited for so they might benefit from exponential timeout too.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 288be08bda95d5fcb8c22bd9026416ae8dc97d6d..45bce9ed6791cab4fd447589e53786e4ba3c49da 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -77,7 +77,7 @@ struct nfs4_opendata;
 static int _nfs4_proc_open(struct nfs4_opendata *data);
 static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
 static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
-static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *);
+static int nfs4_async_handle_error(struct rpc_task *, const struct nfs_server *, struct nfs4_state *, long *);
 static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
 static int nfs4_proc_getattr(struct nfs_server *, struct nfs_fh *, struct nfs_fattr *, struct nfs4_label *label);
 static int _nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr, struct nfs4_label *label);
@@ -314,20 +314,30 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
        kunmap_atomic(start);
 }
 
+static long nfs4_update_delay(long *timeout)
+{
+       long ret;
+       if (!timeout)
+               return NFS4_POLL_RETRY_MAX;
+       if (*timeout <= 0)
+               *timeout = NFS4_POLL_RETRY_MIN;
+       if (*timeout > NFS4_POLL_RETRY_MAX)
+               *timeout = NFS4_POLL_RETRY_MAX;
+       ret = *timeout;
+       *timeout <<= 1;
+       return ret;
+}
+
 static int nfs4_delay(struct rpc_clnt *clnt, long *timeout)
 {
        int res = 0;
 
        might_sleep();
 
-       if (*timeout <= 0)
-               *timeout = NFS4_POLL_RETRY_MIN;
-       if (*timeout > NFS4_POLL_RETRY_MAX)
-               *timeout = NFS4_POLL_RETRY_MAX;
-       freezable_schedule_timeout_killable_unsafe(*timeout);
+       freezable_schedule_timeout_killable_unsafe(
+               nfs4_update_delay(timeout));
        if (fatal_signal_pending(current))
                res = -ERESTARTSYS;
-       *timeout <<= 1;
        return res;
 }
 
@@ -2583,7 +2593,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
                        if (calldata->arg.fmode == 0)
                                break;
                default:
-                       if (nfs4_async_handle_error(task, server, state) == -EAGAIN) {
+                       if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN) {
                                rpc_restart_call_prepare(task);
                                goto out_release;
                        }
@@ -3572,7 +3582,8 @@ static int nfs4_proc_unlink_done(struct rpc_task *task, struct inode *dir)
 
        if (!nfs4_sequence_done(task, &res->seq_res))
                return 0;
-       if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN)
+       if (nfs4_async_handle_error(task, res->server, NULL,
+                                   &data->timeout) == -EAGAIN)
                return 0;
        update_changeattr(dir, &res->cinfo);
        return 1;
@@ -3605,7 +3616,7 @@ static int nfs4_proc_rename_done(struct rpc_task *task, struct inode *old_dir,
 
        if (!nfs4_sequence_done(task, &res->seq_res))
                return 0;
-       if (nfs4_async_handle_error(task, res->server, NULL) == -EAGAIN)
+       if (nfs4_async_handle_error(task, res->server, NULL, &data->timeout) == -EAGAIN)
                return 0;
 
        update_changeattr(old_dir, &res->old_cinfo);
@@ -4109,7 +4120,8 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_pgio_header *hdr)
 
        trace_nfs4_read(hdr, task->tk_status);
        if (nfs4_async_handle_error(task, server,
-                                   hdr->args.context->state) == -EAGAIN) {
+                                   hdr->args.context->state,
+                                   NULL) == -EAGAIN) {
                rpc_restart_call_prepare(task);
                return -EAGAIN;
        }
@@ -4177,10 +4189,11 @@ static int nfs4_write_done_cb(struct rpc_task *task,
                              struct nfs_pgio_header *hdr)
 {
        struct inode *inode = hdr->inode;
-       
+
        trace_nfs4_write(hdr, task->tk_status);
        if (nfs4_async_handle_error(task, NFS_SERVER(inode),
-                                   hdr->args.context->state) == -EAGAIN) {
+                                   hdr->args.context->state,
+                                   NULL) == -EAGAIN) {
                rpc_restart_call_prepare(task);
                return -EAGAIN;
        }
@@ -4260,7 +4273,8 @@ static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_commit_data *da
        struct inode *inode = data->inode;
 
        trace_nfs4_commit(data, task->tk_status);
-       if (nfs4_async_handle_error(task, NFS_SERVER(inode), NULL) == -EAGAIN) {
+       if (nfs4_async_handle_error(task, NFS_SERVER(inode),
+                                   NULL, NULL) == -EAGAIN) {
                rpc_restart_call_prepare(task);
                return -EAGAIN;
        }
@@ -4813,7 +4827,8 @@ out:
 
 
 static int
-nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server, struct nfs4_state *state)
+nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
+                       struct nfs4_state *state, long *timeout)
 {
        struct nfs_client *clp = server->nfs_client;
 
@@ -4863,6 +4878,8 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
 #endif /* CONFIG_NFS_V4_1 */
                case -NFS4ERR_DELAY:
                        nfs_inc_server_stats(server, NFSIOS_DELAY);
+                       rpc_delay(task, nfs4_update_delay(timeout));
+                       goto restart_call;
                case -NFS4ERR_GRACE:
                        rpc_delay(task, NFS4_POLL_RETRY_MAX);
                case -NFS4ERR_RETRY_UNCACHED_REP:
@@ -5103,8 +5120,8 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
                        pnfs_roc_set_barrier(data->inode, data->roc_barrier);
                break;
        default:
-               if (nfs4_async_handle_error(task, data->res.server, NULL) ==
-                               -EAGAIN) {
+               if (nfs4_async_handle_error(task, data->res.server,
+                                           NULL, NULL) == -EAGAIN) {
                        rpc_restart_call_prepare(task);
                        return;
                }
@@ -5368,7 +5385,8 @@ static void nfs4_locku_done(struct rpc_task *task, void *data)
                case -NFS4ERR_EXPIRED:
                        break;
                default:
-                       if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)
+                       if (nfs4_async_handle_error(task, calldata->server,
+                                                   NULL, NULL) == -EAGAIN)
                                rpc_restart_call_prepare(task);
        }
        nfs_release_seqid(calldata->arg.seqid);
@@ -5974,7 +5992,8 @@ static void nfs4_release_lockowner_done(struct rpc_task *task, void *calldata)
                break;
        case -NFS4ERR_LEASE_MOVED:
        case -NFS4ERR_DELAY:
-               if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN)
+               if (nfs4_async_handle_error(task, server,
+                                           NULL, NULL) == -EAGAIN)
                        rpc_restart_call_prepare(task);
        }
 }
@@ -7591,7 +7610,7 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
                        rpc_restart_call_prepare(task);
                }
        }
-       if (nfs4_async_handle_error(task, server, state) == -EAGAIN)
+       if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN)
                rpc_restart_call_prepare(task);
 out:
        dprintk("<-- %s\n", __func__);
@@ -7751,7 +7770,7 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata)
        case 0:
                break;
        case -NFS4ERR_DELAY:
-               if (nfs4_async_handle_error(task, server, NULL) != -EAGAIN)
+               if (nfs4_async_handle_error(task, server, NULL, NULL) != -EAGAIN)
                        break;
                rpc_restart_call_prepare(task);
                return;
@@ -7882,7 +7901,7 @@ nfs4_layoutcommit_done(struct rpc_task *task, void *calldata)
        case 0:
                break;
        default:
-               if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) {
+               if (nfs4_async_handle_error(task, server, NULL, NULL) == -EAGAIN) {
                        rpc_restart_call_prepare(task);
                        return;
                }
@@ -8178,7 +8197,7 @@ static void nfs41_free_stateid_done(struct rpc_task *task, void *calldata)
 
        switch (task->tk_status) {
        case -NFS4ERR_DELAY:
-               if (nfs4_async_handle_error(task, data->server, NULL) == -EAGAIN)
+               if (nfs4_async_handle_error(task, data->server, NULL, NULL) == -EAGAIN)
                        rpc_restart_call_prepare(task);
        }
 }

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 7ae249ccb78d2b62841373f1f86c81565cd9310e..6951c7d9097dae6f63a55ffa859e790e0eb03e6e 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1339,6 +1339,7 @@ struct nfs_unlinkdata {
        struct inode *dir;
        struct rpc_cred *cred;
        struct nfs_fattr dir_attr;
+       long timeout;
 };
 
 struct nfs_renamedata {
@@ -1352,6 +1353,7 @@ struct nfs_renamedata {
        struct dentry           *new_dentry;
        struct nfs_fattr        new_fattr;
        void (*complete)(struct rpc_task *, struct nfs_renamedata *);
+       long timeout;
 };
 
 struct nfs_access_entry;