History

SUNRPC: Clean up call_bind_status() observability

Time to remove dprintk call sites in here. Regarding the rpc_bind_status tracepoint: It's friendlier to administrators if they don't have to look up the error code to figure out what went wrong. Replace trace_rpc_bind_status with a set of tracepoints that report more specifically what the problem was, and what RPC program/version was being queried.

Chuck Lever committed 6 years ago

Commit 42ebfc21 parent fd66e2a2 files · +19 −15Browse files

Unified · Split

2 files
  1. include/trace/events/sunrpc.h +13 −1
  2. net/sunrpc/clnt.c +6 −14
include/trace/events/sunrpc.h+13−1
@@ -259,7 +259,6 @@ DECLARE_EVENT_CLASS(rpc_task_status, · 258 unmodified lines
259259 TP_ARGS(task))
260260
261261 DEFINE_RPC_STATUS_EVENT(call);
262−DEFINE_RPC_STATUS_EVENT(bind);
263262 DEFINE_RPC_STATUS_EVENT(connect);
264263 DEFINE_RPC_STATUS_EVENT(timeout);
265264 DEFINE_RPC_STATUS_EVENT(retry_refresh);
@@ -520,6 +519,19 @@ DEFINE_RPC_REPLY_EVENT(stale_creds); · 254 unmodified lines
520519 DEFINE_RPC_REPLY_EVENT(bad_creds);
521520 DEFINE_RPC_REPLY_EVENT(auth_tooweak);
522521
522+#define DEFINE_RPCB_ERROR_EVENT(name) \
523+ DEFINE_EVENT(rpc_reply_event, rpcb_##name##_err, \
524+ TP_PROTO( \
525+ const struct rpc_task *task \
526+ ), \
527+ TP_ARGS(task))
528+
529+DEFINE_RPCB_ERROR_EVENT(prog_unavail);
530+DEFINE_RPCB_ERROR_EVENT(timeout);
531+DEFINE_RPCB_ERROR_EVENT(bind_version);
532+DEFINE_RPCB_ERROR_EVENT(unreachable);
533+DEFINE_RPCB_ERROR_EVENT(unrecognized);
534+
523535 TRACE_EVENT(rpc_buf_alloc,
524536 TP_PROTO(
525537 const struct rpc_task *task,
net/sunrpc/clnt.c+6−14
@@ -1957,7 +1957,6 @@ call_bind_status(struct rpc_task *task) · 1956 unmodified lines
19571957 return;
19581958 }
19591959
1960− trace_rpc_bind_status(task);
19611960 if (task->tk_status >= 0)
19621961 goto out_next;
19631962 if (xprt_bound(xprt)) {
@@ -1967,12 +1966,10 @@ call_bind_status(struct rpc_task *task) · 3 unmodified lines
19671966
19681967 switch (task->tk_status) {
19691968 case -ENOMEM:
1970− dprintk("RPC: %5u rpcbind out of memory\n", task->tk_pid);
19711969 rpc_delay(task, HZ >> 2);
19721970 goto retry_timeout;
19731971 case -EACCES:
1974− dprintk("RPC: %5u remote rpcbind: RPC program/version "
1975− "unavailable\n", task->tk_pid);
1972+ trace_rpcb_prog_unavail_err(task);
19761973 /* fail immediately if this is an RPC ping */
19771974 if (task->tk_msg.rpc_proc->p_proc == 0) {
19781975 status = -EOPNOTSUPP;
@@ -1989,17 +1986,14 @@ call_bind_status(struct rpc_task *task) · 10 unmodified lines
19891986 case -EAGAIN:
19901987 goto retry_timeout;
19911988 case -ETIMEDOUT:
1992− dprintk("RPC: %5u rpcbind request timed out\n",
1993− task->tk_pid);
1989+ trace_rpcb_timeout_err(task);
19941990 goto retry_timeout;
19951991 case -EPFNOSUPPORT:
19961992 /* server doesn't support any rpcbind version we know of */
1997− dprintk("RPC: %5u unrecognized remote rpcbind service\n",
1998− task->tk_pid);
1993+ trace_rpcb_bind_version_err(task);
19991994 break;
20001995 case -EPROTONOSUPPORT:
2001− dprintk("RPC: %5u remote rpcbind version unavailable, retrying\n",
2002− task->tk_pid);
1996+ trace_rpcb_bind_version_err(task);
20031997 goto retry_timeout;
20041998 case -ECONNREFUSED: /* connection problems */
20051999 case -ECONNRESET:
@@ -2010,8 +2004,7 @@ call_bind_status(struct rpc_task *task) · 4 unmodified lines
20102004 case -EHOSTUNREACH:
20112005 case -ENETUNREACH:
20122006 case -EPIPE:
2013− dprintk("RPC: %5u remote rpcbind unreachable: %d\n",
2014− task->tk_pid, task->tk_status);
2007+ trace_rpcb_unreachable_err(task);
20152008 if (!RPC_IS_SOFTCONN(task)) {
20162009 rpc_delay(task, 5*HZ);
20172010 goto retry_timeout;
@@ -2019,8 +2012,7 @@ call_bind_status(struct rpc_task *task) · 1 unmodified line
20192012 status = task->tk_status;
20202013 break;
20212014 default:
2022− dprintk("RPC: %5u unrecognized rpcbind error (%d)\n",
2023− task->tk_pid, -task->tk_status);
2015+ trace_rpcb_unrecognized_err(task);
20242016 }
20252017
20262018 rpc_call_rpcerror(task, status);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t