From: Chuck Lever <chuck.lever@oracle.com>
To: anna.schumaker@netapp.com
Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH 5/6] SUNRPC: task_run_action should display tk_callback
Date: Wed, 03 Jan 2018 15:38:41 -0500 [thread overview]
Message-ID: <20180103203841.29209.13773.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20180103203540.29209.4620.stgit@manet.1015granger.net>
This shows up in every RPC:
kworker/4:1-19772 [004] 3467.373443: rpc_task_run_action: task:4711@2 flags=0e81 state=0005 status=0 action=call_status
kworker/4:1-19772 [004] 3467.373444: rpc_task_run_action: task:4711@2 flags=0e81 state=0005 status=0 action=call_status
What's actually going on is that the first iteration of the RPC
scheduler is invoking the function in tk_callback (in this case,
xprt_timer), then invoking call_status on the next iteration.
Feeding do_action, rather than tk_action, to the "task_run_action"
trace point will now always display the correct FSM step.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/sched.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
index b1b49ed..c292a5e 100644
--- a/net/sunrpc/sched.c
+++ b/net/sunrpc/sched.c
@@ -770,7 +770,7 @@ static void __rpc_execute(struct rpc_task *task)
if (do_action == NULL)
break;
}
- trace_rpc_task_run_action(task->tk_client, task, task->tk_action);
+ trace_rpc_task_run_action(task->tk_client, task, do_action);
do_action(task);
/*
next prev parent reply other threads:[~2018-01-03 20:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-03 20:38 [PATCH 0/6] Final NFS/RDMA series for v4.16 Chuck Lever
2018-01-03 20:38 ` [PATCH 1/6] xprtrdma: Fix "bytes registered" accounting Chuck Lever
2018-01-03 20:38 ` [PATCH 2/6] xprtrdma: Correct some documenting comments Chuck Lever
2018-01-03 20:38 ` [PATCH 3/6] SUNRPC: Trace xprt_timer events Chuck Lever
2018-01-03 20:38 ` [PATCH 4/6] sunrpc: Format RPC events consistently for display Chuck Lever
2018-01-03 20:38 ` Chuck Lever [this message]
2018-01-03 20:38 ` [PATCH 6/6] SUNRPC: Micro-optimize __rpc_execute Chuck Lever
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180103203841.29209.13773.stgit@manet.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=anna.schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).