Commit 1eace0d1 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Add tracepoints for monitoring NFSD callbacks 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent dd5e3fbc

fs/nfsd/nfs4callback.c

+22 −15
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "nfsd.h"

#include "state.h"

#include "netns.h"

#include "trace.h"

#include "xdr4cb.h"

#include "xdr4.h"
@@ -904,16 +905,20 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c 


	if (clp->cl_minorversion == 0) {

		if (!clp->cl_cred.cr_principal &&

				(clp->cl_cred.cr_flavor >= RPC_AUTH_GSS_KRB5))

		    (clp->cl_cred.cr_flavor >= RPC_AUTH_GSS_KRB5)) {

			trace_nfsd_cb_setup_err(clp, -EINVAL);

			return -EINVAL;

		}

		args.client_name = clp->cl_cred.cr_principal;

		args.prognumber	= conn->cb_prog;

		args.protocol = XPRT_TRANSPORT_TCP;

		args.authflavor = clp->cl_cred.cr_flavor;

		clp->cl_cb_ident = conn->cb_ident;

	} else {

		if (!conn->cb_xprt)

		if (!conn->cb_xprt) {

			trace_nfsd_cb_setup_err(clp, -EINVAL);

			return -EINVAL;

		}

		clp->cl_cb_conn.cb_xprt = conn->cb_xprt;

		clp->cl_cb_session = ses;

		args.bc_xprt = conn->cb_xprt;
@@ -925,32 +930,27 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c 
	/* Create RPC client */

	client = rpc_create(&args);

	if (IS_ERR(client)) {

		dprintk("NFSD: couldn't create callback client: %ld\n",

			PTR_ERR(client));

		trace_nfsd_cb_setup_err(clp, PTR_ERR(client));

		return PTR_ERR(client);

	}

	cred = get_backchannel_cred(clp, client, ses);

	if (!cred) {

		trace_nfsd_cb_setup_err(clp, -ENOMEM);

		rpc_shutdown_client(client);

		return -ENOMEM;

	}

	clp->cl_cb_client = client;

	clp->cl_cb_cred = cred;

	trace_nfsd_cb_setup(clp);

	return 0;

}



static void warn_no_callback_path(struct nfs4_client *clp, int reason)

{

	dprintk("NFSD: warning: no callback path to client %.*s: error %d\n",

		(int)clp->cl_name.len, clp->cl_name.data, reason);

}



static void nfsd4_mark_cb_down(struct nfs4_client *clp, int reason)

{

	if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags))

		return;

	clp->cl_cb_state = NFSD4_CB_DOWN;

	warn_no_callback_path(clp, reason);

	trace_nfsd_cb_state(clp);

}



static void nfsd4_mark_cb_fault(struct nfs4_client *clp, int reason)
@@ -958,17 +958,20 @@ static void nfsd4_mark_cb_fault(struct nfs4_client *clp, int reason) 
	if (test_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags))

		return;

	clp->cl_cb_state = NFSD4_CB_FAULT;

	warn_no_callback_path(clp, reason);

	trace_nfsd_cb_state(clp);

}



static void nfsd4_cb_probe_done(struct rpc_task *task, void *calldata)

{

	struct nfs4_client *clp = container_of(calldata, struct nfs4_client, cl_cb_null);



	trace_nfsd_cb_done(clp, task->tk_status);

	if (task->tk_status)

		nfsd4_mark_cb_down(clp, task->tk_status);

	else

	else {

		clp->cl_cb_state = NFSD4_CB_UP;

		trace_nfsd_cb_state(clp);

	}

}



static void nfsd4_cb_probe_release(void *calldata)
@@ -993,6 +996,7 @@ static const struct rpc_call_ops nfsd4_cb_probe_ops = { 
void nfsd4_probe_callback(struct nfs4_client *clp)

{

	clp->cl_cb_state = NFSD4_CB_UNKNOWN;

	trace_nfsd_cb_state(clp);

	set_bit(NFSD4_CLIENT_CB_UPDATE, &clp->cl_flags);

	nfsd4_run_cb(&clp->cl_cb_null);

}
@@ -1009,6 +1013,7 @@ void nfsd4_change_callback(struct nfs4_client *clp, struct nfs4_cb_conn *conn) 
	spin_lock(&clp->cl_lock);

	memcpy(&clp->cl_cb_conn, conn, sizeof(struct nfs4_cb_conn));

	spin_unlock(&clp->cl_lock);

	trace_nfsd_cb_state(clp);

}



/*
@@ -1165,8 +1170,7 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata) 
	struct nfsd4_callback *cb = calldata;

	struct nfs4_client *clp = cb->cb_clp;



	dprintk("%s: minorversion=%d\n", __func__,

		clp->cl_minorversion);

	trace_nfsd_cb_done(clp, task->tk_status);



	if (!nfsd4_cb_sequence_done(task, cb))

		return;
@@ -1271,6 +1275,7 @@ static void nfsd4_process_cb_update(struct nfsd4_callback *cb) 
	 * kill the old client:

	 */

	if (clp->cl_cb_client) {

		trace_nfsd_cb_shutdown(clp);

		rpc_shutdown_client(clp->cl_cb_client);

		clp->cl_cb_client = NULL;

		put_cred(clp->cl_cb_cred);
@@ -1314,6 +1319,8 @@ nfsd4_run_cb_work(struct work_struct *work) 
	struct rpc_clnt *clnt;

	int flags;



	trace_nfsd_cb_work(clp, cb->cb_msg.rpc_proc->p_name);



	if (cb->cb_need_restart) {

		cb->cb_need_restart = false;

	} else {

fs/nfsd/nfs4state.c

+2 −4
Original line number Diff line number Diff line
@@ -2842,14 +2842,12 @@ gen_callback(struct nfs4_client *clp, struct nfsd4_setclientid *se, struct svc_r 
	conn->cb_prog = se->se_callback_prog;

	conn->cb_ident = se->se_callback_ident;

	memcpy(&conn->cb_saddr, &rqstp->rq_daddr, rqstp->rq_daddrlen);

	trace_nfsd_cb_args(clp, conn);

	return;

out_err:

	conn->cb_addr.ss_family = AF_UNSPEC;

	conn->cb_addrlen = 0;

	dprintk("NFSD: this client (clientid %08x/%08x) "

		"will not receive delegations\n",

		clp->cl_clientid.cl_boot, clp->cl_clientid.cl_id);



	trace_nfsd_cb_nodelegs(clp);

	return;

}

fs/nfsd/trace.h

+153 −0
Original line number Diff line number Diff line
@@ -624,6 +624,159 @@ TRACE_EVENT(nfsd_drc_mismatch, 
		__entry->ingress)

);



TRACE_EVENT(nfsd_cb_args,

	TP_PROTO(

		const struct nfs4_client *clp,

		const struct nfs4_cb_conn *conn

	),

	TP_ARGS(clp, conn),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__field(u32, prog)

		__field(u32, ident)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		__entry->prog = conn->cb_prog;

		__entry->ident = conn->cb_ident;

		memcpy(__entry->addr, &conn->cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("client %08x:%08x callback addr=%pISpc prog=%u ident=%u",

		__entry->cl_boot, __entry->cl_id,

		__entry->addr, __entry->prog, __entry->ident)

);



TRACE_EVENT(nfsd_cb_nodelegs,

	TP_PROTO(const struct nfs4_client *clp),

	TP_ARGS(clp),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

	),

	TP_printk("client %08x:%08x", __entry->cl_boot, __entry->cl_id)

)



TRACE_DEFINE_ENUM(NFSD4_CB_UP);

TRACE_DEFINE_ENUM(NFSD4_CB_UNKNOWN);

TRACE_DEFINE_ENUM(NFSD4_CB_DOWN);

TRACE_DEFINE_ENUM(NFSD4_CB_FAULT);



#define show_cb_state(val)						\

	__print_symbolic(val,						\

		{ NFSD4_CB_UP,		"UP" },				\

		{ NFSD4_CB_UNKNOWN,	"UNKNOWN" },			\

		{ NFSD4_CB_DOWN,	"DOWN" },			\

		{ NFSD4_CB_FAULT,	"FAULT"})



DECLARE_EVENT_CLASS(nfsd_cb_class,

	TP_PROTO(const struct nfs4_client *clp),

	TP_ARGS(clp),

	TP_STRUCT__entry(

		__field(unsigned long, state)

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->state = clp->cl_cb_state;

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x state=%s",

		__entry->addr, __entry->cl_boot, __entry->cl_id,

		show_cb_state(__entry->state))

);



#define DEFINE_NFSD_CB_EVENT(name)			\

DEFINE_EVENT(nfsd_cb_class, nfsd_cb_##name,		\

	TP_PROTO(const struct nfs4_client *clp),	\

	TP_ARGS(clp))



DEFINE_NFSD_CB_EVENT(setup);

DEFINE_NFSD_CB_EVENT(state);

DEFINE_NFSD_CB_EVENT(shutdown);



TRACE_EVENT(nfsd_cb_setup_err,

	TP_PROTO(

		const struct nfs4_client *clp,

		long error

	),

	TP_ARGS(clp, error),

	TP_STRUCT__entry(

		__field(long, error)

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->error = error;

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x error=%ld",

		__entry->addr, __entry->cl_boot, __entry->cl_id, __entry->error)

);



TRACE_EVENT(nfsd_cb_work,

	TP_PROTO(

		const struct nfs4_client *clp,

		const char *procedure

	),

	TP_ARGS(clp, procedure),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__string(procedure, procedure)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		__assign_str(procedure, procedure)

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x procedure=%s",

		__entry->addr, __entry->cl_boot, __entry->cl_id,

		__get_str(procedure))

);



TRACE_EVENT(nfsd_cb_done,

	TP_PROTO(

		const struct nfs4_client *clp,

		int status

	),

	TP_ARGS(clp, status),

	TP_STRUCT__entry(

		__field(u32, cl_boot)

		__field(u32, cl_id)

		__field(int, status)

		__array(unsigned char, addr, sizeof(struct sockaddr_in6))

	),

	TP_fast_assign(

		__entry->cl_boot = clp->cl_clientid.cl_boot;

		__entry->cl_id = clp->cl_clientid.cl_id;

		__entry->status = status;

		memcpy(__entry->addr, &clp->cl_cb_conn.cb_addr,

			sizeof(struct sockaddr_in6));

	),

	TP_printk("addr=%pISpc client %08x:%08x status=%d",

		__entry->addr, __entry->cl_boot, __entry->cl_id,

		__entry->status)

);



#endif /* _NFSD_TRACE_H */



#undef TRACE_INCLUDE_PATH