SUNRPC: Fix the execution time statistics in the face of RPC restarts
If the rpc_task gets restarted, then we want to ensure that we don't double-count the execution time statistics, timeout data, etc. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
b930c26416
commit
7fdcf13b29
|
@ -590,6 +590,27 @@ void rpc_prepare_task(struct rpc_task *task)
|
||||||
task->tk_ops->rpc_call_prepare(task, task->tk_calldata);
|
task->tk_ops->rpc_call_prepare(task, task->tk_calldata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
rpc_init_task_statistics(struct rpc_task *task)
|
||||||
|
{
|
||||||
|
/* Initialize retry counters */
|
||||||
|
task->tk_garb_retry = 2;
|
||||||
|
task->tk_cred_retry = 2;
|
||||||
|
task->tk_rebind_retry = 2;
|
||||||
|
|
||||||
|
/* starting timestamp */
|
||||||
|
task->tk_start = ktime_get();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
rpc_reset_task_statistics(struct rpc_task *task)
|
||||||
|
{
|
||||||
|
task->tk_timeouts = 0;
|
||||||
|
task->tk_flags &= ~(RPC_CALL_MAJORSEEN|RPC_TASK_KILLED|RPC_TASK_SENT);
|
||||||
|
|
||||||
|
rpc_init_task_statistics(task);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Helper that calls task->tk_ops->rpc_call_done if it exists
|
* Helper that calls task->tk_ops->rpc_call_done if it exists
|
||||||
*/
|
*/
|
||||||
|
@ -602,6 +623,7 @@ void rpc_exit_task(struct rpc_task *task)
|
||||||
WARN_ON(RPC_ASSASSINATED(task));
|
WARN_ON(RPC_ASSASSINATED(task));
|
||||||
/* Always release the RPC slot and buffer memory */
|
/* Always release the RPC slot and buffer memory */
|
||||||
xprt_release(task);
|
xprt_release(task);
|
||||||
|
rpc_reset_task_statistics(task);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -804,11 +826,6 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
|
||||||
task->tk_calldata = task_setup_data->callback_data;
|
task->tk_calldata = task_setup_data->callback_data;
|
||||||
INIT_LIST_HEAD(&task->tk_task);
|
INIT_LIST_HEAD(&task->tk_task);
|
||||||
|
|
||||||
/* Initialize retry counters */
|
|
||||||
task->tk_garb_retry = 2;
|
|
||||||
task->tk_cred_retry = 2;
|
|
||||||
task->tk_rebind_retry = 2;
|
|
||||||
|
|
||||||
task->tk_priority = task_setup_data->priority - RPC_PRIORITY_LOW;
|
task->tk_priority = task_setup_data->priority - RPC_PRIORITY_LOW;
|
||||||
task->tk_owner = current->tgid;
|
task->tk_owner = current->tgid;
|
||||||
|
|
||||||
|
@ -818,8 +835,7 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
|
||||||
if (task->tk_ops->rpc_call_prepare != NULL)
|
if (task->tk_ops->rpc_call_prepare != NULL)
|
||||||
task->tk_action = rpc_prepare_task;
|
task->tk_action = rpc_prepare_task;
|
||||||
|
|
||||||
/* starting timestamp */
|
rpc_init_task_statistics(task);
|
||||||
task->tk_start = ktime_get();
|
|
||||||
|
|
||||||
dprintk("RPC: new task initialized, procpid %u\n",
|
dprintk("RPC: new task initialized, procpid %u\n",
|
||||||
task_pid_nr(current));
|
task_pid_nr(current));
|
||||||
|
|
Loading…
Reference in New Issue