redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sunrpc: Simplify synopsis of some trace points 

Clean up: struct rpc_task carries a pointer to a struct rpc_clnt,
and in fact task->tk_client is always what is passed into trace
points that are already passing @task.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
hifive-unleashed-5.1
Chuck Lever 2018-03-16 10:33:44 -04:00 committed by Anna Schumaker
parent ff699ea826
commit e671edb942
3 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/trace/events/sunrpc.h
View File

@ -50,9 +50,9 @@ DEFINE_EVENT(rpc_task_status, rpc_bind_status,
); );
TRACE_EVENT(rpc_connect_status, TRACE_EVENT(rpc_connect_status,
TP_PROTO(struct rpc_task *task, int status), TP_PROTO(const struct rpc_task *task),
TP_ARGS(task, status), TP_ARGS(task),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned int, task_id) __field(unsigned int, task_id)
@ -63,7 +63,7 @@ TRACE_EVENT(rpc_connect_status,
TP_fast_assign( TP_fast_assign(
__entry->task_id = task->tk_pid; __entry->task_id = task->tk_pid;
__entry->client_id = task->tk_client->cl_clid; __entry->client_id = task->tk_client->cl_clid;
__entry->status = status; __entry->status = task->tk_status;
), ),
TP_printk("task:%u@%u status=%d", TP_printk("task:%u@%u status=%d",
@ -103,9 +103,9 @@ TRACE_EVENT(rpc_request,
DECLARE_EVENT_CLASS(rpc_task_running, DECLARE_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), TP_PROTO(const struct rpc_task *task, const void *action),
TP_ARGS(clnt, task, action), TP_ARGS(task, action),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned int, task_id) __field(unsigned int, task_id)
@ -117,7 +117,8 @@ DECLARE_EVENT_CLASS(rpc_task_running,
), ),
TP_fast_assign( TP_fast_assign(
__entry->client_id = clnt ? clnt->cl_clid : -1; __entry->client_id = task->tk_client ?
task->tk_client->cl_clid : -1;
__entry->task_id = task->tk_pid; __entry->task_id = task->tk_pid;
__entry->action = action; __entry->action = action;
__entry->runstate = task->tk_runstate; __entry->runstate = task->tk_runstate;
@ -136,33 +137,33 @@ DECLARE_EVENT_CLASS(rpc_task_running,
DEFINE_EVENT(rpc_task_running, rpc_task_begin, DEFINE_EVENT(rpc_task_running, rpc_task_begin,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), TP_PROTO(const struct rpc_task *task, const void *action),
TP_ARGS(clnt, task, action) TP_ARGS(task, action)
); );
DEFINE_EVENT(rpc_task_running, rpc_task_run_action, DEFINE_EVENT(rpc_task_running, rpc_task_run_action,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), TP_PROTO(const struct rpc_task *task, const void *action),
TP_ARGS(clnt, task, action) TP_ARGS(task, action)
); );
DEFINE_EVENT(rpc_task_running, rpc_task_complete, DEFINE_EVENT(rpc_task_running, rpc_task_complete,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), TP_PROTO(const struct rpc_task *task, const void *action),
TP_ARGS(clnt, task, action) TP_ARGS(task, action)
); );
DECLARE_EVENT_CLASS(rpc_task_queued, DECLARE_EVENT_CLASS(rpc_task_queued,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q), TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
TP_ARGS(clnt, task, q), TP_ARGS(task, q),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned int, task_id) __field(unsigned int, task_id)
@ -175,7 +176,8 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
), ),
TP_fast_assign( TP_fast_assign(
__entry->client_id = clnt ? clnt->cl_clid : -1; __entry->client_id = task->tk_client ?
task->tk_client->cl_clid : -1;
__entry->task_id = task->tk_pid; __entry->task_id = task->tk_pid;
__entry->timeout = task->tk_timeout; __entry->timeout = task->tk_timeout;
__entry->runstate = task->tk_runstate; __entry->runstate = task->tk_runstate;
@ -196,17 +198,17 @@ DECLARE_EVENT_CLASS(rpc_task_queued,
DEFINE_EVENT(rpc_task_queued, rpc_task_sleep, DEFINE_EVENT(rpc_task_queued, rpc_task_sleep,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q), TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
TP_ARGS(clnt, task, q) TP_ARGS(task, q)
); );
DEFINE_EVENT(rpc_task_queued, rpc_task_wakeup, DEFINE_EVENT(rpc_task_queued, rpc_task_wakeup,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q), TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
TP_ARGS(clnt, task, q) TP_ARGS(task, q)
); );

2
net/sunrpc/clnt.c
View File

@ -1887,7 +1887,7 @@ call_connect_status(struct rpc_task *task)
dprint_status(task); dprint_status(task);
trace_rpc_connect_status(task, status); trace_rpc_connect_status(task);
task->tk_status = 0; task->tk_status = 0;
switch (status) { switch (status) {
case -ECONNREFUSED: case -ECONNREFUSED:

10
net/sunrpc/sched.c
View File

@ -276,7 +276,7 @@ static void rpc_set_active(struct rpc_task *task)
{ {
rpc_task_set_debuginfo(task); rpc_task_set_debuginfo(task);
set_bit(RPC_TASK_ACTIVE, &task->tk_runstate); set_bit(RPC_TASK_ACTIVE, &task->tk_runstate);
trace_rpc_task_begin(task->tk_client, task, NULL); trace_rpc_task_begin(task, NULL);
} }
/* /*
@ -291,7 +291,7 @@ static int rpc_complete_task(struct rpc_task *task)
unsigned long flags; unsigned long flags;
int ret; int ret;
trace_rpc_task_complete(task->tk_client, task, NULL); trace_rpc_task_complete(task, NULL);
spin_lock_irqsave(&wq->lock, flags); spin_lock_irqsave(&wq->lock, flags);
clear_bit(RPC_TASK_ACTIVE, &task->tk_runstate); clear_bit(RPC_TASK_ACTIVE, &task->tk_runstate);
@ -358,7 +358,7 @@ static void __rpc_sleep_on_priority(struct rpc_wait_queue *q,
dprintk("RPC: %5u sleep_on(queue \"%s\" time %lu)\n", dprintk("RPC: %5u sleep_on(queue \"%s\" time %lu)\n",
task->tk_pid, rpc_qname(q), jiffies); task->tk_pid, rpc_qname(q), jiffies);
trace_rpc_task_sleep(task->tk_client, task, q); trace_rpc_task_sleep(task, q);
__rpc_add_wait_queue(q, task, queue_priority); __rpc_add_wait_queue(q, task, queue_priority);
@ -428,7 +428,7 @@ static void __rpc_do_wake_up_task_on_wq(struct workqueue_struct *wq,
return; return;
} }
trace_rpc_task_wakeup(task->tk_client, task, queue); trace_rpc_task_wakeup(task, queue);
__rpc_remove_wait_queue(queue, task); __rpc_remove_wait_queue(queue, task);
@ -780,7 +780,7 @@ static void __rpc_execute(struct rpc_task *task)
} }
if (!do_action) if (!do_action)
break; break;
trace_rpc_task_run_action(task->tk_client, task, do_action); trace_rpc_task_run_action(task, do_action);
do_action(task); do_action(task);
/* /*