Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42113a75 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Add tracepoints for debugging file open 



Set up basic tracepoints for debugging NFSv4 file open/close

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c6d01c6f

fs/nfs/nfs4proc.c

+4 −0
Original line number Diff line number Diff line
@@ -1442,6 +1442,7 @@ static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state 
	int err;

	do {

		err = _nfs4_do_open_reclaim(ctx, state);

		trace_nfs4_open_reclaim(ctx, 0, err);

		if (nfs4_clear_cap_atomic_open_v1(server, err, &exception))

			continue;

		if (err != -NFS4ERR_DELAY)
@@ -1897,6 +1898,7 @@ static int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state 


	do {

		err = _nfs4_open_expired(ctx, state);

		trace_nfs4_open_expired(ctx, 0, err);

		if (nfs4_clear_cap_atomic_open_v1(server, err, &exception))

			continue;

		switch (err) {
@@ -2199,6 +2201,7 @@ static struct nfs4_state *nfs4_do_open(struct inode *dir, 
	do {

		status = _nfs4_do_open(dir, ctx, flags, sattr, label);

		res = ctx->state;

		trace_nfs4_open_file(ctx, flags, status);

		if (status == 0)

			break;

		/* NOTE: BAD_SEQID means the server and client disagree about the
@@ -2389,6 +2392,7 @@ static void nfs4_close_done(struct rpc_task *task, void *data) 
	dprintk("%s: begin!\n", __func__);

	if (!nfs4_sequence_done(task, &calldata->res.seq_res))

		return;

	trace_nfs4_close(state, &calldata->arg, &calldata->res, task->tk_status);

        /* hmm. we are done with the inode, and in the process of freeing

	 * the state_owner. we keep this around to process errors

	 */

fs/nfs/nfs4trace.h

+125 −0
Original line number Diff line number Diff line
@@ -161,6 +161,19 @@ 
		{ -NFS4ERR_WRONG_TYPE, "WRONG_TYPE" }, \

		{ -NFS4ERR_XDEV, "XDEV" })



#define show_open_flags(flags) \

	__print_flags(flags, "|", \

		{ O_CREAT, "O_CREAT" }, \

		{ O_EXCL, "O_EXCL" }, \

		{ O_TRUNC, "O_TRUNC" }, \

		{ O_DIRECT, "O_DIRECT" })



#define show_fmode_flags(mode) \

	__print_flags(mode, "|", \

		{ ((__force unsigned long)FMODE_READ), "READ" }, \

		{ ((__force unsigned long)FMODE_WRITE), "WRITE" }, \

		{ ((__force unsigned long)FMODE_EXEC), "EXEC" })



DECLARE_EVENT_CLASS(nfs4_clientid_event,

		TP_PROTO(

			const struct nfs_client *clp,
@@ -211,6 +224,118 @@ DEFINE_NFS4_CLIENTID_EVENT(nfs4_sequence); 
DEFINE_NFS4_CLIENTID_EVENT(nfs4_reclaim_complete);

#endif /* CONFIG_NFS_V4_1 */



DECLARE_EVENT_CLASS(nfs4_open_event,

		TP_PROTO(

			const struct nfs_open_context *ctx,

			int flags,

			int error

		),



		TP_ARGS(ctx, flags, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned int, flags)

			__field(unsigned int, fmode)

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)

			__field(u64, dir)

			__string(name, ctx->dentry->d_name.name)

		),



		TP_fast_assign(

			const struct nfs4_state *state = ctx->state;

			const struct inode *inode = NULL;



			__entry->error = error;

			__entry->flags = flags;

			__entry->fmode = (__force unsigned int)ctx->mode;

			__entry->dev = ctx->dentry->d_sb->s_dev;

			if (!IS_ERR(state))

				inode = state->inode;

			if (inode != NULL) {

				__entry->fileid = NFS_FILEID(inode);

				__entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));

			} else {

				__entry->fileid = 0;

				__entry->fhandle = 0;

			}

			__entry->dir = NFS_FILEID(ctx->dentry->d_parent->d_inode);

			__assign_str(name, ctx->dentry->d_name.name);

		),



		TP_printk(

			"error=%d (%s) flags=%d (%s) fmode=%s "

			"fileid=%02x:%02x:%llu fhandle=0x%08x "

			"name=%02x:%02x:%llu/%s",

			 __entry->error,

			 show_nfsv4_errors(__entry->error),

			 __entry->flags,

			 show_open_flags(__entry->flags),

			 show_fmode_flags(__entry->fmode),

			 MAJOR(__entry->dev), MINOR(__entry->dev),

			 (unsigned long long)__entry->fileid,

			 __entry->fhandle,

			 MAJOR(__entry->dev), MINOR(__entry->dev),

			 (unsigned long long)__entry->dir,

			 __get_str(name)

		)

);



#define DEFINE_NFS4_OPEN_EVENT(name) \

	DEFINE_EVENT(nfs4_open_event, name, \

			TP_PROTO( \

				const struct nfs_open_context *ctx, \

				int flags, \

				int error \

			), \

			TP_ARGS(ctx, flags, error))

DEFINE_NFS4_OPEN_EVENT(nfs4_open_reclaim);

DEFINE_NFS4_OPEN_EVENT(nfs4_open_expired);

DEFINE_NFS4_OPEN_EVENT(nfs4_open_file);



TRACE_EVENT(nfs4_close,

		TP_PROTO(

			const struct nfs4_state *state,

			const struct nfs_closeargs *args,

			const struct nfs_closeres *res,

			int error

		),



		TP_ARGS(state, args, res, error),



		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)

			__field(unsigned int, fmode)

			__field(int, error)

		),



		TP_fast_assign(

			const struct inode *inode = state->inode;



			__entry->dev = inode->i_sb->s_dev;

			__entry->fileid = NFS_FILEID(inode);

			__entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));

			__entry->fmode = (__force unsigned int)state->state;

			__entry->error = error;

		),



		TP_printk(

			"error=%d (%s) fmode=%s fileid=%02x:%02x:%llu "

			"fhandle=0x%08x",

			__entry->error,

			show_nfsv4_errors(__entry->error),

			__entry->fmode ?  show_fmode_flags(__entry->fmode) :

					  "closed",

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,

			__entry->fhandle

		)

);



#endif /* _TRACE_NFS4_H */



#undef TRACE_INCLUDE_PATH