SUNRPC: Fix up tracking of timeouts

Add a helper to ensure that debugfs and friends print out the
correct current task timeout value.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 61ba533ec0583da369521b240cc2c8bd18a6c868..c5ad02c7a4b335c49fb53e6edeee7e94c6f82cc4 100644 (file)
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -226,6 +226,7 @@ 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 *);
 void           rpc_destroy_wait_queue(struct rpc_wait_queue *);
+unsigned long  rpc_task_timeout(const struct rpc_task *task);
 void           rpc_sleep_on_timeout(struct rpc_wait_queue *queue,
                                        struct rpc_task *task,
                                        rpc_action action,

diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h
index 5e3b77d9daa72ca78dd25f00df1b7ba3ddc51df2..dd301db645212e30f081b5de37d4d04f2ae4d930 100644 (file)
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@ -186,7 +186,7 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
                __entry->client_id = task->tk_client ?
                                     task->tk_client->cl_clid : -1;
                __entry->task_id = task->tk_pid;
-               __entry->timeout = task->tk_timeout;
+               __entry->timeout = rpc_task_timeout(task);
                __entry->runstate = task->tk_runstate;
                __entry->status = task->tk_status;
                __entry->flags = task->tk_flags;

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 216d5e5e3b541cd5e364c653cffbbc7a53324a96..b25f317d0ee213b56cd64e3664200213400e9537 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2874,7 +2874,7 @@ static void rpc_show_task(const struct rpc_clnt *clnt,
 
        printk(KERN_INFO "%5u %04x %6d %8p %8p %8ld %8p %sv%u %s a:%ps q:%s\n",
                task->tk_pid, task->tk_flags, task->tk_status,
-               clnt, task->tk_rqstp, task->tk_timeout, task->tk_ops,
+               clnt, task->tk_rqstp, rpc_task_timeout(task), task->tk_ops,
                clnt->cl_program->name, clnt->cl_vers, rpc_proc_name(task),
                task->tk_action, rpc_waitq);
 }

diff --git a/net/sunrpc/debugfs.c b/net/sunrpc/debugfs.c
index 19bb356230edf521d78a4729e732ead121daaebd..95ebd76b132d35c9bd01b777d88a50239d4dbb11 100644 (file)
--- a/net/sunrpc/debugfs.c
+++ b/net/sunrpc/debugfs.c
@@ -33,7 +33,7 @@ tasks_show(struct seq_file *f, void *v)
 
        seq_printf(f, "%5u %04x %6d 0x%x 0x%x %8ld %ps %sv%u %s a:%ps q:%s\n",
                task->tk_pid, task->tk_flags, task->tk_status,
-               clnt->cl_clid, xid, task->tk_timeout, task->tk_ops,
+               clnt->cl_clid, xid, rpc_task_timeout(task), task->tk_ops,
                clnt->cl_program->name, clnt->cl_vers, rpc_proc_name(task),
                task->tk_action, rpc_waitq);
        return 0;

diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index 7e0f7b83262f9c7fe85bdad810db1b6ba45b3197..40944c34a9e47ba6719ff81dde68085ddc31fb08 100644 (file)
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -58,6 +58,20 @@ static struct rpc_wait_queue delay_queue;
 struct workqueue_struct *rpciod_workqueue __read_mostly;
 struct workqueue_struct *xprtiod_workqueue __read_mostly;
 
+unsigned long
+rpc_task_timeout(const struct rpc_task *task)
+{
+       unsigned long timeout = READ_ONCE(task->tk_timeout);
+
+       if (timeout != 0) {
+               unsigned long now = jiffies;
+               if (time_before(now, timeout))
+                       return timeout - now;
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(rpc_task_timeout);
+
 /*
  * Disable the timer for a given RPC task. Should be called with
  * queue->lock and bh_disabled in order to avoid races within